Updates and improvements

Author: robbailiff2

Makefile

@@ -53,21 +53,15 @@ config:: # Configure development environment (main) @Configuration
 #### Proxygen ####
 ##################
 
-# Proxygen key only exists in our 'dev' AWS Parameter Store
-PROXYGEN_ENV ?= dev
-
-# Specs are published in the APIM 'prod' environment
-APIM_ENV ?= prod
-
 # Verify current AWS account login and retrieve the proxygen key
 # from AWS SSM Parameter Store
-retrieve-proxygen-key:
-	@ ./scripts/check-aws-account.sh $(PROXYGEN_ENV)
+retrieve-proxygen-key: guard-ENV
+	@ ./scripts/check-aws-account.sh
 	mkdir -p ~/.proxygen
-	aws ssm get-parameter --name /$$PROXYGEN_ENV/proxygen/private_key --with-decryption \
+	aws ssm get-parameter --name /$$ENV/proxygen/private_key --with-decryption \
 	| jq -r ".Parameter.Value" \
-	> ~/.proxygen/eligibility-signposting-api-$(APIM_ENV).pem && \
-	echo "Retrieved proxygen key for APIM '$(APIM_ENV)' environment"
+	> ~/.proxygen/eligibility-signposting-api-$(ENV).pem && \
+	echo "Retrieved proxygen key for APIM '$(ENV)' environment"
 
 # Copy proxygen credentials for the specified environment to `~/.proxygen/`
 # This location required location for local proxygen usage

scripts/check-aws-account.sh

@@ -2,9 +2,8 @@
 #!/usr/bin/env bash
 set -e
 
-APIM_ENV_NAME="$1"
-
-# Expected AWS account for dev environment
+# Expected AWS account details for dev environment
+EXPECTED_ENV_NAME="dev"
 EXPECTED_ACCOUNT="448049830832"
 
 # Read the currently authenticated AWS account
@@ -13,10 +12,10 @@ 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!"
-  echo "The expected login is AWS '$APIM_ENV_NAME' account $EXPECTED_ACCOUNT, but the current logged in AWS account is $CURRENT_ACCOUNT."
+  echo "The expected login is AWS '$EXPECTED_ENV_NAME' account $EXPECTED_ACCOUNT, but the current logged in AWS account is $CURRENT_ACCOUNT."
   echo "Please switch to the correct AWS account and try again."
   echo "Exiting script..."
   exit 1
 fi
 
-echo "Active login to AWS '$APIM_ENV_NAME' account $CURRENT_ACCOUNT verified."
+echo "Active login to AWS '$EXPECTED_ENV_NAME' account $CURRENT_ACCOUNT verified."

specification/.proxygen/credentials-prod.yaml

@@ -1,3 +1,5 @@
 client_id: eligibility-signposting-api-client
 private_key_path: eligibility-signposting-api-prod.pem
 key_id: 2027-01-21-Prod-eligibility-signposting-api
+base_url: https://identity.prod.api.platform.nhs.uk/realms/api-producers
+

specification/.proxygen/credentials-ptl.yaml

@@ -1,3 +1,4 @@
 client_id: eligibility-signposting-api-client
 private_key_path: eligibility-signposting-api-ptl.pem
 key_id: 2027-01-21-PTL-eligibility-signposting-api
+base_url: https://identity.ptl.api.platform.nhs.uk/realms/api-producers