Fix: [AEA-0000] - remove zone id and domainname variables as not need…

…ed now (#1354) ## Summary - Routine Change ### Details - remove unneeded zoneid and domainname variables on sandbox stack
NHSDigital · Oct 8, 2024 · 6dc74a7 · 6dc74a7
1 parent b3259d6
commit 6dc74a7
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 43 deletions.
diff --git a/.github/scripts/release_code.sh b/.github/scripts/release_code.sh
@@ -13,15 +13,5 @@ TRUSTSTORE_BUCKET_NAME=$(echo "${TRUSTSTORE_BUCKET_ARN}" | cut -d ":" -f 6)
 LATEST_TRUSTSTORE_VERSION=$(aws s3api list-object-versions --bucket "${TRUSTSTORE_BUCKET_NAME}" --prefix "${TRUSTSTORE_FILE}" --query 'Versions[?IsLatest].[VersionId]' --output text)
 export LATEST_TRUSTSTORE_VERSION
 
-if [ -z "${DOMAIN_NAME_EXPORT}" ];
-then
-  export DOMAIN_NAME_EXPORT="NOT_SET"
-fi
-
-if [ -z "${ZONE_ID_EXPORT}" ];
-then
-  export ZONE_ID_EXPORT="NOT_SET"
-fi
-
 cd ../../.aws-sam/build || exit
 make sam-deploy-package
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -143,8 +143,6 @@ jobs:
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
-      DOMAIN_NAME_EXPORT: eps-route53-resources:EPS-domain
-      ZONE_ID_EXPORT: eps-route53-resources:EPS-ZoneID
     secrets:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
       CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -95,8 +95,6 @@ jobs:
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
       LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
-      DOMAIN_NAME_EXPORT: eps-route53-resources:EPS-domain
-      ZONE_ID_EXPORT: eps-route53-resources:EPS-ZoneID
     secrets:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
       CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -157,8 +157,6 @@ jobs:
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
-      DOMAIN_NAME_EXPORT: eps-route53-resources:EPS-domain
-      ZONE_ID_EXPORT: eps-route53-resources:EPS-ZoneID
     secrets:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
       CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}
@@ -269,8 +267,6 @@ jobs:
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: DEBUG
       LOG_RETENTION_DAYS: 30
-      DOMAIN_NAME_EXPORT: eps-route53-resources:EPS-domain
-      ZONE_ID_EXPORT: eps-route53-resources:EPS-ZoneID
       RUN_REGRESSION_TESTS: false
     secrets:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}

diff --git a/.github/workflows/sam_release_code.yml b/.github/workflows/sam_release_code.yml
@@ -48,12 +48,6 @@ on:
       MARK_JIRA_RELEASED:
         type: boolean
         default: false
-      DOMAIN_NAME_EXPORT:
-        required: false
-        type: string
-      ZONE_ID_EXPORT:
-        required: false
-        type: string
       TOGGLE_GET_STATUS_UPDATES:
         type: boolean
         default: false
@@ -142,8 +136,6 @@ jobs:
           template_file: template.yaml
           TRUSTSTORE_FILE: ${{ inputs.TRUSTSTORE_FILE }}
           VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
-          DOMAIN_NAME_EXPORT: ${{ inputs.DOMAIN_NAME_EXPORT }}
-          ZONE_ID_EXPORT: ${{ inputs.ZONE_ID_EXPORT }}
           TOGGLE_GET_STATUS_UPDATES: ${{ inputs.TOGGLE_GET_STATUS_UPDATES }}
           ENABLE_ALERTS: ${{ inputs.ENABLE_ALERTS }}
         run: ./release_code.sh

diff --git a/Makefile b/Makefile
@@ -105,8 +105,6 @@ sam-deploy-package: guard-artifact_bucket guard-artifact_bucket_prefix guard-sta
 			  LogLevel=$$LOG_LEVEL \
 			  LogRetentionInDays=$$LOG_RETENTION_DAYS \
 			  Env=$$TARGET_ENVIRONMENT \
-				DomainNameExport=$$DOMAIN_NAME_EXPORT \
-				ZoneIDExport=$$ZONE_ID_EXPORT \
 			  ToggleGetStatusUpdates=$$TOGGLE_GET_STATUS_UPDATES \
 			  EnableAlerts=$$ENABLE_ALERTS
 

diff --git a/SAMtemplates/sandbox_template.yaml b/SAMtemplates/sandbox_template.yaml
@@ -82,14 +82,6 @@ Parameters:
         3288,
         3653,
       ]
-  DomainNameExport:
-    Type: String
-    Description: Which export (.eps or .prescriptionsforpatients) to use for domain name
-    Default: "route53-resources:domain"
-  ZoneIDExport:
-    Type: String
-    Description: Which export (.eps or .prescriptionsforpatients) to use for zone id
-    Default: "route53-resources:ZoneID"
 
 Conditions:
   ShouldUseMutualTLS: !Equals [true, !Ref EnableMutualTLS]
@@ -244,15 +236,14 @@ Resources:
         Fn::Join:
           - "."
           - - !Ref "AWS::StackName"
-            - Fn::ImportValue: !Sub ${DomainNameExport}
+            - Fn::ImportValue: eps-route53-resources:EPS-domain
       DomainValidationOptions:
         - DomainName:
             Fn::Join:
               - "."
               - - !Ref "AWS::StackName"
-                - Fn::ImportValue: !Sub ${DomainNameExport}
-          HostedZoneId:
-            Fn::ImportValue: !Sub ${ZoneIDExport}
+                - Fn::ImportValue: eps-route53-resources:EPS-domain
+          HostedZoneId: !ImportValue eps-route53-resources:EPS-ZoneID
 
   # Http api
   HttpApiGateway:
@@ -264,11 +255,10 @@ Resources:
           Fn::Join:
             - "."
             - - !Ref "AWS::StackName"
-              - Fn::ImportValue: !Sub ${DomainNameExport}
+              - Fn::ImportValue: eps-route53-resources:EPS-domain
         CertificateArn: !Ref GenerateCertificate
         Route53:
-          HostedZoneId:
-            Fn::ImportValue: !Sub ${ZoneIDExport}
+          HostedZoneId: !ImportValue eps-route53-resources:EPS-ZoneID
         EndpointConfiguration: REGIONAL
         SecurityPolicy: TLS_1_2
         MutualTlsAuthentication: