From 833714347c2c23fd88cfa2bb07ae3dc43b4ba061 Mon Sep 17 00:00:00 2001
From: Patrik Holmqvist <pahol@sunet.se>
Date: Wed, 19 Feb 2025 16:31:28 +0100
Subject: [PATCH] Make URLs dynamic, SC-2670

---
 .../eid/templates/connector/application-qa.yml.erb     | 10 +++++-----
 .../eid/templates/connector/application-test.yml.erb   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
index de8bce1f..791d1b19 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
@@ -75,17 +75,17 @@ credential:
       health-endpoint-enabled: true
 
 connector:
-  domain: qa.connector.eidas.swedenconnect.se
+  domain: <%= @environment %>.connector.eidas.swedenconnect.se
   base-url: https://${connector.domain}${server.servlet.context-path}
   backup-directory: ${CONNECTOR_DIRECTORY}/backup
   eu-metadata:
-    location: https://qa.md.eidas.swedenconnect.se/role/idp.xml
+    location: https://<%= @environment %>.md.eidas.swedenconnect.se/role/idp.xml
     validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt
   prid:
     policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties
   idp:
     ping-whitelist:
-      - https://qa.test.swedenconnect.se/sp
+      - https://<%= @environment %>.test.swedenconnect.se/sp
         #  idm:
     # TODO: Change to true when IdM integration should be turned on
     # active: false
@@ -105,7 +105,7 @@ connector:
 
 saml:
   idp:
-    entity-id: https://qa.connector.eidas.swedenconnect.se/eidas
+    entity-id: https://<%= @environment %>.connector.eidas.swedenconnect.se/eidas
     base-url: ${connector.base-url}
     session:
       module: <%= @session_backend %>
@@ -113,7 +113,7 @@ saml:
       type: <%= @session_backend %>
       context: "connector-replay-cache"
     metadata-providers:
-      - location: https://qa.md.swedenconnect.se/role/sp.xml
+      - location: https://<%= @environment %>.md.swedenconnect.se/role/sp.xml
         backup-location: ${connector.backup-directory}/metadata/sc-cache.xml
         validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt
     credentials:
diff --git a/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
index 2991da9c..069d1012 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
@@ -98,17 +98,17 @@ credential:
       health-endpoint-enabled: true
 
 connector:
-  domain: test.connector.eidas.swedenconnect.se
+  domain: <%= @environment %>.connector.eidas.swedenconnect.se
   base-url: https://${connector.domain}${server.servlet.context-path}
   backup-directory: ${CONNECTOR_DIRECTORY}/backup
   eu-metadata:
-    location: https://test.md.eidas.swedenconnect.se/role/idp.xml
+    location: https://<%= @environment %>.md.eidas.swedenconnect.se/role/idp.xml
     validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt
   prid:
     policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties
   idp:
     ping-whitelist:
-      - https://test.test.swedenconnect.se/sp
+      - https://<%= @environment %>.test.swedenconnect.se/sp
         #  idm:
     # TODO: Change to true when IdM integration should be turned on
     # active: false
@@ -128,7 +128,7 @@ connector:
 
 saml:
   idp:
-    entity-id: https://test.connector.eidas.swedenconnect.se/eidas
+    entity-id: https://<%= @environment %>.connector.eidas.swedenconnect.se/eidas
     base-url: ${connector.base-url}
     session:
       module: <%= @session_backend %>
@@ -136,7 +136,7 @@ saml:
       type: <%= @session_backend %>
       context: "connector-replay-cache"
     metadata-providers:
-      - location: https://test.md.swedenconnect.se/role/sp.xml
+      - location: https://<%= @environment %>.md.swedenconnect.se/role/sp.xml
         backup-location: ${connector.backup-directory}/metadata/sc-cache.xml
         validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt
     credentials: