fix(s3-deployment): CallerReference has to be unique (#3880)

* fix(s3-deployment): CallerReference has to be unique

* fix: tests

Author: hoegertn

packages/@aws-cdk/aws-s3-deployment/lambda/src/index.py

@@ -99,7 +99,7 @@ def cfn_error(message=None):
             s3_deploy(s3_source_zip, s3_dest)
 
         if distribution_id:
-            cloudfront_invalidate(distribution_id, distribution_paths, physical_id)
+            cloudfront_invalidate(distribution_id, distribution_paths)
 
         cfn_send(event, context, CFN_SUCCESS, physicalResourceId=physical_id)
     except KeyError as e:
@@ -133,15 +133,15 @@ def s3_deploy(s3_source_zip, s3_dest):
 
 #---------------------------------------------------------------------------------------------------
 # invalidate files in the CloudFront distribution edge caches
-def cloudfront_invalidate(distribution_id, distribution_paths, physical_id):
+def cloudfront_invalidate(distribution_id, distribution_paths):
     invalidation_resp = cloudfront.create_invalidation(
         DistributionId=distribution_id,
         InvalidationBatch={
             'Paths': {
                 'Quantity': len(distribution_paths),
                 'Items': distribution_paths
             },
-            'CallerReference': physical_id,
+            'CallerReference': str(uuid4()),
         })
     # by default, will wait up to 10 minutes
     cloudfront.get_waiter('invalidation_completed').wait(

packages/@aws-cdk/aws-s3-deployment/lambda/test/test.py

@@ -143,7 +143,6 @@ def mock_make_api_call(self, operation_name, kwarg):
                 assert kwarg['DistributionId'] == '<cf-dist-id>'
                 assert kwarg['InvalidationBatch']['Paths']['Quantity'] == 1
                 assert kwarg['InvalidationBatch']['Paths']['Items'][0] == '/*'
-                assert kwarg['InvalidationBatch']['CallerReference'] == '<physical-id>'
                 return {'Invalidation': {'Id': '<invalidation-id>'}}
             if operation_name == 'GetInvalidation' and kwarg['Id'] == '<invalidation-id>':
                 return {'Invalidation': {'Id': '<invalidation-id>', 'Status': 'Completed'}}
@@ -165,7 +164,6 @@ def mock_make_api_call(self, operation_name, kwarg):
                 assert kwarg['DistributionId'] == '<cf-dist-id>'
                 assert kwarg['InvalidationBatch']['Paths']['Quantity'] == 1
                 assert kwarg['InvalidationBatch']['Paths']['Items'][0] == '/<dest-prefix>/*'
-                assert kwarg['InvalidationBatch']['CallerReference'] == '<physical-id>'
                 return {'Invalidation': {'Id': '<invalidation-id>'}}
             if operation_name == 'GetInvalidation' and kwarg['Id'] == '<invalidation-id>':
                 return {'Invalidation': {'Id': '<invalidation-id>', 'Status': 'Completed'}}
@@ -189,7 +187,6 @@ def mock_make_api_call(self, operation_name, kwarg):
                 assert kwarg['InvalidationBatch']['Paths']['Quantity'] == 2
                 assert kwarg['InvalidationBatch']['Paths']['Items'][0] == '/path1/*'
                 assert kwarg['InvalidationBatch']['Paths']['Items'][1] == '/path2/*'
-                assert kwarg['InvalidationBatch']['CallerReference'] == '<physical-id>'
                 return {'Invalidation': {'Id': '<invalidation-id>'}}
             if operation_name == 'GetInvalidation' and kwarg['Id'] == '<invalidation-id>':
                 return {'Invalidation': {'Id': '<invalidation-id>', 'Status': 'Completed'}}