Merge branch 'develop' v0.7.3

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #187 - Got error message in PostCallAnalyticsWorkflow step function
 - #189 - Uploading some MP3 files fails to trigger workflow - files remain unprocessed
 - #190 - Transcription search web UI opens with an error page after deployment
+- #199 - BedrockBoto3 stack update failure when lambda function is replaced during update
 
 ## [0.7.2] - 2023-10-03
 ### Fixed

pca-boto3-bedrock/template.yaml

@@ -66,6 +66,7 @@ Resources:
           import boto3
           import zipfile
           import urllib3
+          import json
           from datetime import datetime
           import cfnresponse
           boto3_bucket = os.environ['BOTO3_BUCKET']
@@ -90,16 +91,21 @@ Resources:
                                               os.path.join(path, '..')))
             zipf.close()
 
-          def empty_bucket(bucket_name):
+          def deleteObject(existingZip):
+              print(f'Deleting Existing Zip: {existingZip}')
               s3_client = boto3.client('s3')
-              response = s3_client.list_objects_v2(Bucket=bucket_name)
-              if 'Contents' in response:
-                  keys = [{'Key': obj['Key']} for obj in response['Contents']]
-                  s3_client.delete_objects(Bucket=bucket_name, Delete={'Objects': keys})
+              s3_client.delete_object(Bucket=existingZip["Bucket"], Key=existingZip["Key"])
               return
 
           def handler(event, context):
-            print("Event: ", event)
+            print("Event: ", json.dumps(event))
+            physicalResourceId = event.get("PhysicalResourceId", None)
+            existingZip = None
+            if physicalResourceId:
+              try:
+                existingZip = json.loads(physicalResourceId)
+              except:
+                existingZip = ""
             responseData={}
             reason=""
             status = cfnresponse.SUCCESS
@@ -113,14 +119,17 @@ Resources:
                 print(f"uploading {boto3_zip_name} to s3 bucket {boto3_bucket}")
                 upload_file_to_s3(boto3_zip_name, boto3_bucket, boto3_zip_name)
                 responseData = {"Bucket": boto3_bucket, "Key": boto3_zip_name}
+                physicalResourceId = json.dumps(responseData)
               else:
-                # delete - empty the bucket so it can be deleted by the stack.
-                empty_bucket(boto3_bucket)
+                print(f"RequestType is: {event['RequestType']}")
             except Exception as e:
               print(e)
               status = cfnresponse.FAILED
               reason = f"Exception thrown: {e}"
-            cfnresponse.send(event, context, status, responseData, reason=reason)
+            # delete any previously created zip file (during update or delete), so that bucket can be deleted
+            if existingZip:
+              deleteObject(existingZip)
+            cfnresponse.send(event, context, status, responseData, reason=reason, physicalResourceId=physicalResourceId)
     Metadata:
       cfn_nag:
         rules_to_suppress:
@@ -135,6 +144,7 @@ Resources:
       ServiceToken: !GetAtt BedrockBoto3ZipFunction.Arn
       # Rerun BedrockBoto3ZipFunction if any of the following parameters change
       BOTO3_BUCKET: !Ref BedrockBoto3Bucket
+      VERSION: 1
 
   BedrockBoto3Layer:
     Type: "AWS::Lambda::LayerVersion"