PRMP-919: Fix CloudFront delete workflow failures (#195)

.github/workflows/cleanup-cloudfront-edge-associations.yml

@@ -46,7 +46,7 @@ jobs:
           echo Lambda Function Name: ${{ inputs.lambda_function_name }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'nhsconnect/national-document-repository-infrastructure'
           ref: ${{ inputs.build_branch }}
@@ -58,11 +58,12 @@ jobs:
           python-version: ${{ inputs.python_version }}
 
       - name: Configure AWS Credentials for ${{ vars.AWS_REGION }}
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ASSUME_ROLE }}
           role-skip-session-tagging: true
           aws-region: ${{ vars.AWS_REGION }}
+          mask-aws-account-id: true
 
       - name: Get CloudFront Distribution ID
         id: cloudfront
@@ -73,18 +74,20 @@ jobs:
 
           if [ -z "$distribution_id" ]; then
             echo "No distribution found for origin ID: ${{ inputs.sandbox_workspace }}-lloyd-george-store"
-            exit 1
+          else
+            echo "Distribution ID found: $distribution_id"
           fi
-
-          echo "Distribution ID found: $distribution_id"
+          
           echo "DISTRIBUTION_ID=$distribution_id" >> $GITHUB_ENV
 
       - name: Install Python Dependencies
+        if: env.DISTRIBUTION_ID != ''
         run: |
           python3 -m venv ./venv
           ./venv/bin/pip3 install --upgrade pip boto3==1.33.11
 
       - name: Remove Lambda@Edge & CloudFront Associations
+        if: env.DISTRIBUTION_ID != ''
         run: ./venv/bin/python3 -u scripts/remove_edge_associations.py
         env:
           DISTRIBUTION_ID: ${{ env.DISTRIBUTION_ID }}

scripts/remove_edge_associations.py

@@ -1,43 +1,45 @@
 import boto3
 from botocore.exceptions import ClientError
-import json
+
 
 def log(message):
     print(message, flush=True)
 
+
 def detach_lambda_edge_associations(distribution_id: str):
     try:
-        client = boto3.client('cloudfront')
-        
+        client = boto3.client("cloudfront")
+
         response = client.get_distribution_config(Id=distribution_id)
-        config = response['DistributionConfig']
-        etag = response['ETag']
+        config = response["DistributionConfig"]
+        etag = response["ETag"]
 
         behaviors: list[dict] = []
-        default_behavior = config.get('DefaultCacheBehavior', None)
-        if (default_behavior and 
-                'LambdaFunctionAssociations' in default_behavior and 
-                default_behavior['LambdaFunctionAssociations']['Quantity'] > 0):
+        default_behavior = config.get("DefaultCacheBehavior", None)
+        if (
+            default_behavior
+            and "LambdaFunctionAssociations" in default_behavior
+            and default_behavior["LambdaFunctionAssociations"]["Quantity"] > 0
+        ):
             behaviors.append(default_behavior)
 
-        if ('CacheBehaviors' in config and config['CacheBehaviors']['Quantity'] > 0):
-            behaviors.extend(config['CacheBehaviors']['Items'])
+        if "CacheBehaviors" in config and config["CacheBehaviors"]["Quantity"] > 0:
+            behaviors.extend(config["CacheBehaviors"]["Items"])
 
         for behavior in behaviors:
-            if 'LambdaFunctionAssociations' in behavior:
-                behavior['LambdaFunctionAssociations'] = {'Quantity': 0}
+            if "LambdaFunctionAssociations" in behavior:
+                behavior["LambdaFunctionAssociations"] = {"Quantity": 0}
 
         client.update_distribution(
-            Id=distribution_id,
-            DistributionConfig=config,
-            IfMatch=etag
+            Id=distribution_id, DistributionConfig=config, IfMatch=etag
         )
 
         log("Cleared Lambda@Edge associations from CloudFront distribution.")
     except ClientError as e:
         log(f"Error removing associations for distribution {distribution_id}: {e}")
         raise
 
+
 if __name__ == "__main__":
     import os
 
@@ -49,4 +51,4 @@ def detach_lambda_edge_associations(distribution_id: str):
     if not lambda_function_name:
         raise ValueError("The LAMBDA_FUNCTION_NAME environment variable is not set.")
 
-    detach_lambda_edge_associations(distribution_id)
+    detach_lambda_edge_associations(distribution_id)