From e7821bb67b2b622b661c260dcbbba87f0948ec8b Mon Sep 17 00:00:00 2001
From: Michal Hajas <mhajas@redhat.com>
Date: Wed, 5 May 2021 12:30:22 +0200
Subject: [PATCH] KEYCLOAK-17995 Add a warning to standalone migration scripts
 to perform a manual migration script if needed + fix test failures when
 migrating from 9.0.3

---
 .../content/bin/migrate-standalone-ha.cli          | 10 ++++++++++
 .../resources/content/bin/migrate-standalone.cli   | 10 ++++++++++
 .../standalone/standalone-9.0.3.redhat-00002.xml   | 14 ++++++++------
 .../standalone-ha-9.0.3.redhat-00002.xml           | 14 ++++++++------
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
index 51a67186bd..ed1bae1735 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
@@ -1,3 +1,13 @@
+echo
+echo *** WARNING ***
+echo
+echo ** If the following embed-server command fails, manual intervention is needed.
+echo ** In such case, remove any <extension> and <subsystem> declarations referring
+echo ** to the removed smallrye modules from the standalone-ha.xml file and rerun this script.
+echo ** For details, see Migration Changes section in the Upgrading guide.
+echo ** We apologize for this inconvenience.
+echo
+
 embed-server --server-config=standalone-ha.xml
 
 echo *** Begin Migration ***
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli
index 8127d1f2cd..d614898d43 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli
@@ -1,3 +1,13 @@
+echo
+echo *** WARNING ***
+echo
+echo ** If the following embed-server command fails, manual intervention is needed.
+echo ** In such case, remove any <extension> and <subsystem> declarations referring
+echo ** to the removed smallrye modules from the standalone.xml file and rerun this script.
+echo ** For details, see Migration Changes section in the Upgrading guide.
+echo ** We apologize for this inconvenience.
+echo
+
 embed-server --server-config=standalone.xml
 
 echo *** Begin Migration ***
diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-9.0.3.redhat-00002.xml b/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-9.0.3.redhat-00002.xml
index bbf612cfa5..1f82591dd0 100644
--- a/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-9.0.3.redhat-00002.xml
+++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-9.0.3.redhat-00002.xml
@@ -22,9 +22,10 @@
         <extension module="org.wildfly.extension.core-management"/>
         <extension module="org.wildfly.extension.elytron"/>
         <extension module="org.wildfly.extension.io"/>
-        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>
+<!--        Simulating manual migration step from KEYCLOAK-17995 issue -->
+<!--        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>-->
+<!--        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>-->
+<!--        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>-->
         <extension module="org.wildfly.extension.request-controller"/>
         <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
@@ -474,9 +475,10 @@
             <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:2.0" security-enabled="false" empty-liveness-checks-status="${env.MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS:UP}" empty-readiness-checks-status="${env.MP_HEALTH_EMPTY_READINESS_CHECKS_STATUS:UP}"/>
-        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:jboss}"/>
+<!--        Simulating manual migration step from KEYCLOAK-17995 issue -->
+<!--        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>-->
+<!--        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:2.0" security-enabled="false" empty-liveness-checks-status="${env.MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS:UP}" empty-readiness-checks-status="${env.MP_HEALTH_EMPTY_READINESS_CHECKS_STATUS:UP}"/>-->
+<!--        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:jboss}"/>-->
         <subsystem xmlns="urn:jboss:domain:undertow:10.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
             <buffer-cache name="default"/>
             <server name="default-server">
diff --git a/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-ha-9.0.3.redhat-00002.xml b/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-ha-9.0.3.redhat-00002.xml
index 595d44c367..2bb74ae81d 100644
--- a/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-ha-9.0.3.redhat-00002.xml
+++ b/testsuite/integration-arquillian/tests/other/server-config-migration/src/test/resources/standalone/standalone-ha-9.0.3.redhat-00002.xml
@@ -24,9 +24,10 @@
         <extension module="org.wildfly.extension.core-management"/>
         <extension module="org.wildfly.extension.elytron"/>
         <extension module="org.wildfly.extension.io"/>
-        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
-        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>
+<!--        Simulating manual migration step from KEYCLOAK-17995 issue -->
+<!--        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>-->
+<!--        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>-->
+<!--        <extension module="org.wildfly.extension.microprofile.metrics-smallrye"/>-->
         <extension module="org.wildfly.extension.request-controller"/>
         <extension module="org.wildfly.extension.security.manager"/>
         <extension module="org.wildfly.extension.undertow"/>
@@ -525,9 +526,10 @@
             <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
-        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:2.0" security-enabled="false" empty-liveness-checks-status="${env.MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS:UP}" empty-readiness-checks-status="${env.MP_HEALTH_EMPTY_READINESS_CHECKS_STATUS:UP}"/>
-        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:jboss}"/>
+<!--        Simulating manual migration step from KEYCLOAK-17995 issue -->
+<!--        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>-->
+<!--        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:2.0" security-enabled="false" empty-liveness-checks-status="${env.MP_HEALTH_EMPTY_LIVENESS_CHECKS_STATUS:UP}" empty-readiness-checks-status="${env.MP_HEALTH_EMPTY_READINESS_CHECKS_STATUS:UP}"/>-->
+<!--        <subsystem xmlns="urn:wildfly:microprofile-metrics-smallrye:2.0" security-enabled="false" exposed-subsystems="*" prefix="${wildfly.metrics.prefix:jboss}"/>-->
         <subsystem xmlns="urn:jboss:domain:undertow:10.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other" statistics-enabled="${wildfly.undertow.statistics-enabled:${wildfly.statistics-enabled:false}}">
             <buffer-cache name="default"/>
             <server name="default-server">