feat(lambda-event-sources): Add eventsourceMappingArn to IEventSource…

…Mapping (#24991) Currently the eventsourceMappingArn (for example for SQS Lambda Trigger) needs to be constructed manually: `arn:aws:lambda:eu-west-1:ACCOUNT_ID:event-source-mapping:EVENTSOURCEMAPPINGID` With this change its no longer needed to construct it manually. The solution now exposes the `eventSourceMappingArn` on the `IEventSourceMapping`. The ARN is constructed by the individual components (`service, resource, resourceName/eventSourceMappingId` and `format`). I considered adding a static method `fromEventSourceMappingArn` to the `EventSourceMapping` class. Wasnt sure if it provides any value, but let me know if you think its a good Idea to add it. ~Sidenote: I had a bit of a struggle to build the project (during development I had a lot of heap memory issues). Additionally I wasnt able to execute the integration tests, I tried to follow https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md#running-integration-tests but either I make something wrong or the guide seems out of date? Would be great if I get some pointers in the right direction.~ Closes #24801 . ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Apr 24, 2023 · ecd7374 · ecd7374
1 parent 3ea6062
commit ecd7374
Show file tree

Hide file tree

Showing 30 changed files with 446 additions and 92 deletions.
diff --git a/...ing/framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/cdk.out b/...ing/framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"31.0.0"}
diff --git a/.../framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/integ.json b/.../framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "20.0.0",
+  "version": "31.0.0",
   "testCases": {
     "integ.dynamodb": {
       "stacks": [

diff --git a/...da-event-sources/test/integ.dynamodb.js.snapshot/lambda-event-source-dynamodb.assets.json b/...da-event-sources/test/integ.dynamodb.js.snapshot/lambda-event-source-dynamodb.assets.json
@@ -1,15 +1,15 @@
 {
-  "version": "20.0.0",
+  "version": "31.0.0",
   "files": {
-    "e143da2a8687914f63b1adc3553d6af9014851503b71a4e1d068416fd906061e": {
+    "3bd69e1fd092b2d77dfe5884db2c3213c0c79d892c1fef9c3e4d29fb7f33547e": {
       "source": {
         "path": "lambda-event-source-dynamodb.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e143da2a8687914f63b1adc3553d6af9014851503b71a4e1d068416fd906061e.json",
+          "objectKey": "3bd69e1fd092b2d77dfe5884db2c3213c0c79d892c1fef9c3e4d29fb7f33547e.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...-event-sources/test/integ.dynamodb.js.snapshot/lambda-event-source-dynamodb.template.json b/...-event-sources/test/integ.dynamodb.js.snapshot/lambda-event-source-dynamodb.template.json
@@ -130,6 +130,33 @@
    "DeletionPolicy": "Delete"
   }
  },
+ "Outputs": {
+  "OutputEventSourceMappingArn": {
+   "Value": {
+    "Fn::Join": [
+     "",
+     [
+      "arn:",
+      {
+       "Ref": "AWS::Partition"
+      },
+      ":lambda:",
+      {
+       "Ref": "AWS::Region"
+      },
+      ":",
+      {
+       "Ref": "AWS::AccountId"
+      },
+      ":event-source-mapping:",
+      {
+       "Ref": "FDynamoDBEventSourcelambdaeventsourcedynamodbT7967476AE652DA48"
+      }
+     ]
+    ]
+   }
+  }
+ },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",

diff --git a/...amework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/manifest.json b/...amework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/manifest.json
@@ -1,12 +1,6 @@
 {
-  "version": "20.0.0",
+  "version": "31.0.0",
   "artifacts": {
-    "Tree": {
-      "type": "cdk:tree",
-      "properties": {
-        "file": "tree.json"
-      }
-    },
     "lambda-event-source-dynamodb.assets": {
       "type": "cdk:asset-manifest",
       "properties": {
@@ -23,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e143da2a8687914f63b1adc3553d6af9014851503b71a4e1d068416fd906061e.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3bd69e1fd092b2d77dfe5884db2c3213c0c79d892c1fef9c3e4d29fb7f33547e.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -69,6 +63,12 @@
             "data": "TD925BC7E"
           }
         ],
+        "/lambda-event-source-dynamodb/OutputEventSourceMappingArn": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "OutputEventSourceMappingArn"
+          }
+        ],
         "/lambda-event-source-dynamodb/BootstrapVersion": [
           {
             "type": "aws:cdk:logicalId",
@@ -83,6 +83,12 @@
         ]
       },
       "displayName": "lambda-event-source-dynamodb"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
     }
   }
 }
diff --git a/...g/framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/tree.json b/...g/framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.js.snapshot/tree.json
@@ -4,14 +4,6 @@
     "id": "App",
     "path": "",
     "children": {
-      "Tree": {
-        "id": "Tree",
-        "path": "Tree",
-        "constructInfo": {
-          "fqn": "constructs.Construct",
-          "version": "10.1.85"
-        }
-      },
       "lambda-event-source-dynamodb": {
         "id": "lambda-event-source-dynamodb",
         "path": "lambda-event-source-dynamodb",
@@ -24,6 +16,14 @@
                 "id": "ServiceRole",
                 "path": "lambda-event-source-dynamodb/F/ServiceRole",
                 "children": {
+                  "ImportServiceRole": {
+                    "id": "ImportServiceRole",
+                    "path": "lambda-event-source-dynamodb/F/ServiceRole/ImportServiceRole",
+                    "constructInfo": {
+                      "fqn": "aws-cdk-lib.Resource",
+                      "version": "0.0.0"
+                    }
+                  },
                   "Resource": {
                     "id": "Resource",
                     "path": "lambda-event-source-dynamodb/F/ServiceRole/Resource",
@@ -59,7 +59,7 @@
                       }
                     },
                     "constructInfo": {
-                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "fqn": "aws-cdk-lib.aws_iam.CfnRole",
                       "version": "0.0.0"
                     }
                   },
@@ -106,19 +106,19 @@
                           }
                         },
                         "constructInfo": {
-                          "fqn": "@aws-cdk/aws-iam.CfnPolicy",
+                          "fqn": "aws-cdk-lib.aws_iam.CfnPolicy",
                           "version": "0.0.0"
                         }
                       }
                     },
                     "constructInfo": {
-                      "fqn": "@aws-cdk/aws-iam.Policy",
+                      "fqn": "aws-cdk-lib.aws_iam.Policy",
                       "version": "0.0.0"
                     }
                   }
                 },
                 "constructInfo": {
-                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "fqn": "aws-cdk-lib.aws_iam.Role",
                   "version": "0.0.0"
                 }
               },
