From b7d60ff906be721635c17fc6fcf4ebd7c99ee1b6 Mon Sep 17 00:00:00 2001
From: Hamza Khalid <hamza.khalid@levellingup.gov.uk>
Date: Fri, 15 Nov 2024 14:43:26 +0000
Subject: [PATCH] FLS-795: Using BASIC_AUTH_USERNAME/BASIC_AUTH_PASSWORD
 instead of POST_AWARD_BASIC_AUTH_USERNAME/POST_AWARD_BASIC_AUTH_PASSWORD to
 make it consistent across all services

---
 copilot/post-award/manifest.yml | 8 ++++----
 tests/e2e_tests/config.py       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/copilot/post-award/manifest.yml b/copilot/post-award/manifest.yml
index 7197c8bac..97d9802df 100644
--- a/copilot/post-award/manifest.yml
+++ b/copilot/post-award/manifest.yml
@@ -114,8 +114,8 @@ environments:
           CLIENT_MAX_BODY_SIZE: 10m
           PROXY_READ_TIMEOUT: 180s
         secrets:
-          BASIC_AUTH_USERNAME: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_BASIC_AUTH_USERNAME
-          BASIC_AUTH_PASSWORD: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_BASIC_AUTH_PASSWORD
+          BASIC_AUTH_USERNAME: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/BASIC_AUTH_USERNAME
+          BASIC_AUTH_PASSWORD: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/BASIC_AUTH_PASSWORD
   dev:
     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"]
@@ -143,5 +143,5 @@ environments:
           CLIENT_MAX_BODY_SIZE: 10m
           PROXY_READ_TIMEOUT: 180s
         secrets:
-          BASIC_AUTH_USERNAME: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_BASIC_AUTH_USERNAME
-          BASIC_AUTH_PASSWORD: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_BASIC_AUTH_PASSWORD
+          BASIC_AUTH_USERNAME: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/BASIC_AUTH_USERNAME
+          BASIC_AUTH_PASSWORD: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/BASIC_AUTH_PASSWORD
diff --git a/tests/e2e_tests/config.py b/tests/e2e_tests/config.py
index e603f7f9f..62f28c24d 100644
--- a/tests/e2e_tests/config.py
+++ b/tests/e2e_tests/config.py
@@ -87,10 +87,10 @@ def _read_aws_parameter_store_value(self, parameter):
     def HTTP_BASIC_AUTH(self) -> HttpCredentials:
         return {
             "username": self._read_aws_parameter_store_value(
-                f"/copilot/pre-award/{self.e2e_env}/secrets/POST_AWARD_BASIC_AUTH_USERNAME"
+                f"/copilot/pre-award/{self.e2e_env}/secrets/BASIC_AUTH_USERNAME"
             ),
             "password": self._read_aws_parameter_store_value(
-                f"/copilot/pre-award/{self.e2e_env}/secrets/POST_AWARD_BASIC_AUTH_PASSWORD"
+                f"/copilot/pre-award/{self.e2e_env}/secrets/BASIC_AUTH_PASSWORD"
             ),
         }