Tidying make file and aws script

Author: robbailiff2

Makefile

@@ -53,22 +53,6 @@ config:: # Configure development environment (main) @Configuration
 #### Proxygen ####
 ##################
 
-# retrieve-proxygen-key: # Obtain the 'machine user' credentials from AWS SSM (Development environment)
-# 	mkdir -p ~/.proxygen && \
-# 	aws ssm get-parameter --name /proxygen/private_key_temp --with-decryption | jq ".Parameter.Value" --raw-output \
-# 	> ~/.proxygen/eligibility-signposting-api.pem
-
-# retrieve-proxygen-key: # Obtain the 'machine user' credentials from AWS SSM (Development environment)
-# 	mkdir -p ~/.proxygen && \
-# 	aws ssm get-parameter --name /proxygen/private_key_temp_$(ENV) --with-decryption | jq ".Parameter.Value" --raw-output \
-# 	> ~/.proxygen/eligibility-signposting-api-$(ENV).pem
-#
-# retrieve-proxygen-key-ptl:
-# 	$(MAKE) retrieve-proxygen-key ENV=ptl
-#
-# retrieve-proxygen-key-prod:
-# 	$(MAKE) retrieve-proxygen-key ENV=prod
-
 # Verify current AWS account login and retrieve the proxygen key
 # from AWS SSM for the specified environment
 retrieve-proxygen-key: guard-ENV

scripts/check-aws-account.sh

@@ -16,7 +16,7 @@ case "$APIM_ENV_NAME" in
     ;;
   prod)
     AWS_ENV_NAME="prod"
-    EXPECTED_ACCOUNT="333333333333"
+    EXPECTED_ACCOUNT="476114145616"
     ;;
   *)
     echo "Unknown APIM environment: $APIM_ENV_NAME"
@@ -30,14 +30,6 @@ CURRENT_ACCOUNT=$(aws sts get-caller-identity --query "Account" --output text)
 # Compare the current account with the expected account
 if [ "$CURRENT_ACCOUNT" != "$EXPECTED_ACCOUNT" ]; then
   echo "AWS account mismatch!"
-#  MSG="The 'ENV' arg '$APIM_ENV_NAME' for APIM maps to the AWS env '$AWS_ENV_NAME' and account $EXPECTED_ACCOUNT, but the current AWS account is $CURRENT_ACCOUNT."
-#  echo "$MSG"
-#  echo "The 'ENV' arg $APIM_ENV_NAME for APIM maps to the AWS env $AWS_ENV_NAME and account $EXPECTED_ACCOUNT, but the current AWS account is $CURRENT_ACCOUNT."
-#  echo "APIM environment : $APIM_ENV_NAME"
-#  echo "Expected AWS environment: $AWS_ENV_NAME"
-#  echo "Expected account: $EXPECTED_ACCOUNT"
-#  echo "Actual account :  $CURRENT_ACCOUNT"
-#  echo "The APIM '$APIM_ENV_NAME' environment is mapped to the AWS '$AWS_ENV_NAME' environment and account $EXPECTED_ACCOUNT, but the current AWS account is $CURRENT_ACCOUNT."
   echo "The expected mapping for the argument 'ENV=$APIM_ENV_NAME' is AWS '$AWS_ENV_NAME' account $EXPECTED_ACCOUNT, but the current AWS account is $CURRENT_ACCOUNT."
   echo "Please switch to the correct AWS account and try again."
   echo "Exiting script..."