Revert "Simplify bundle setup"

This reverts commit 965cf09.
OpenConext · Apr 17, 2024 · 4fd7771 · 4fd7771
1 parent e17a0e6
commit 4fd7771
Show file tree

Hide file tree

Showing 11 changed files with 437 additions and 412 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/samlstepupproviders.yaml → config/openconext/samlstepupproviders.yaml b/config/packages/samlstepupproviders.yaml → config/openconext/samlstepupproviders.yaml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ../openconext/samlstepupproviders_parameters.yaml }
+    - { resource: samlstepupproviders_parameters.yaml }
 
 surfnet_stepup_ra_saml_stepup_provider:
     routes:

diff --git a/config/packages/surfnet_saml.yaml b/config/packages/surfnet_saml.yaml
@@ -21,29 +21,3 @@ surfnet_saml:
       entity_id: "%saml_remote_idp_entity_id%"
       sso_url: "%saml_remote_idp_sso_url%"
       certificate: "%saml_remote_idp_certificate%"
-
-when@test:
-  surfnet_saml:
-    hosted:
-      service_provider:
-        public_key: /vagrant/deploy/tests/behat/fixtures/test_public_key.crt
-        private_key: /vagrant/deploy/tests/behat/fixtures/test_private_key.key
-      metadata:
-        public_key: /vagrant/deploy/tests/behat/fixtures/test_public_key.crt
-        private_key: /vagrant/deploy/tests/behat/fixtures/test_private_key.key
-    remote:
-      identity_provider:
-        certificate: MIIC6jCCAdICCQC9cRx5wiwWOjANBgkqhkiG9w0BAQsFADA3MRwwGgYDVQQDDBNTZWxmU2VydmljZSBTQU1MIFNQMRcwFQYDVQQKDA5EZXZlbG9wbWVudCBWTTAeFw0xODA3MzAxMjMwNDdaFw0yMzA3MjkxMjMwNDdaMDcxHDAaBgNVBAMME1NlbGZTZXJ2aWNlIFNBTUwgU1AxFzAVBgNVBAoMDkRldmVsb3BtZW50IFZNMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqhbI0Xy682DuvWchg6FYnI+DNwLXef2XExM4YVRBaMMsOZ3rBtQUTMSqYan6SK/BOEXLs0rNiJjyM0dn+F98wg3fv5zIADlvfk3LBVdcGsrpVfFUWtSa73yMgbROy8/RJADbUJE/HUB3ZmdjdiuD2Cui2aoWwT2HR8ukJwmoxiu45IWFPbqPQ7/1mH644JPOWTPLTv4OGGLQo8MNrP1oRCiZ0IEL4CQeGOOju5rfIJ0bTVm0UmelT4hGaqZovBMwXp3QV41akJ7UEMEBK2YMnLQy47Xuzi7aTDhJlvHcJ8mfH2NbjRh7hJoACVRTvQloxajgkr1iGMiWiiqT0e+YYwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBwZ0gRHvR8B8KivrXrhWNL9uLvWhEAH7OiDqo+fywkBp5KEuDJcbbvEPftHunSAGylg7M2xKuBIGamFpp74WDJccrtZ1jJ4qqnacUDRQrTLqqMZKqGpFOU0xjKkSxSGRuMtGN9/7er/TeonjQ0XBvjYvTomy3b5aCLVWRvEfKu2g1sDd8uhr62RY/HfMgidEt7LHDolkCVg+6JzY3OTcgeHga3cvYObOYPplxw1YPq5+BqqxaUW4nfb5DtK33bZBYMeyV6BZtSggc5Z/19aPx/s0bf6ySTUyB3lRqe5d3etCns4bGidORCl/6EZiXwVcPvmYmxYXqmuNWfps7isUvo
-
-when@smoketest:
-  surfnet_saml:
-    hosted:
-      service_provider:
-        public_key: /vagrant/deploy/tests/behat/fixtures/test_public_key.crt
-        private_key: /vagrant/deploy/tests/behat/fixtures/test_private_key.key
-      metadata:
-        public_key: /vagrant/deploy/tests/behat/fixtures/test_public_key.crt
-        private_key: /vagrant/deploy/tests/behat/fixtures/test_private_key.key
-    remote:
-      identity_provider:
-        certificate: MIIC6jCCAdICCQC9cRx5wiwWOjANBgkqhkiG9w0BAQsFADA3MRwwGgYDVQQDDBNTZWxmU2VydmljZSBTQU1MIFNQMRcwFQYDVQQKDA5EZXZlbG9wbWVudCBWTTAeFw0xODA3MzAxMjMwNDdaFw0yMzA3MjkxMjMwNDdaMDcxHDAaBgNVBAMME1NlbGZTZXJ2aWNlIFNBTUwgU1AxFzAVBgNVBAoMDkRldmVsb3BtZW50IFZNMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqhbI0Xy682DuvWchg6FYnI+DNwLXef2XExM4YVRBaMMsOZ3rBtQUTMSqYan6SK/BOEXLs0rNiJjyM0dn+F98wg3fv5zIADlvfk3LBVdcGsrpVfFUWtSa73yMgbROy8/RJADbUJE/HUB3ZmdjdiuD2Cui2aoWwT2HR8ukJwmoxiu45IWFPbqPQ7/1mH644JPOWTPLTv4OGGLQo8MNrP1oRCiZ0IEL4CQeGOOju5rfIJ0bTVm0UmelT4hGaqZovBMwXp3QV41akJ7UEMEBK2YMnLQy47Xuzi7aTDhJlvHcJ8mfH2NbjRh7hJoACVRTvQloxajgkr1iGMiWiiqT0e+YYwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBwZ0gRHvR8B8KivrXrhWNL9uLvWhEAH7OiDqo+fywkBp5KEuDJcbbvEPftHunSAGylg7M2xKuBIGamFpp74WDJccrtZ1jJ4qqnacUDRQrTLqqMZKqGpFOU0xjKkSxSGRuMtGN9/7er/TeonjQ0XBvjYvTomy3b5aCLVWRvEfKu2g1sDd8uhr62RY/HfMgidEt7LHDolkCVg+6JzY3OTcgeHga3cvYObOYPplxw1YPq5+BqqxaUW4nfb5DtK33bZBYMeyV6BZtSggc5Z/19aPx/s0bf6ySTUyB3lRqe5d3etCns4bGidORCl/6EZiXwVcPvmYmxYXqmuNWfps7isUvo
diff --git a/config/packages/web_profiler.yaml b/config/packages/web_profiler.yaml
@@ -1,6 +1,7 @@
-when@dev:
-when@test:
-when@smoketest:
+when@dev: &template
     web_profiler:
         toolbar: true
         intercept_redirects: false
+when@test: *template
+when@smoketest: *template
+