fix: fix make_conditional and bucket tagging

keetonian · keetonian · commit 281bd2d17449 · 2019-01-10T00:51:57.000-08:00
diff --git a/samtranslator/model/eventsources/push.py b/samtranslator/model/eventsources/push.py
@@ -269,7 +269,7 @@ def _depend_on_lambda_permissions_using_tag(self, bucket, permission):
 
         See https://stackoverflow.com/questions/34607476/cloudformation-apply-condition-on-dependson
 
-        It is done by using Fn:GetAtt wrapped in a conditional Fn:If. Using Fn:GetAtt implies a
+        It is done by using Ref wrapped in a conditional Fn::If. Using Ref implies a
         dependency, so CloudFormation will automatically wait once it reaches that function, the same
         as if you were using a DependsOn.
         """
@@ -283,9 +283,9 @@ def _depend_on_lambda_permissions_using_tag(self, bucket, permission):
             properties['Tags'] = tags
         dep_tag = {
             'sam:ConditionalDependsOn:' + permission.logical_id: {
-                'Fn:If': [
+                'Fn::If': [
                     permission.resource_attributes['Condition'],
-                    fnGetAtt(permission.logical_id, 'Arn'),
+                    ref(permission.logical_id),
                     'no dependency'
                 ]
             }
@@ -311,7 +311,7 @@ def _inject_notification_configuration(self, function, bucket):
             lambda_event = copy.deepcopy(base_event_mapping)
             lambda_event['Event'] = event_type
             if 'Condition' in function.resource_attributes:
-                lambda_event = make_conditional(lambda_event, function.resource_attributes['Condition'])
+                lambda_event = make_conditional(function.resource_attributes['Condition'], lambda_event)
             event_mappings.append(lambda_event)
 
         properties = bucket.get('Properties', None)
diff --git a/tests/translator/output/aws-cn/function_event_conditions.json b/tests/translator/output/aws-cn/function_event_conditions.json
@@ -368,13 +368,13 @@
           "LambdaConfigurations": [
             {
               "Fn::If": [
+                "MyCondition",
                 {
                   "Function": {
                     "Ref": "MyAwesomeFunctionAliasLive"
                   },
                   "Event": "s3:ObjectCreated:*"
                 },
-                "MyCondition",
                 {
                   "Ref": "AWS::NoValue"
                 }
@@ -395,13 +395,10 @@
           {
             "Key": "sam:ConditionalDependsOn:MyAwesomeFunctionS3TriggerPermission",
             "Value": {
-              "Fn:If": [
+              "Fn::If": [
                 "MyCondition",
                 {
-                  "Fn::GetAtt": [
-                    "MyAwesomeFunctionS3TriggerPermission",
-                    "Arn"
-                  ]
+                  "Ref": "MyAwesomeFunctionS3TriggerPermission"
                 },
                 "no dependency"
               ]
diff --git a/tests/translator/output/aws-cn/s3_with_condition.json b/tests/translator/output/aws-cn/s3_with_condition.json
@@ -7,6 +7,7 @@
           "LambdaConfigurations": [
             {
               "Fn::If": [
+                "MyCondition",
                 {
                   "Function": {
                     "Fn::GetAtt": [
@@ -16,7 +17,6 @@
                   },
                   "Event": "s3:ObjectCreated:*"
                 },
-                "MyCondition",
                 {
                   "Ref": "AWS::NoValue"
                 }
@@ -27,13 +27,10 @@
         "Tags": [
           {
             "Value": {
-              "Fn:If": [
+              "Fn::If": [
                 "MyCondition",
                 {
-                  "Fn::GetAtt": [
-                    "ThumbnailFunctionImageBucketPermission",
-                    "Arn"
-                  ]
+                  "Ref": "ThumbnailFunctionImageBucketPermission"
                 },
                 "no dependency"
               ]
diff --git a/tests/translator/output/aws-us-gov/function_event_conditions.json b/tests/translator/output/aws-us-gov/function_event_conditions.json
@@ -368,13 +368,13 @@
           "LambdaConfigurations": [
             {
               "Fn::If": [
+                "MyCondition",
                 {
                   "Function": {
                     "Ref": "MyAwesomeFunctionAliasLive"
                   },
                   "Event": "s3:ObjectCreated:*"
                 },
-                "MyCondition",
                 {
                   "Ref": "AWS::NoValue"
                 }
@@ -395,13 +395,10 @@
           {
             "Key": "sam:ConditionalDependsOn:MyAwesomeFunctionS3TriggerPermission",
             "Value": {
-              "Fn:If": [
+              "Fn::If": [
                 "MyCondition",
                 {
-                  "Fn::GetAtt": [
-                    "MyAwesomeFunctionS3TriggerPermission",
-                    "Arn"
-                  ]
+                  "Ref": "MyAwesomeFunctionS3TriggerPermission"
                 },
                 "no dependency"
               ]
diff --git a/tests/translator/output/aws-us-gov/s3_with_condition.json b/tests/translator/output/aws-us-gov/s3_with_condition.json
@@ -7,6 +7,7 @@
           "LambdaConfigurations": [
             {
               "Fn::If": [
+                "MyCondition",
                 {
                   "Function": {
                     "Fn::GetAtt": [
@@ -16,7 +17,6 @@
                   },
                   "Event": "s3:ObjectCreated:*"
                 },
-                "MyCondition",
                 {
                   "Ref": "AWS::NoValue"
                 }
@@ -27,13 +27,10 @@
         "Tags": [
           {
             "Value": {
-              "Fn:If": [
+              "Fn::If": [
                 "MyCondition",
                 {
-                  "Fn::GetAtt": [
-                    "ThumbnailFunctionImageBucketPermission",
-                    "Arn"
-                  ]
+                  "Ref": "ThumbnailFunctionImageBucketPermission"
                 },
                 "no dependency"
               ]
diff --git a/tests/translator/output/function_event_conditions.json b/tests/translator/output/function_event_conditions.json
@@ -368,13 +368,13 @@
           "LambdaConfigurations": [
             {
               "Fn::If": [
+                "MyCondition",
                 {
                   "Function": {
                     "Ref": "MyAwesomeFunctionAliasLive"
                   },
                   "Event": "s3:ObjectCreated:*"
                 },
-                "MyCondition",
                 {
                   "Ref": "AWS::NoValue"
                 }
@@ -395,13 +395,10 @@
           {
             "Key": "sam:ConditionalDependsOn:MyAwesomeFunctionS3TriggerPermission",
             "Value": {
-              "Fn:If": [
+              "Fn::If": [
                 "MyCondition",
                 {
-                  "Fn::GetAtt": [
-                    "MyAwesomeFunctionS3TriggerPermission",
-                    "Arn"
-                  ]
+                  "Ref": "MyAwesomeFunctionS3TriggerPermission"
                 },
                 "no dependency"
               ]
diff --git a/tests/translator/output/s3_with_condition.json b/tests/translator/output/s3_with_condition.json
@@ -7,6 +7,7 @@
           "LambdaConfigurations": [
             {
               "Fn::If": [
+                "MyCondition",
                 {
                   "Function": {
                     "Fn::GetAtt": [
@@ -16,7 +17,6 @@
                   },
                   "Event": "s3:ObjectCreated:*"
                 },
-                "MyCondition",
                 {
                   "Ref": "AWS::NoValue"
                 }
@@ -27,13 +27,10 @@
         "Tags": [
           {
             "Value": {
-              "Fn:If": [
+              "Fn::If": [
                 "MyCondition",
                 {
-                  "Fn::GetAtt": [
-                    "ThumbnailFunctionImageBucketPermission",
-                    "Arn"
-                  ]
+                  "Ref": "ThumbnailFunctionImageBucketPermission"
                 },
                 "no dependency"
               ]

Original file line number	Diff line number	Diff line change
`@@ -368,13 +368,13 @@`
`368`	`368`	`"LambdaConfigurations": [`
`369`	`369`	`{`
`370`	`370`	`"Fn::If": [`
	`371`	`+ "MyCondition",`
`371`	`372`	`{`
`372`	`373`	`"Function": {`
`373`	`374`	`"Ref": "MyAwesomeFunctionAliasLive"`
`374`	`375`	`},`
`375`	`376`	`"Event": "s3:ObjectCreated:*"`
`376`	`377`	`},`
`377`		`- "MyCondition",`
`378`	`378`	`{`
`379`	`379`	`"Ref": "AWS::NoValue"`
`380`	`380`	`}`
`@@ -395,13 +395,10 @@`
`395`	`395`	`{`
`396`	`396`	`"Key": "sam:ConditionalDependsOn:MyAwesomeFunctionS3TriggerPermission",`
`397`	`397`	`"Value": {`
`398`		`- "Fn:If": [`
	`398`	`+ "Fn::If": [`
`399`	`399`	`"MyCondition",`
`400`	`400`	`{`
`401`		`- "Fn::GetAtt": [`
`402`		`- "MyAwesomeFunctionS3TriggerPermission",`
`403`		`- "Arn"`
`404`		`- ]`
	`401`	`+ "Ref": "MyAwesomeFunctionS3TriggerPermission"`
`405`	`402`	`},`
`406`	`403`	`"no dependency"`
`407`	`404`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`"LambdaConfigurations": [`
`8`	`8`	`{`
`9`	`9`	`"Fn::If": [`
	`10`	`+ "MyCondition",`
`10`	`11`	`{`
`11`	`12`	`"Function": {`
`12`	`13`	`"Fn::GetAtt": [`
`@@ -16,7 +17,6 @@`
`16`	`17`	`},`
`17`	`18`	`"Event": "s3:ObjectCreated:*"`
`18`	`19`	`},`
`19`		`- "MyCondition",`
`20`	`20`	`{`
`21`	`21`	`"Ref": "AWS::NoValue"`
`22`	`22`	`}`
`@@ -27,13 +27,10 @@`
`27`	`27`	`"Tags": [`
`28`	`28`	`{`
`29`	`29`	`"Value": {`
`30`		`- "Fn:If": [`
	`30`	`+ "Fn::If": [`
`31`	`31`	`"MyCondition",`
`32`	`32`	`{`
`33`		`- "Fn::GetAtt": [`
`34`		`- "ThumbnailFunctionImageBucketPermission",`
`35`		`- "Arn"`
`36`		`- ]`
	`33`	`+ "Ref": "ThumbnailFunctionImageBucketPermission"`
`37`	`34`	`},`
`38`	`35`	`"no dependency"`
`39`	`36`	`]`