Add non dynamic region

nhsconnect · Sep 9, 2024 · d9b7601 · d9b7601
1 parent 3626956
commit d9b7601
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/.github/workflows/cleanup-cloudfront-edge-associations.yml b/.github/workflows/cleanup-cloudfront-edge-associations.yml
@@ -11,10 +11,6 @@ on:
         description: 'The sandbox workspace name'
         required: true
         type: string
-      aws_region:
-        description: 'AWS Region to use for the Lambda and CloudFront operations'
-        required: true
-        type: string
       python_version:
         description: 'Version of Python to run the cleanup script against'
         required: true
@@ -40,7 +36,7 @@ jobs:
       - name: Display client passed variables
         run: |
           echo "Sandbox: ${{ inputs.sandbox_workspace }}"
-          echo "Region: ${{ inputs.aws_region }}"
+          echo "Lambda: ${{ inputs.lambda_function_name }}"
 
   remove_edge_associations:
     name: Remove Lambda@Edge Associations
@@ -63,7 +59,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v2
         with:
           role-to-assume: ${{ secrets.AWS_ASSUME_ROLE }}
-          aws-region: ${{ inputs.aws_region }}
+          aws-region: 'eu-west-2'
 
       - name: Get CloudFront Distribution ID
         id: cloudfront

diff --git a/.github/workflows/terraform-deploy-feature-to-sandbox.yml b/.github/workflows/terraform-deploy-feature-to-sandbox.yml
@@ -24,11 +24,6 @@ permissions:
   contents: read # This is required for actions/checkout
 
 jobs:
-  debug_region:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Print AWS_REGION
-        run: echo ${{ vars.AWS_REGION }}
   terraform_process:
     runs-on: ubuntu-latest
     environment: ${{ github.event.inputs.environment }}

diff --git a/.github/workflows/terraform-destroy-environment-manual.yml b/.github/workflows/terraform-destroy-environment-manual.yml
@@ -35,18 +35,12 @@ env:
   AWS_REGION: ${{ vars.AWS_REGION }}
 
 jobs:
-  debug_region:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Print AWS_REGION
-        run: echo ${{ vars.AWS_REGION }} && echo ${{env.AWS_REGION}}
   remove_edge_associations:
     name: Remove Lambda@Edge Associations
     uses: ./.github/workflows/cleanup-cloudfront-edge-associations.yml
     with:
       sandbox_workspace: ${{ inputs.sandbox_workspace }}
       lambda_function_name: '${{ inputs.sandbox_workspace }}_EdgePresignLambda'
-      aws_region: '${{ vars.AWS_REGION }}'
       python_version: 3.11
       build_branch: main
     secrets: