Merge pull request #949 from communitiesuk/fspt-228-test-communities

FSPT-228: update test config to move to communities domain
communitiesuk · Mar 7, 2025 · aa1e246 · aa1e246
2 parents 4566d29 + 5270b93
commit aa1e246
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/copilot/post-award-celery/manifest.yml b/copilot/post-award-celery/manifest.yml
@@ -49,7 +49,6 @@ secrets:
     from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-postawardclusterAuroraSecret
   REDIS_URL:
     from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-PostAwardRedisUrl
-  AUTHENTICATOR_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_AUTHENTICATOR_HOST
   SECRET_KEY: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_SECRET_KEY
   RSA256_PUBLIC_KEY_BASE64: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_RSA256_PUBLIC_KEY_BASE64
   TF_ADDITIONAL_EMAIL_LOOKUPS: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_TF_ADDITIONAL_EMAIL_LOOKUPS
@@ -63,13 +62,16 @@ environments:
       FIND_SERVICE_BASE_URL: https://find-monitoring-data.access-funding.levellingup.gov.uk
       SUBMIT_HOST: submit-monitoring-data.access-funding.levellingup.gov.uk
       FIND_HOST: find-monitoring-data.access-funding.levellingup.gov.uk
+      AUTHENTICATOR_HOST: https://authenticator.access-funding.${COPILOT_ENVIRONMENT_NAME}.communities.gov.uk
   test:
     variables:
-      FIND_SERVICE_BASE_URL: https://find-monitoring-data.test.access-funding.test.levellingup.gov.uk
-      SUBMIT_HOST: submit-monitoring-data.test.access-funding.test.levellingup.gov.uk
-      FIND_HOST: find-monitoring-data.test.access-funding.test.levellingup.gov.uk
+      FIND_SERVICE_BASE_URL: https://find-monitoring-data.access-funding.test.communities.gov.uk
+      SUBMIT_HOST: submit-monitoring-data.access-funding.test.communities.gov.uk
+      FIND_HOST: find-monitoring-data.access-funding.test.communities.gov.uk
+      AUTHENTICATOR_HOST: https://account.access-funding.${COPILOT_ENVIRONMENT_NAME}.communities.gov.uk
   dev:
     variables:
       FIND_SERVICE_BASE_URL: https://find-monitoring-data.access-funding.dev.communities.gov.uk
       SUBMIT_HOST: submit-monitoring-data.access-funding.dev.communities.gov.uk
       FIND_HOST: find-monitoring-data.access-funding.dev.communities.gov.uk
+      AUTHENTICATOR_HOST: https://account.access-funding.${COPILOT_ENVIRONMENT_NAME}.communities.gov.uk
diff --git a/copilot/post-award/manifest.yml b/copilot/post-award/manifest.yml
@@ -82,14 +82,15 @@ environments:
         grace_period: 10s
     count: 2
     variables:
+      AUTHENTICATOR_HOST: https://authenticator.access-funding.levellingup.gov.uk
       FIND_SERVICE_BASE_URL: https://find-monitoring-data.access-funding.levellingup.gov.uk
       COOKIE_DOMAIN: '.access-funding.levellingup.gov.uk'
       SUBMIT_HOST: submit-monitoring-data.access-funding.levellingup.gov.uk
       FIND_HOST: find-monitoring-data.access-funding.levellingup.gov.uk
       AUTHENTICATOR_HOST: https://authentictor.access-funding.levellingup.gov.uk
   test:
     http:
-      alias: ["find-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "submit-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"]
+      alias: ["find-monitoring-data.access-funding.${COPILOT_ENVIRONMENT_NAME}.communities.gov.uk", "find-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "submit-monitoring-data.access-funding.${COPILOT_ENVIRONMENT_NAME}.communities.gov.uk", "submit-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"]
       target_container: nginx
       healthcheck:
         path: /healthcheck
@@ -104,7 +105,7 @@ environments:
       COOKIE_DOMAIN: '.test.access-funding.test.levellingup.gov.uk'
       SUBMIT_HOST: submit-monitoring-data.test.access-funding.test.levellingup.gov.uk
       FIND_HOST: find-monitoring-data.test.access-funding.test.levellingup.gov.uk
-      AUTHENTICATOR_HOST: https://authenticator.test.access-funding.test.levellingup.gov.uk
+      AUTHENTICATOR_HOST: https://account.access-funding.${COPILOT_ENVIRONMENT_NAME}.communities.gov.uk
     sidecars:
       nginx:
         port: 8087