Removed SAML asserting party property migration as it is no longer relevant for Spring Boot 3.0 migration.

sanagaraj-pivotal · BoykoAlex · commit 06aee50e66c0 · 2023-03-07T11:28:02.000-05:00
diff --git a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java
@@ -237,17 +237,6 @@ private void verifyYamlConfigurationUpdate() {
                         "    restclient.sniffer.delay-after-failure: '3'\n" +
                         "    restclient.sniffer.interval: '4'\n" +
                         "    username: username\n" +
-                        "  security:\n" +
-                        "    saml2:\n" +
-                        "      relyingparty:\n" +
-                        "        registration:\n" +
-                        "          idpone:\n" +
-                        "            assertingparty:\n" +
-                        "              verification:\n" +
-                        "                credentials:\n" +
-                        "                  certificate-location: classpath:saml/idpone.crt\n" +
-                        "              entity-id: https://idpone.com\n" +
-                        "              sso-url: https://idpone.com\n" +
                         "  cassandra:\n" +
                         "    keyspaceName: testKeySpace\n" +
                         "    contactPoints: localhost\n" +
@@ -306,10 +295,6 @@ private void verifyPropertyConfigurationUpdate() {
                         "spring.elasticsearch.restclient.sniffer.interval=4\n" +
                         "spring.elasticsearch.username=username\n" +
                         "\n" +
-                        "spring.security.saml2.relyingparty.registration.idpone.assertingparty.entity-id=https://idpone.com\n" +
-                        "spring.security.saml2.relyingparty.registration.idpone.assertingparty.sso-url=https://idpone.com\n" +
-                        "spring.security.saml2.relyingparty.registration.idpone.assertingparty.verification.credentials.certificate-location=classpath:saml/idpone.crt\n" +
-                        "\n" +
                         "server.reactive.session.cookie.same-site=true\n" +
                         "\n" +
                         "spring.datasource.url=jdbc:h2:mem:testdb\n" +
diff --git a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_MultiModule_IntegrationTest.java b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_MultiModule_IntegrationTest.java
@@ -88,17 +88,6 @@ private void verifyYamlConfigurationUpdate() {
                         "    restclient.sniffer.delay-after-failure: '3'\n" +
                         "    restclient.sniffer.interval: '4'\n" +
                         "    username: username\n" +
-                        "  security:\n" +
-                        "    saml2:\n" +
-                        "      relyingparty:\n" +
-                        "        registration:\n" +
-                        "          idpone:\n" +
-                        "            assertingparty:\n" +
-                        "              verification:\n" +
-                        "                credentials:\n" +
-                        "                  certificate-location: classpath:saml/idpone.crt\n" +
-                        "              entity-id: https://idpone.com\n" +
-                        "              sso-url: https://idpone.com\n" +
                         "  cassandra:\n" +
                         "    keyspaceName: testKeySpace\n" +
                         "    contactPoints: localhost\n" +
@@ -155,10 +144,6 @@ private void verifyPropertyConfigurationUpdate() {
                         "spring.elasticsearch.restclient.sniffer.interval=4\n" +
                         "spring.elasticsearch.username=username\n" +
                         "\n" +
-                        "spring.security.saml2.relyingparty.registration.idpone.assertingparty.entity-id=https://idpone.com\n" +
-                        "spring.security.saml2.relyingparty.registration.idpone.assertingparty.sso-url=https://idpone.com\n" +
-                        "spring.security.saml2.relyingparty.registration.idpone.assertingparty.verification.credentials.certificate-location=classpath:saml/idpone.crt\n" +
-                        "\n" +
                         "server.reactive.session.cookie.same-site=true\n" +
                         "\n" +
                         "spring.datasource.url=jdbc:h2:mem:testdb\n" +
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.properties b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.properties
@@ -1,4 +1,5 @@
 management.endpoint.jolokia.config="abc"
+management.endpoint.jolokia.config="abc"
 management.endpoint.jolokia.enabled=true
 management.metrics.graphql.autotime.percentiles=100
 management.metrics.graphql.autotime.percentiles-histogram=20
@@ -108,10 +109,6 @@ spring.jta.atomikos.properties.default-jta-timeout=9
 spring.jta.atomikos.properties.checkpoint-interval=10
 spring.jta.atomikos.properties.allow-sub-transactions=true
 
-spring.security.saml2.relyingparty.registration.idpone.identityprovider.entity-id=https://idpone.com
-spring.security.saml2.relyingparty.registration.idpone.identityprovider.sso-url=https://idpone.com
-spring.security.saml2.relyingparty.registration.idpone.identityprovider.verification.credentials.certificate-location=classpath:saml/idpone.crt
-
 spring.webflux.session.cookie.same-site=true
 
 spring.datasource.url=jdbc:h2:mem:testdb
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.yaml b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-multi-module/spring-app/src/main/resources/application.yaml
@@ -137,17 +137,6 @@ spring:
     type: type1
   config:
     use-legacy-processing: 'false'
-  security:
-    saml2:
-      relyingparty:
-        registration:
-          idpone:
-            identityprovider:
-              verification:
-                credentials:
-                  certificate-location: classpath:saml/idpone.crt
-              entity-id: https://idpone.com
-              sso-url: https://idpone.com
   webflux:
     session:
       cookie:
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.properties b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.properties
@@ -108,10 +108,6 @@ spring.jta.atomikos.properties.default-jta-timeout=9
 spring.jta.atomikos.properties.checkpoint-interval=10
 spring.jta.atomikos.properties.allow-sub-transactions=true
 
-spring.security.saml2.relyingparty.registration.idpone.identityprovider.entity-id=https://idpone.com
-spring.security.saml2.relyingparty.registration.idpone.identityprovider.sso-url=https://idpone.com
-spring.security.saml2.relyingparty.registration.idpone.identityprovider.verification.credentials.certificate-location=classpath:saml/idpone.crt
-
 spring.webflux.session.cookie.same-site=true
 
 spring.datasource.url=jdbc:h2:mem:testdb
diff --git a/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.yaml b/applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/src/main/resources/application.yaml
@@ -137,17 +137,6 @@ spring:
     type: type1
   config:
     use-legacy-processing: 'false'
-  security:
-    saml2:
-      relyingparty:
-        registration:
-          idpone:
-            identityprovider:
-              verification:
-                credentials:
-                  certificate-location: classpath:saml/idpone.crt
-              entity-id: https://idpone.com
-              sso-url: https://idpone.com
   webflux:
     session:
       cookie:
diff --git a/components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/SamlRelyingPartyPropertyApplicationPropertiesMove.java b/components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/SamlRelyingPartyPropertyApplicationPropertiesMove.java
diff --git a/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml b/components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-dependency-version-update.yaml
@@ -99,32 +99,6 @@
       condition:
         type: org.springframework.sbm.common.migration.conditions.TrueCondition
 
-    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
-      condition:
-        type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
-        versionPattern: "3\\.0\\..*"
-      description: Migrate SAML configuration to Spring Boot 3.0 in yaml format
-      openRewriteRecipe: |-
-        type: specs.openrewrite.org/v1beta/recipe
-        name: org.openrewrite.java.spring.boot2.SpringBootPropertiesManual_2_7
-        displayName: Migrate SAML configuration to Spring Boot 3.0 in yaml format
-        description: Renames spring.security.saml2.relyingparty.registration.(any).identityprovider to spring.security.saml2.relyingparty.registration.(any).assertingparty.
-        recipeList:
-          - org.openrewrite.yaml.ChangeKey:
-              oldKeyPath: $.spring.security.saml2.relyingparty.registration.*[?(@.identityprovider)]
-              newKey: assertingparty
-    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
-      condition:
-        type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
-        versionPattern: "3\\.0\\..*"
-      description: Migrate SAML configuration to Spring Boot 3.0 in properties format
-      openRewriteRecipe: |-
-        type: specs.openrewrite.org/v1beta/recipe
-        name: org.openrewrite.java.spring.boot2.SpringBootPropertiesManual_2_7
-        displayName: Migrate SAML properties to Spring Boot 3.0 in properties
-        description: Renames spring.security.saml2.relyingparty.registration.(any).identityprovider to spring.security.saml2.relyingparty.registration.(any).assertingparty.
-        recipeList:
-          - org.springframework.sbm.boot.upgrade_27_30.SamlRelyingPartyPropertyApplicationPropertiesMove
     - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
       condition:
         type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SAML2RelyingPartyConfigurationReportSectionTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/SAML2RelyingPartyConfigurationReportSectionTest.java
