Set internal dev server & modify when mtls is set

Signed-off-by: Connor Avery <[email protected]>

Author: connoravo-nhs

.github/scripts/deploy_api.sh

@@ -97,6 +97,31 @@ echo "Retrieving proxygen credentials"
 # Retrieve the proxygen private key and client private key and cert from AWS Secrets Manager
 proxygen_private_key_arn=$(aws cloudformation list-exports --query "Exports[?Name=='secrets:${PROXYGEN_PRIVATE_KEY_NAME}'].Value" --output text)
 
+echo
+echo "Deploy the API instance using Proxygen proxy lambda"
+if [[ "${DRY_RUN}" == "false" ]]; then
+
+    jq -n --argfile spec "${SPEC_PATH}" \
+        --arg apiName "${apigee_api}" \
+        --arg apiClient "${apigee_client}" \
+        --arg environment "${APIGEE_ENVIRONMENT}" \
+        --arg instance "${instance}" \
+        --arg kid "${PROXYGEN_KID}" \
+        --arg proxygenSecretName "${proxygen_private_key_arn}" \
+        '{apiName: $apiName, apiClient: $apiClient, environment: $environment, specDefinition: $spec, instance: $instance, kid: $kid, proxygenSecretName: $proxygenSecretName}' > payload.json
+
+    aws lambda invoke --function-name "${instance_put_lambda}" --cli-binary-format raw-in-base64-out --payload file://payload.json out.txt > response.json
+
+    if eval "cat response.json | jq -e '.FunctionError' >/dev/null"; then
+        echo 'Error calling lambda'
+        cat out.txt
+        exit 1
+    fi
+    echo "Instance deployed"
+else
+    echo "Would call ${instance_put_lambda}"
+fi
+
 if [[ "${ENABLE_MUTUAL_TLS}" == "true" ]]; then
     echo
     echo "Store the secret used for mutual TLS to AWS using Proxygen proxy lambda"
@@ -123,31 +148,6 @@ if [[ "${ENABLE_MUTUAL_TLS}" == "true" ]]; then
     fi
 fi
 
-echo
-echo "Deploy the API instance using Proxygen proxy lambda"
-if [[ "${DRY_RUN}" == "false" ]]; then
-
-    jq -n --argfile spec "${SPEC_PATH}" \
-        --arg apiName "${apigee_api}" \
-        --arg apiClient "${apigee_client}" \
-        --arg environment "${APIGEE_ENVIRONMENT}" \
-        --arg instance "${instance}" \
-        --arg kid "${PROXYGEN_KID}" \
-        --arg proxygenSecretName "${proxygen_private_key_arn}" \
-        '{apiName: $apiName, apiClient: $apiClient, environment: $environment, specDefinition: $spec, instance: $instance, kid: $kid, proxygenSecretName: $proxygenSecretName}' > payload.json
-
-    aws lambda invoke --function-name "${instance_put_lambda}" --cli-binary-format raw-in-base64-out --payload file://payload.json out.txt > response.json
-
-    if eval "cat response.json | jq -e '.FunctionError' >/dev/null"; then
-        echo 'Error calling lambda'
-        cat out.txt
-        exit 1
-    fi
-    echo "Instance deployed"
-else
-    echo "Would call ${instance_put_lambda}"
-fi
-
 # if [[ "${APIGEE_ENVIRONMENT}" == "int" ]]; then
 #     echo
 #     echo "Deploy the API spec to prod catalogue as it is int environment"

packages/specification/prescriptions-for-patients.yaml

@@ -102,6 +102,8 @@ x-spec-publication:
           path: /Bundle
 
 servers:
+  - url: https://internal-dev.api.service.nhs.uk/prescriptions-for-patients
+    description: Internal Dev
   - url: "https://sandbox.api.service.nhs.uk/prescriptions-for-patients"
     description: Sandbox
   - url: "https://int.api.service.nhs.uk/prescriptions-for-patients"