@@ -142,7 +142,7 @@
                   }
                 },
                 "constructInfo": {
-                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "fqn": "aws-cdk-lib.aws_lambda.CfnFunction",
                   "version": "0.0.0"
                 }
               },
@@ -171,19 +171,19 @@
                       }
                     },
                     "constructInfo": {
-                      "fqn": "@aws-cdk/aws-lambda.CfnEventSourceMapping",
+                      "fqn": "aws-cdk-lib.aws_lambda.CfnEventSourceMapping",
                       "version": "0.0.0"
                     }
                   }
                 },
                 "constructInfo": {
-                  "fqn": "@aws-cdk/aws-lambda.EventSourceMapping",
+                  "fqn": "aws-cdk-lib.aws_lambda.EventSourceMapping",
                   "version": "0.0.0"
                 }
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-lambda.Function",
+              "fqn": "aws-cdk-lib.aws_lambda.Function",
               "version": "0.0.0"
             }
           },
@@ -219,34 +219,66 @@
                   }
                 },
                 "constructInfo": {
-                  "fqn": "@aws-cdk/aws-dynamodb.CfnTable",
+                  "fqn": "aws-cdk-lib.aws_dynamodb.CfnTable",
                   "version": "0.0.0"
                 }
               },
               "ScalingRole": {
                 "id": "ScalingRole",
                 "path": "lambda-event-source-dynamodb/T/ScalingRole",
                 "constructInfo": {
-                  "fqn": "constructs.Construct",
-                  "version": "10.1.85"
+                  "fqn": "aws-cdk-lib.Resource",
+                  "version": "0.0.0"
                 }
               }
             },
             "constructInfo": {
-              "fqn": "@aws-cdk/aws-dynamodb.Table",
+              "fqn": "aws-cdk-lib.aws_dynamodb.Table",
+              "version": "0.0.0"
+            }
+          },
+          "OutputEventSourceMappingArn": {
+            "id": "OutputEventSourceMappingArn",
+            "path": "lambda-event-source-dynamodb/OutputEventSourceMappingArn",
+            "constructInfo": {
+              "fqn": "aws-cdk-lib.CfnOutput",
+              "version": "0.0.0"
+            }
+          },
+          "BootstrapVersion": {
+            "id": "BootstrapVersion",
+            "path": "lambda-event-source-dynamodb/BootstrapVersion",
+            "constructInfo": {
+              "fqn": "aws-cdk-lib.CfnParameter",
+              "version": "0.0.0"
+            }
+          },
+          "CheckBootstrapVersion": {
+            "id": "CheckBootstrapVersion",
+            "path": "lambda-event-source-dynamodb/CheckBootstrapVersion",
+            "constructInfo": {
+              "fqn": "aws-cdk-lib.CfnRule",
               "version": "0.0.0"
             }
           }
         },
