Merge branch 'master' into jenkins-job-cleaner

maorfr · Sep 11, 2020 · b50cb0b · b50cb0b
2 parents c658598 + 33b715a
commit b50cb0b
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/utils/terrascript_client.py b/utils/terrascript_client.py
@@ -1018,11 +1018,10 @@ def populate_tf_resource_s3(self, resource, namespace_info):
             tf_resources.append(sqs_data)
 
             events = common_values.get('events', ["s3:ObjectCreated:*"])
-            notification_identifier = identifier + '-to-' + sqs_identifier
             notification_values = {
-                'bucket': '${' + bucket_tf_resource.fullname + '.bucket.id}',
+                'bucket': '${' + bucket_tf_resource.fullname + '.id}',
                 'queue': [{
-                    'id': notification_identifier,
+                    'id': sqs_identifier,
                     'queue_arn':
                         '${data.aws_sqs_queue.' + sqs_identifier + '.arn}',
                     'events': events
@@ -1038,7 +1037,7 @@ def populate_tf_resource_s3(self, resource, namespace_info):
                     filter_suffix
 
             notification_tf_resource = aws_s3_bucket_notification(
-                notification_identifier, **notification_values)
+                sqs_identifier, **notification_values)
             tf_resources.append(notification_tf_resource)
 
         # iam resources
@@ -1630,7 +1629,7 @@ def populate_tf_resource_s3_sqs(self, resource, namespace_info):
 
         events = common_values.get('events', ["s3:ObjectCreated:*"])
         notification_values = {
-            'bucket': '${' + bucket_tf_resource.fullname + '.bucket.id}',
+            'bucket': '${' + bucket_tf_resource.fullname + '.id}',
             'queue': [{
                 'id': sqs_identifier,
                 'queue_arn':