feat(cdk-v2): Rearranging imports, removing deprecated APIs for CDK v…

…2 release (#350) * feat(cdk-v2): Rearranging imports, removing deprecated APIs, and preparing codebase for CDK v2 release * feat(cdk-v2): Rearranging imports, removing deprecated APIs, and preparing codebase for CDK v2 release * feat(cdk-v2): Updating CONTRIBUTING guide and adding a comment for standalone import statement for Construct * feat(cdk-v2): Updating CONTRIBUTING guide and adding a comment for standalone import statement for Construct * feat(cdk-v2): eliminate usage of a deprecated API 'tasks.RunLambdaTask' * feat(cdk-v2): eliminate usage of a deprecated API 'tasks.RunLambdaTask' * feat(cdk-v2): Fixing integ tests due to removal of a deprecated API 'tasks.RunLambdaTask'
awslabs · Aug 31, 2021 · 0c8fba4 · 0c8fba4
1 parent 522feb1
commit 0c8fba4
Show file tree

Hide file tree

Showing 74 changed files with 214 additions and 124 deletions.
diff --git a/.viperlightignore b/.viperlightignore
@@ -10,7 +10,7 @@ source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/test/integ.exist
 source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/test/integ.no-arguments.expected.json:204
 source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/integ.apigateway-dynamodb-existing-table.expected.json:60
 CODE_OF_CONDUCT.md:4
-CONTRIBUTING.md:238
+CONTRIBUTING.md:244
 source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts:114
 source/patterns/@aws-solutions-constructs/core/test/step-function-helper.test.ts:124
 source/patterns/@aws-solutions-constructs/aws-kinesisstreams-gluejob/test/test.kinesisstream-gluejob.test.ts:126

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -93,6 +93,12 @@ Now it's time to work your magic. Here are some guidelines:
   Feel free to start your contribution by copy&pasting files from that project,
   and then edit and rename them as appropriate -
   it might be easier to get started that way.
+* To ensure CDKv2 compatibility of all the Solutions Constructs, please ensure the code meets the following guidelines:
+  * Import statement for `Construct` is standalone, for example, `import { Construct } from '@aws-cdk/core';` instead of `import { Construct, App, Aws } from '@aws-cdk/core';`
+  * Check to make sure the usage of `Construct` in the code is also standalone, for example, `export class IotToSqs extends Construct` insted of `export class IotToSqs extends cdk.Construct`
+  * Core classes are imported from `@aws-cdk/core` only, for example, `import { Duration } from "@aws-cdk/core;` instead of `import { Duration } from "@aws-cdk/core/lib/duration";`
+  * DO NOT USE deprecated APIs, it will not build in CDKv2, for example, using `statistic?` attribute of [@aws-cdk/aws-cloudwatch.Alarm](https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-cloudwatch.Alarm.html) Construct Props will fail to build in CDKv2 
+  * DO NOT USE experimental modules, it will not build in CDKv2, for example, avoid using L2 constructs for [HTTP or Websocket API](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-apigatewayv2-readme.html) will fail to build in CDKv2 
 
 #### Integration Tests
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-dynamodb/lib/index.ts
@@ -14,6 +14,7 @@
 import * as api from '@aws-cdk/aws-apigateway';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import { getPartitionKeyNameFromTable, overrideProps } from '@aws-solutions-constructs/core';

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/lib/index.ts
@@ -17,6 +17,7 @@ import * as cdk from '@aws-cdk/core';
 import * as iam from '@aws-cdk/aws-iam';
 import * as logs from '@aws-cdk/aws-logs';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 
 /**

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-kinesisstreams/lib/index.ts
@@ -16,6 +16,7 @@ import * as api from '@aws-cdk/aws-apigateway';
 import * as kinesis from '@aws-cdk/aws-kinesis';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as logs from '@aws-cdk/aws-logs';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-lambda/lib/index.ts
@@ -17,6 +17,7 @@ import * as lambda from '@aws-cdk/aws-lambda';
 import * as iam from '@aws-cdk/aws-iam';
 import * as logs from '@aws-cdk/aws-logs';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 
 /**

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/lib/index.ts
@@ -16,6 +16,7 @@ import * as api from '@aws-cdk/aws-apigateway';
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as cdk from '@aws-cdk/core';
 import * as logs from '@aws-cdk/aws-logs';

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway-lambda/lib/index.ts
@@ -18,6 +18,7 @@ import * as logs from '@aws-cdk/aws-logs';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { CloudFrontToApiGateway } from '@aws-solutions-constructs/aws-cloudfront-apigateway';
 

diff --git a/...aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.ts b/...aws-solutions-constructs/aws-cloudfront-apigateway-lambda/test/integ.override-behavior.ts
@@ -18,7 +18,7 @@ import * as lambda from '@aws-cdk/aws-lambda';
 import * as cloudfront from '@aws-cdk/aws-cloudfront';
 import * as apigateway from '@aws-cdk/aws-apigateway';
 import * as cdk from '@aws-cdk/core';
-import { Duration } from "@aws-cdk/core/lib/duration";
+import { Duration } from "@aws-cdk/core";
 import * as origins from '@aws-cdk/aws-cloudfront-origins';
 import { generateIntegStackName } from '@aws-solutions-constructs/core';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-apigateway/lib/index.ts
@@ -15,6 +15,7 @@ import * as api from '@aws-cdk/aws-apigateway';
 import * as cloudfront from '@aws-cdk/aws-cloudfront';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 
 /**

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/lib/index.ts
@@ -13,6 +13,7 @@
 
 import * as cloudfront from '@aws-cdk/aws-cloudfront';
 import * as s3 from '@aws-cdk/aws-s3';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as defaults from '@aws-solutions-constructs/core';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/integ.existing-bucket.ts
@@ -18,7 +18,7 @@ import * as defaults from "@aws-solutions-constructs/core";
 import { CloudFrontToS3 } from "../lib";
 import * as origins from '@aws-cdk/aws-cloudfront-origins';
 import * as cloudfront from '@aws-cdk/aws-cloudfront';
-import { Duration } from "@aws-cdk/core/lib/duration";
+import { Duration } from "@aws-cdk/core";
 import { generateIntegStackName } from '@aws-solutions-constructs/core';
 
 // Setup

diff --git a/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-cognito-apigateway-lambda/lib/index.ts
@@ -17,6 +17,7 @@ import * as cognito from '@aws-cdk/aws-cognito';
 import * as logs from '@aws-cdk/aws-logs';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 
 /**

diff --git a/...ns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/lib/index.ts b/...ns/@aws-solutions-constructs/aws-dynamodb-stream-lambda-elasticsearch-kibana/lib/index.ts
@@ -18,6 +18,7 @@ import { DynamoEventSourceProps } from '@aws-cdk/aws-lambda-event-sources';
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import * as cognito from '@aws-cdk/aws-cognito';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as sqs from '@aws-cdk/aws-sqs';
 import { DynamoDBStreamsToLambdaToElasticSearchAndKibana } from "@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana";

diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodb-stream-lambda/lib/index.ts
@@ -14,6 +14,7 @@
 import * as lambda from '@aws-cdk/aws-lambda';
 import { DynamoEventSourceProps } from '@aws-cdk/aws-lambda-event-sources';
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as sqs from '@aws-cdk/aws-sqs';
 import { DynamoDBStreamsToLambda } from '@aws-solutions-constructs/aws-dynamodbstreams-lambda';

diff --git a/...ns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/lib/index.ts b/...ns/@aws-solutions-constructs/aws-dynamodbstreams-lambda-elasticsearch-kibana/lib/index.ts
@@ -20,6 +20,7 @@ import { LambdaToElasticSearchAndKibanaProps, LambdaToElasticSearchAndKibana } f
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import * as cognito from '@aws-cdk/aws-cognito';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as defaults from '@aws-solutions-constructs/core';

diff --git a/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-dynamodbstreams-lambda/lib/index.ts
@@ -15,6 +15,7 @@ import * as lambda from '@aws-cdk/aws-lambda';
 import { DynamoEventSourceProps, DynamoEventSource } from '@aws-cdk/aws-lambda-event-sources';
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as sqs from '@aws-cdk/aws-sqs';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3/lib/index.ts
@@ -17,6 +17,7 @@ import * as defaults from '@aws-solutions-constructs/core';
 import * as iam from '@aws-cdk/aws-iam';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as logs from '@aws-cdk/aws-logs';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { overrideProps } from '@aws-solutions-constructs/core';
 import { KinesisFirehoseToS3 } from '@aws-solutions-constructs/aws-kinesisfirehose-s3';

diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-kinesisstreams/lib/index.ts
@@ -15,6 +15,7 @@ import * as events from '@aws-cdk/aws-events';
 import * as kinesis from '@aws-cdk/aws-kinesis';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as defaults from '@aws-solutions-constructs/core';
 import { overrideProps } from '@aws-solutions-constructs/core';

diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-lambda/lib/index.ts
@@ -15,6 +15,7 @@ import * as lambda from '@aws-cdk/aws-lambda';
 import * as events from '@aws-cdk/aws-events';
 import * as defaults from '@aws-solutions-constructs/core';
 import * as iam from '@aws-cdk/aws-iam';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { overrideProps } from '@aws-solutions-constructs/core';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sns/lib/index.ts
@@ -15,6 +15,7 @@ import * as sns from '@aws-cdk/aws-sns';
 import * as events from '@aws-cdk/aws-events';
 import * as kms from '@aws-cdk/aws-kms';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { overrideProps } from '@aws-solutions-constructs/core';
 import { ServicePrincipal } from '@aws-cdk/aws-iam';

diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-sqs/lib/index.ts
@@ -16,6 +16,7 @@ import * as events from '@aws-cdk/aws-events';
 import * as kms from '@aws-cdk/aws-kms';
 import * as defaults from '@aws-solutions-constructs/core';
 import { ServicePrincipal } from '@aws-cdk/aws-iam';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { overrideProps } from '@aws-solutions-constructs/core';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-eventbridge-stepfunctions/lib/index.ts
@@ -15,6 +15,7 @@ import * as sfn from '@aws-cdk/aws-stepfunctions';
 import * as events from '@aws-cdk/aws-events';
 import * as defaults from '@aws-solutions-constructs/core';
 import * as iam from '@aws-cdk/aws-iam';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { overrideProps } from '@aws-solutions-constructs/core';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';

diff --git a/...-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json b/...-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.expected.json
@@ -308,15 +308,18 @@
           "Fn::Join": [
             "",
             [
-              "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Parameters\":{\"FunctionName\":\"",
+              "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:",
               {
-                "Ref": "LambdaFunctionBF21E41F"
+                "Ref": "AWS::Partition"
               },
-              "\",\"Payload.$\":\"$\"},\"Type\":\"Task\",\"Resource\":\"arn:",
+              ":states:::lambda:invoke\",\"Parameters\":{\"FunctionName\":\"",
               {
-                "Ref": "AWS::Partition"
+                "Fn::GetAtt": [
+                  "LambdaFunctionBF21E41F",
+                  "Arn"
+                ]
               },
-              ":states:::lambda:invoke\"}},\"TimeoutSeconds\":300}"
+              "\",\"Payload.$\":\"$\"}}},\"TimeoutSeconds\":300}"
             ]
           ]
         },

diff --git a/...structs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.ts b/...structs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-with-lambda.ts
@@ -31,11 +31,11 @@ const submitLambda = deployLambdaFunction(stack, {
   handler: 'index.handler'
 });
 
-const submitJob = new tasks.RunLambdaTask(submitLambda);
+const submitJob = new tasks.LambdaInvoke(stack, 'LambdaTask', {
+  lambdaFunction: submitLambda
+});
 const startState = new stepfunctions.Pass(stack, 'StartState');
-startState.next(new stepfunctions.Task(stack, 'LambdaTask', {
-  task: submitJob
-}));
+startState.next(submitJob);
 
 const props: EventbridgeToStepfunctionsProps = {
   stateMachineProps: {

diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisfirehose-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisfirehose-s3/lib/index.ts
@@ -16,6 +16,7 @@ import * as kinesisfirehose from '@aws-cdk/aws-kinesisfirehose';
 import * as iam from '@aws-cdk/aws-iam';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as logs from '@aws-cdk/aws-logs';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { EventbridgeToKinesisFirehoseToS3 } from '@aws-solutions-constructs/aws-eventbridge-kinesisfirehose-s3';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisstreams/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-kinesisstreams/lib/index.ts
@@ -15,6 +15,7 @@ import * as events from '@aws-cdk/aws-events';
 import * as kinesis from '@aws-cdk/aws-kinesis';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { EventbridgeToKinesisStreams } from '@aws-solutions-constructs/aws-eventbridge-kinesisstreams';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-lambda/lib/index.ts
@@ -13,6 +13,7 @@
 
 import * as lambda from '@aws-cdk/aws-lambda';
 import * as events from '@aws-cdk/aws-events';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { EventbridgeToLambda } from '@aws-solutions-constructs/aws-eventbridge-lambda';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts
@@ -15,6 +15,7 @@ import * as sns from '@aws-cdk/aws-sns';
 import * as events from '@aws-cdk/aws-events';
 import * as kms from '@aws-cdk/aws-kms';
 import { EventbridgeToSns } from '@aws-solutions-constructs/aws-eventbridge-sns';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 
 export interface EventsRuleToSnsProps {

diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sqs/lib/index.ts
@@ -14,6 +14,7 @@
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as events from '@aws-cdk/aws-events';
 import * as kms from '@aws-cdk/aws-kms';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import { EventbridgeToSqs } from '@aws-solutions-constructs/aws-eventbridge-sqs';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-step-function/lib/index.ts
@@ -14,6 +14,7 @@
 import * as sfn from '@aws-cdk/aws-stepfunctions';
 import * as events from '@aws-cdk/aws-events';
 import { EventbridgeToStepfunctions } from '@aws-solutions-constructs/aws-eventbridge-stepfunctions';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
 import * as logs from '@aws-cdk/aws-logs';

diff --git a/...-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.expected.json b/...-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.expected.json
@@ -308,15 +308,18 @@
           "Fn::Join": [
             "",
             [
-              "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Parameters\":{\"FunctionName\":\"",
+              "{\"StartAt\":\"StartState\",\"States\":{\"StartState\":{\"Type\":\"Pass\",\"Next\":\"LambdaTask\"},\"LambdaTask\":{\"End\":true,\"Retry\":[{\"ErrorEquals\":[\"Lambda.ServiceException\",\"Lambda.AWSLambdaException\",\"Lambda.SdkClientException\"],\"IntervalSeconds\":2,\"MaxAttempts\":6,\"BackoffRate\":2}],\"Type\":\"Task\",\"Resource\":\"arn:",
               {
-                "Ref": "LambdaFunctionBF21E41F"
+                "Ref": "AWS::Partition"
               },
-              "\",\"Payload.$\":\"$\"},\"Type\":\"Task\",\"Resource\":\"arn:",
+              ":states:::lambda:invoke\",\"Parameters\":{\"FunctionName\":\"",
               {
-                "Ref": "AWS::Partition"
+                "Fn::GetAtt": [
+                  "LambdaFunctionBF21E41F",
+                  "Arn"
+                ]
               },
-              ":states:::lambda:invoke\"}},\"TimeoutSeconds\":300}"
+              "\",\"Payload.$\":\"$\"}}},\"TimeoutSeconds\":300}"
             ]
           ]
         },

diff --git a/...structs/aws-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.ts b/...structs/aws-events-rule-step-function/test/integ.events-rule-step-function-with-lambda.ts
@@ -31,11 +31,11 @@ const submitLambda = deployLambdaFunction(stack, {
   handler: 'index.handler'
 });
 
-const submitJob = new tasks.RunLambdaTask(submitLambda);
+const submitJob = new tasks.LambdaInvoke(stack, 'LambdaTask', {
+  lambdaFunction: submitLambda
+});
 const startState = new stepfunctions.Pass(stack, 'StartState');
-startState.next(new stepfunctions.Task(stack, 'LambdaTask', {
-  task: submitJob
-}));
+startState.next(submitJob);
 
 const props: EventsRuleToStepFunctionProps = {
   stateMachineProps: {

diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-kinesisfirehose-s3/lib/index.ts
@@ -16,6 +16,7 @@ import * as iot from '@aws-cdk/aws-iot';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as iam from '@aws-cdk/aws-iam';
 import * as logs from '@aws-cdk/aws-logs';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as defaults from '@aws-solutions-constructs/core';
 import { overrideProps } from '@aws-solutions-constructs/core';

diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda-dynamodb/lib/index.ts
@@ -16,6 +16,7 @@ import * as iot from '@aws-cdk/aws-iot';
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import { IotToLambda } from '@aws-solutions-constructs/aws-iot-lambda';
 import { LambdaToDynamoDB } from '@aws-solutions-constructs/aws-lambda-dynamodb';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as defaults from '@aws-solutions-constructs/core';
 

diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-lambda/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-lambda/lib/index.ts
@@ -14,6 +14,7 @@
 import * as lambda from '@aws-cdk/aws-lambda';
 import * as iot from '@aws-cdk/aws-iot';
 import * as iam from '@aws-cdk/aws-iam';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 import * as defaults from '@aws-solutions-constructs/core';
 import { overrideProps } from '@aws-solutions-constructs/core';

diff --git a/source/patterns/@aws-solutions-constructs/aws-iot-sqs/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-iot-sqs/lib/index.ts
@@ -11,12 +11,13 @@
  *  and limitations under the License.
  */
 
-import * as cdk from '@aws-cdk/core';
 import * as sqs from '@aws-cdk/aws-sqs';
 import * as iot from '@aws-cdk/aws-iot';
 import * as kms from '@aws-cdk/aws-kms';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
+import { Construct } from '@aws-cdk/core';
 
 /**
  * @summary The properties for the IotToSqs class.
@@ -87,7 +88,7 @@ export interface IotToSqsProps {
   readonly iotTopicRuleProps: iot.CfnTopicRuleProps;
 }
 
-export class IotToSqs extends cdk.Construct {
+export class IotToSqs extends Construct {
   public readonly sqsQueue: sqs.Queue;
   public readonly deadLetterQueue?: sqs.DeadLetterQueue;
   public readonly encryptionKey?: kms.IKey;
@@ -101,7 +102,7 @@ export class IotToSqs extends cdk.Construct {
    * @param {IotToSqsProps} props - user provided props for the construct
    * @access public
    */
-  constructor(scope: cdk.Construct, id: string, props: IotToSqsProps) {
+  constructor(scope: Construct, id: string, props: IotToSqsProps) {
     super(scope, id);
     defaults.CheckProps(props);
 

diff --git a/...tterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts b/...tterns/@aws-solutions-constructs/aws-kinesisfirehose-s3-and-kinesisanalytics/lib/index.ts
@@ -19,6 +19,7 @@ import * as s3 from '@aws-cdk/aws-s3';
 import * as logs from '@aws-cdk/aws-logs';
 import * as iam from '@aws-cdk/aws-iam';
 import * as defaults from '@aws-solutions-constructs/core';
+// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
 import { Construct } from '@aws-cdk/core';
 
 /**