+        "constructInfo": {
+          "fqn": "aws-cdk-lib.Stack",
+          "version": "0.0.0"
+        }
+      },
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.1.85"
+          "version": "10.1.270"
         }
       }
     },
     "constructInfo": {
-      "fqn": "constructs.Construct",
-      "version": "10.1.85"
+      "fqn": "aws-cdk-lib.App",
+      "version": "0.0.0"
     }
   }
 }
diff --git a/...ges/@aws-cdk-testing/framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.ts b/...ges/@aws-cdk-testing/framework-integ/test/aws-lambda-event-sources/test/integ.dynamodb.ts
@@ -17,12 +17,15 @@ class DynamoEventSourceTest extends cdk.Stack {
       stream: dynamodb.StreamViewType.NEW_IMAGE,
       removalPolicy: cdk.RemovalPolicy.DESTROY,
     });
-
-    fn.addEventSource(new DynamoEventSource(queue, {
+    const eventSource = new DynamoEventSource(queue, {
       batchSize: 5,
       startingPosition: lambda.StartingPosition.TRIM_HORIZON,
       tumblingWindow: cdk.Duration.seconds(60),
-    }));
+    });
+
+    fn.addEventSource(eventSource);
+
+    new cdk.CfnOutput(this, 'OutputEventSourceMappingArn', { value: eventSource.eventSourceMappingArn });
   }
 }
 

diff --git a/...mbda-event-sources/test/integ.kinesis.js.snapshot/lambda-event-source-kinesis.assets.json b/...mbda-event-sources/test/integ.kinesis.js.snapshot/lambda-event-source-kinesis.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "31.0.0",
   "files": {
-    "95e2148d1ebc26fd910572145857d4425136c06c8c3eccf43e585af4a0e73db7": {
+    "a93b796326a3eeeb540403c10cdf6cf3b003fe7da5e559e2182f0036ff06e342": {
       "source": {
         "path": "lambda-event-source-kinesis.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "95e2148d1ebc26fd910572145857d4425136c06c8c3eccf43e585af4a0e73db7.json",
+          "objectKey": "a93b796326a3eeeb540403c10cdf6cf3b003fe7da5e559e2182f0036ff06e342.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...da-event-sources/test/integ.kinesis.js.snapshot/lambda-event-source-kinesis.template.json b/...da-event-sources/test/integ.kinesis.js.snapshot/lambda-event-source-kinesis.template.json
@@ -145,6 +145,33 @@
    ]
   }
  },
+ "Outputs": {
+  "OutputEventSourceMappingArn": {
+   "Value": {
+    "Fn::Join": [
+     "",
+     [
+      "arn:",
+      {
+       "Ref": "AWS::Partition"
+      },
+      ":lambda:",
+      {
+       "Ref": "AWS::Region"
+      },
+      ":",
+      {
+       "Ref": "AWS::AccountId"
+      },
+      ":event-source-mapping:",
+      {
+       "Ref": "FKinesisEventSourcelambdaeventsourcekinesisQ645CE7DB2D6BCCF5"
+      }
+     ]
+    ]
+   }
+  }
+ },
  "Parameters": {
   "BootstrapVersion": {
    "Type": "AWS::SSM::Parameter::Value<String>",

diff --git a/...ramework-integ/test/aws-lambda-event-sources/test/integ.kinesis.js.snapshot/manifest.json b/...ramework-integ/test/aws-lambda-event-sources/test/integ.kinesis.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/95e2148d1ebc26fd910572145857d4425136c06c8c3eccf43e585af4a0e73db7.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a93b796326a3eeeb540403c10cdf6cf3b003fe7da5e559e2182f0036ff06e342.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -69,6 +69,12 @@
             "data": "AwsCdkKinesisEncryptedStreamsUnsupportedRegions"
           }
         ],
+        "/lambda-event-source-kinesis/OutputEventSourceMappingArn": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "OutputEventSourceMappingArn"
+          }
+        ],
         "/lambda-event-source-kinesis/BootstrapVersion": [
           {
             "type": "aws:cdk:logicalId",

diff --git a/...ng/framework-integ/test/aws-lambda-event-sources/test/integ.kinesis.js.snapshot/tree.json b/...ng/framework-integ/test/aws-lambda-event-sources/test/integ.kinesis.js.snapshot/tree.json
@@ -232,6 +232,14 @@
               "version": "0.0.0"
             }
           },
+          "OutputEventSourceMappingArn": {
+            "id": "OutputEventSourceMappingArn",
+            "path": "lambda-event-source-kinesis/OutputEventSourceMappingArn",
+            "constructInfo": {
+              "fqn": "aws-cdk-lib.CfnOutput",
+              "version": "0.0.0"
+            }
+          },
           "BootstrapVersion": {
             "id": "BootstrapVersion",
             "path": "lambda-event-source-kinesis/BootstrapVersion",