feature/PI-560-fix_proxygen_urls Reversed the check

Author: Rohoolio

.github/workflows/_deploy.yml

@@ -131,7 +131,7 @@ jobs:
       - uses: ./.github/actions/make/
         if: ${{ env.SCOPE == 'per_workspace'}}
         with:
-          command: apigee--deploy
+          command: apigee--deploy PERSISTENT_ENVIRONMENT_BUILD="true"
           requires-aws: true
           restore-from-cache: "true"
           cache-suffix: ${{ env.CACHE_NAME }}

scripts/infrastructure/apigee.mk

@@ -21,7 +21,7 @@ apigee--delete: aws--login
 	AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) \
 	AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) \
 	AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) \
-		bash $(PATH_TO_INFRASTRUCTURE)/apigee/proxygen.sh delete_proxy $(DEV_BUILD)
+		bash $(PATH_TO_INFRASTRUCTURE)/apigee/proxygen.sh delete_proxy $(PERSISTENT_ENVIRONMENT_BUILD)
 
 apigee--clean:
 	[[ -f $(PROXYGEN_TIMESTAMP) ]] && rm $(PROXYGEN_TIMESTAMP) || :
@@ -34,7 +34,7 @@ apigee--attach-product: aws--login
 	AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) \
 	AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) \
 	AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) \
-		bash $(PATH_TO_INFRASTRUCTURE)/apigee/apigee.sh attach_product $(DEV_BUILD)
+		bash $(PATH_TO_INFRASTRUCTURE)/apigee/apigee.sh attach_product $(PERSISTENT_ENVIRONMENT_BUILD)
 
 apigee--detach-product: aws--login
 	WORKSPACE_OUTPUT_JSON=$(WORKSPACE_OUTPUT_JSON) \
@@ -44,7 +44,7 @@ apigee--detach-product: aws--login
 	AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) \
 	AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) \
 	AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) \
-		bash $(PATH_TO_INFRASTRUCTURE)/apigee/apigee.sh detach_product $(DEV_BUILD)
+		bash $(PATH_TO_INFRASTRUCTURE)/apigee/apigee.sh detach_product $(PERSISTENT_ENVIRONMENT_BUILD)
 
 $(PROXYGEN_TIMESTAMP): aws--login $(SWAGGER_APIGEE) $(WORKSPACE_OUTPUT_JSON)
 	[[ -f $(PROXYGEN_TIMESTAMP) ]] && rm $(PROXYGEN_TIMESTAMP) || :
@@ -57,6 +57,6 @@ $(PROXYGEN_TIMESTAMP): aws--login $(SWAGGER_APIGEE) $(WORKSPACE_OUTPUT_JSON)
 	AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) \
 	AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) \
 	AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) \
-		bash $(PATH_TO_INFRASTRUCTURE)/apigee/proxygen.sh generate_proxy $(DEV_BUILD)
+		bash $(PATH_TO_INFRASTRUCTURE)/apigee/proxygen.sh generate_proxy $(PERSISTENT_ENVIRONMENT_BUILD)
 
 	touch $(PROXYGEN_TIMESTAMP)

scripts/infrastructure/apigee/apigee.sh

@@ -5,7 +5,7 @@ source ./scripts/infrastructure/terraform/terraform-constants.sh
 
 PATH_TO_HERE="scripts/infrastructure/apigee"
 APIGEE_DEPLOYMENT_ROLE="NHSDeploymentRole"
-DEV_BUILD="${2:-true}"
+PERSISTENT_ENVIRONMENT_BUILD="${2:-false}"
 API_NAME="connecting-party-manager"
 
 
@@ -93,7 +93,7 @@ function attach_product(){
     # Currently hardcoded to CPM PTL id for PR running purposes, could be passed in for adjusting other apps in the future
     _app_id="9d28b416-311b-4523-bda9-686baa2fc437"
 
-    if [ "$DEV_BUILD" = "true" ]; then
+    if [ "$PERSISTENT_ENVIRONMENT_BUILD" = "false" ]; then
         API_NAME=$_workspace_name
     fi
 
@@ -179,7 +179,7 @@ function detach_product(){
     # Currently hardcoded to CPM PTL id for PR running purposes, could be passed in for adjusting other apps in the future
     _app_id="9d28b416-311b-4523-bda9-686baa2fc437"
 
-    if [ "$DEV_BUILD" = "true" ]; then
+    if [ "$PERSISTENT_ENVIRONMENT_BUILD" = "false" ]; then
         API_NAME=$_workspace_name
     fi
 

scripts/infrastructure/apigee/proxygen.sh

@@ -3,8 +3,8 @@ set -e
 PATH_TO_HERE="scripts/infrastructure/apigee"
 APIGEE_DEPLOYMENT_ROLE="NHSDeploymentRole"
 API_NAME="connecting-party-manager"
-DEV_BUILD="${2:-true}"
-echo "DEV_BUILD is: $DEV_BUILD"
+PERSISTENT_ENVIRONMENT_BUILD="${2:-false}"
+echo "PERSISTENT_ENVIRONMENT_BUILD is: $PERSISTENT_ENVIRONMENT_BUILD"
 
 
 if [[ -z ${WORKSPACE_OUTPUT_JSON} ]]; then
@@ -111,14 +111,10 @@ function generate_proxy(){
         poetry run python ${PATH_TO_HERE}/download_pem.py ${_apigee_stage} ${APIGEE_DEPLOYMENT_ROLE}
     fi
 
-    echo "API_NAME before is: $API_NAME"
-
-    if [ "$DEV_BUILD" = "true" ]; then
+    if [ "$PERSISTENT_ENVIRONMENT_BUILD" = "false" ]; then
         API_NAME=$_workspace_name
     fi
 
-    echo "API_NAME is: $API_NAME"
-
     DOT_PROXYGEN=${APIGEE_CONFIG_PATH}/${_apigee_stage} \
         poetry run \
         python ${PATH_TO_HERE}/proxygen.py instance deploy \
@@ -165,7 +161,7 @@ function delete_proxy(){
         _workspace_name="sandbox"
     fi
 
-    if [ "$DEV_BUILD" = "true" ]; then
+    if [ "$PERSISTENT_ENVIRONMENT_BUILD" = "false" ]; then
         API_NAME=$_workspace_name
     fi