aws · rix0rrr · Jun 17, 2019 · Jun 4, 2019 · Jun 6, 2019 · Jun 6, 2019
diff --git a/packages/@aws-cdk/aws-events-targets/lib/codebuild.ts b/packages/@aws-cdk/aws-events-targets/lib/codebuild.ts
@@ -15,7 +15,7 @@ export class CodeBuildProject implements events.IRuleTarget {
    */
   public bind(_rule: events.IRule): events.RuleTargetConfig {
     return {
-      id: this.project.node.id,
+      id: this.project.node.uniqueId,
       arn: this.project.projectArn,
       role: singletonEventRole(this.project, [new iam.PolicyStatement()
         .addAction('codebuild:StartBuild')

diff --git a/packages/@aws-cdk/aws-events-targets/lib/codepipeline.ts b/packages/@aws-cdk/aws-events-targets/lib/codepipeline.ts
@@ -12,7 +12,7 @@ export class CodePipeline implements events.IRuleTarget {
 
   public bind(_rule: events.IRule): events.RuleTargetConfig {
     return {
-      id: this.pipeline.node.id,
+      id: this.pipeline.node.uniqueId,
       arn: this.pipeline.pipelineArn,
       role: singletonEventRole(this.pipeline, [new iam.PolicyStatement()
         .addResource(this.pipeline.pipelineArn)

diff --git a/packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts b/packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts
@@ -99,7 +99,7 @@ export class EcsTask implements events.IRuleTarget {
         .addResource(this.taskDefinition.taskRole.roleArn));
     }
 
-    const id = this.taskDefinition.node.id + '-on-' + this.cluster.node.id;
+    const id = this.taskDefinition.node.uniqueId + '-on-' + this.cluster.node.uniqueId;
     const arn = this.cluster.clusterArn;
     const role = singletonEventRole(this.taskDefinition, policyStatements);
     const containerOverrides = this.props.containerOverrides && this.props.containerOverrides

diff --git a/packages/@aws-cdk/aws-events-targets/lib/lambda.ts b/packages/@aws-cdk/aws-events-targets/lib/lambda.ts
@@ -39,7 +39,7 @@ export class LambdaFunction implements events.IRuleTarget {
     }
 
     return {
-      id: this.handler.node.id,
+      id: this.handler.node.uniqueId,
       arn: this.handler.functionArn,
       input: this.props.event,
     };

diff --git a/packages/@aws-cdk/aws-events-targets/lib/sns.ts b/packages/@aws-cdk/aws-events-targets/lib/sns.ts
@@ -39,7 +39,7 @@ export class SnsTopic implements events.IRuleTarget {
     this.topic.grantPublish(new iam.ServicePrincipal('events.amazonaws.com'));
 
     return {
-      id: this.topic.node.id,
+      id: this.topic.node.uniqueId,
       arn: this.topic.topicArn,
       input: this.props.message,
     };

diff --git a/packages/@aws-cdk/aws-events-targets/lib/sqs.ts b/packages/@aws-cdk/aws-events-targets/lib/sqs.ts
@@ -59,7 +59,7 @@ export class SqsQueue implements events.IRuleTarget {
     );
 
     const result = {
-      id: this.queue.node.id,
+      id: this.queue.node.uniqueId,
       arn: this.queue.queueArn,
       input: this.props.message,
     };

diff --git a/packages/@aws-cdk/aws-events-targets/lib/state-machine.ts b/packages/@aws-cdk/aws-events-targets/lib/state-machine.ts
@@ -29,7 +29,7 @@ export class SfnStateMachine implements events.IRuleTarget {
    */
   public bind(_rule: events.IRule): events.RuleTargetConfig {
     return {
-        id: this.machine.node.id,
+        id: this.machine.node.uniqueId,
         arn: this.machine.stateMachineArn,
         role: singletonEventRole(this.machine, [new iam.PolicyStatement()
             .addAction('states:StartExecution')

diff --git a/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.expected.json b/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.expected.json
@@ -44,7 +44,7 @@
                 "Arn"
               ]
             },
-            "Id": "MyProject",
+            "Id": "awscdkcodebuildeventsMyProjectEF919B0E",
             "RoleArn": {
               "Fn::GetAtt": [
                 "MyProjectEventsRole5B7D93F5",
@@ -56,7 +56,7 @@
             "Arn": {
               "Ref": "MyTopic86869434"
             },
-            "Id": "MyTopic",
+            "Id": "awscdkcodebuildeventsMyTopic550011DC",
             "InputTransformer": {
               "InputPathsMap": {
                 "f1": "$.detail.repositoryName",
@@ -284,7 +284,7 @@
             "Arn": {
               "Ref": "MyTopic86869434"
             },
-            "Id": "MyTopic"
+            "Id": "awscdkcodebuildeventsMyTopic550011DC"
           }
         ]
       }
@@ -313,7 +313,7 @@
             "Arn": {
               "Ref": "MyTopic86869434"
             },
-            "Id": "MyTopic",
+            "Id": "awscdkcodebuildeventsMyTopic550011DC",
             "InputTransformer": {
               "InputPathsMap": {
                 "f1": "$.detail.completed-phase"

diff --git a/...s/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json b/...s/@aws-cdk/aws-events-targets/test/codepipeline/integ.pipeline-event-target.expected.json
@@ -365,7 +365,7 @@
                 ]
               ]
             },
-            "Id": "Pipeline",
+            "Id": "pipelineeventsPipelineD8DD4529",
             "RoleArn": {
               "Fn::GetAtt": [
                 "PipelineEventsRole46BEEA7C",

diff --git a/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-ec2-task.lit.expected.json b/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-ec2-task.lit.expected.json
@@ -1052,7 +1052,7 @@
                 "Ref": "TaskDef54694570"
               }
             },
-            "Id": "TaskDef-on-EcsCluster",
+            "Id": "wsecsintegecsTaskDef8DD0C801-on-awsecsintegecsEcsCluster028757CF",
             "Input": "{\"containerOverrides\":[{\"name\":\"TheContainer\",\"environment\":[{\"name\":\"I_WAS_TRIGGERED\",\"value\":\"From CloudWatch Events\"}]}]}",
             "RoleArn": {
               "Fn::GetAtt": [

diff --git a/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-fargate-task.expected.json b/packages/@aws-cdk/aws-events-targets/test/ecs/integ.event-fargate-task.expected.json
@@ -609,7 +609,7 @@
                     "Arn"
                   ]
                 },
-                "Id": "TaskDef-on-EcsCluster",
+                "Id": "awsecsintegfargateTaskDef8878AF94-on-awsecsintegfargateEcsCluster46E816CB",
                 "EcsParameters": {
                   "TaskDefinitionArn": {
                     "Ref": "TaskDef54694570"
@@ -645,7 +645,7 @@
               }
             ]
           },
-          "physicalResourceId": "TaskDef-on-EcsCluster"
+          "physicalResourceId": "awsecsintegfargateTaskDef8878AF94-on-awsecsintegfargateEcsCluster46E816CB"
         },
         "Update": {
           "service": "CloudWatchEvents",
@@ -686,7 +686,7 @@
                     "Arn"
                   ]
                 },
-                "Id": "TaskDef-on-EcsCluster",
+                "Id": "awsecsintegfargateTaskDef8878AF94-on-awsecsintegfargateEcsCluster46E816CB",
                 "EcsParameters": {
                   "TaskDefinitionArn": {
                     "Ref": "TaskDef54694570"
@@ -722,7 +722,7 @@
               }
             ]
           },
-          "physicalResourceId": "TaskDef-on-EcsCluster"
+          "physicalResourceId": "awsecsintegfargateTaskDef8878AF94-on-awsecsintegfargateEcsCluster46E816CB"
         }
       }
     },
@@ -933,7 +933,7 @@
                 "Ref": "TaskDef54694570"
               }
             },
-            "Id": "TaskDef-on-EcsCluster",
+            "Id": "egfargateTaskDef8878AF94-on-awsecsintegfargateEcsCluster46E816CB",
             "Input": "{\"containerOverrides\":[{\"name\":\"TheContainer\",\"environment\":[{\"name\":\"I_WAS_TRIGGERED\",\"value\":\"From CloudWatch Events\"}]}]}",
             "RoleArn": {
               "Fn::GetAtt": [

diff --git a/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.expected.json b/packages/@aws-cdk/aws-events-targets/test/lambda/integ.events.expected.json
@@ -1,138 +1,105 @@
 {
-  "Resources": {
-    "MyFuncServiceRole54065130": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "lambda.",
-                      {
-                        "Ref": "AWS::URLSuffix"
-                      }
+    "Resources": {
+        "MyFuncServiceRole54065130": {
+            "Type": "AWS::IAM::Role",
+            "Properties": {
+                "AssumeRolePolicyDocument": {
+                    "Statement": [{
+                        "Action": "sts:AssumeRole",
+                        "Effect": "Allow",
+                        "Principal": {
+                            "Service": {
+                                "Fn::Join": [
+                                    "", [
+                                        "lambda.",
+                                        {
+                                            "Ref": "AWS::URLSuffix"
+                                        }
+                                    ]
+                                ]
+                            }
+                        }
+                    }],
+                    "Version": "2012-10-17"
+                },
+                "ManagedPolicyArns": [{
+                    "Fn::Join": [
+                        "", [
+                            "arn:",
+                            {
+                                "Ref": "AWS::Partition"
+                            },
+                            ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                        ]
                     ]
-                  ]
-                }
-              }
+                }]
             }
-          ],
-          "Version": "2012-10-17"
         },
-        "ManagedPolicyArns": [
-          {
-            "Fn::Join": [
-              "",
-              [
-                "arn:",
-                {
-                  "Ref": "AWS::Partition"
+        "MyFunc8A243A2C": {
+            "Type": "AWS::Lambda::Function",
+            "Properties": {
+                "Code": {
+                    "ZipFile": "exports.handler = function handler(event, _context, callback) {\n    console.log(JSON.stringify(event, undefined, 2));\n    return callback();\n}"
                 },
-                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-              ]
-            ]
-          }
-        ]
-      }
-    },
-    "MyFunc8A243A2C": {
-      "Type": "AWS::Lambda::Function",
-      "Properties": {
-        "Code": {
-          "ZipFile": "exports.handler = function handler(event, _context, callback) {\n    console.log(JSON.stringify(event, undefined, 2));\n    return callback();\n}"
+                "Handler": "index.handler",
+                "Role": {
+                    "Fn::GetAtt": ["MyFuncServiceRole54065130", "Arn"]
+                },
+                "Runtime": "nodejs8.10"
+            },
+            "DependsOn": ["MyFuncServiceRole54065130"]
         },
-        "Handler": "index.handler",
-        "Role": {
-          "Fn::GetAtt": [
-            "MyFuncServiceRole54065130",
-            "Arn"
-          ]
+        "MyFuncAllowEventRulelambdaeventsTimer0E6AB6D8E3B334A3": {
+            "Type": "AWS::Lambda::Permission",
+            "Properties": {
+                "Action": "lambda:InvokeFunction",
+                "FunctionName": {
+                    "Fn::GetAtt": ["MyFunc8A243A2C", "Arn"]
+                },
+                "Principal": "events.amazonaws.com",
+                "SourceArn": {
+                    "Fn::GetAtt": ["TimerBF6F831F", "Arn"]
+                }
+            }
         },
-        "Runtime": "nodejs8.10"
-      },
-      "DependsOn": [
-        "MyFuncServiceRole54065130"
-      ]
-    },
-    "MyFuncAllowEventRulelambdaeventsTimer0E6AB6D8E3B334A3": {
-      "Type": "AWS::Lambda::Permission",
-      "Properties": {
-        "Action": "lambda:InvokeFunction",
-        "FunctionName": {
-          "Fn::GetAtt": [
-            "MyFunc8A243A2C",
-            "Arn"
-          ]
+        "MyFuncAllowEventRulelambdaeventsTimer27F866A1E0669C645": {
+            "Type": "AWS::Lambda::Permission",
+            "Properties": {
+                "Action": "lambda:InvokeFunction",
+                "FunctionName": {
+                    "Fn::GetAtt": ["MyFunc8A243A2C", "Arn"]
+                },
+                "Principal": "events.amazonaws.com",
+                "SourceArn": {
+                    "Fn::GetAtt": ["Timer2B6F162E9", "Arn"]
+                }
+            }
         },
-        "Principal": "events.amazonaws.com",
-        "SourceArn": {
-          "Fn::GetAtt": [
-            "TimerBF6F831F",
-            "Arn"
-          ]
-        }
-      }
-    },
-    "MyFuncAllowEventRulelambdaeventsTimer27F866A1E0669C645": {
-      "Type": "AWS::Lambda::Permission",
-      "Properties": {
-        "Action": "lambda:InvokeFunction",
-        "FunctionName": {
-          "Fn::GetAtt": [
-            "MyFunc8A243A2C",
-            "Arn"
-          ]
+        "TimerBF6F831F": {
+            "Type": "AWS::Events::Rule",
+            "Properties": {
+                "ScheduleExpression": "rate(1 minute)",
+                "State": "ENABLED",
+                "Targets": [{
+                    "Arn": {
+                        "Fn::GetAtt": ["MyFunc8A243A2C", "Arn"]
+                    },
+                    "Id": "lambdaeventsMyFunc910E580F"
+                }]
+            }
         },
-        "Principal": "events.amazonaws.com",
-        "SourceArn": {
-          "Fn::GetAtt": [
-            "Timer2B6F162E9",
-            "Arn"
-          ]
+        "Timer2B6F162E9": {
+            "Type": "AWS::Events::Rule",
+            "Properties": {
+                "ScheduleExpression": "rate(2 minutes)",
+                "State": "ENABLED",
+                "Targets": [{
+                    "Arn": {
+                        "Fn::GetAtt": ["MyFunc8A243A2C", "Arn"]
+                    },
+                    "Id": "lambdaeventsMyFunc910E580F"
+                }]
+            }
         }
-      }
-    },
-    "TimerBF6F831F": {
-      "Type": "AWS::Events::Rule",
-      "Properties": {
-        "ScheduleExpression": "rate(1 minute)",
-        "State": "ENABLED",
-        "Targets": [
-          {
-            "Arn": {
-              "Fn::GetAtt": [
-                "MyFunc8A243A2C",
-                "Arn"
-              ]
-            },
-            "Id": "MyFunc"
-          }
-        ]
-      }
-    },
-    "Timer2B6F162E9": {
-      "Type": "AWS::Events::Rule",
-      "Properties": {
-        "ScheduleExpression": "rate(2 minutes)",
-        "State": "ENABLED",
-        "Targets": [
-          {
-            "Arn": {
-              "Fn::GetAtt": [
-                "MyFunc8A243A2C",
-                "Arn"
-              ]
-            },
-            "Id": "MyFunc"
-          }
-        ]
-      }
     }
-  }
 }