From e48530a484791b6b629250d3d59d8d1299323710 Mon Sep 17 00:00:00 2001
From: Gideon Goldberg <1764158+gidsg@users.noreply.github.com>
Date: Tue, 4 Mar 2025 17:00:37 +0000
Subject: [PATCH 1/2] update authenticator test config and fix prod
 authenticator host

---
 copilot/post-award-celery/manifest.yml | 6 +++---
 copilot/post-award/manifest.yml        | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/copilot/post-award-celery/manifest.yml b/copilot/post-award-celery/manifest.yml
index f0af38c16..64913e6df 100644
--- a/copilot/post-award-celery/manifest.yml
+++ b/copilot/post-award-celery/manifest.yml
@@ -65,9 +65,9 @@ environments:
       FIND_HOST: find-monitoring-data.access-funding.levellingup.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
   dev:
     variables:
       FIND_SERVICE_BASE_URL: https://find-monitoring-data.access-funding.dev.communities.gov.uk
diff --git a/copilot/post-award/manifest.yml b/copilot/post-award/manifest.yml
index 148ccfb43..0d8eef698 100644
--- a/copilot/post-award/manifest.yml
+++ b/copilot/post-award/manifest.yml
@@ -82,6 +82,7 @@ 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
@@ -89,7 +90,7 @@ environments:
       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

From 5270b93d6ac83d9505baadf50402ee019d96567f Mon Sep 17 00:00:00 2001
From: Gideon Goldberg <1764158+gidsg@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:34:27 +0000
Subject: [PATCH 2/2] hardcode authenticator host in celery manifest

---
 copilot/post-award-celery/manifest.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/copilot/post-award-celery/manifest.yml b/copilot/post-award-celery/manifest.yml
index 64913e6df..2cfb22b1f 100644
--- 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.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