@gradientedge/cdk-utils 8.117.0 → 8.119.0

package/src/lib/services/aws/simple-queue-service/main.ts

@@ -1,9 +1,9 @@
-import * as cdk from 'aws-cdk-lib'
-import * as sqs from 'aws-cdk-lib/aws-sqs'
-import * as utils from '../../../utils'
+import { Duration, RemovalPolicy, Tags } from 'aws-cdk-lib'
+import { IQueue, Queue } from 'aws-cdk-lib/aws-sqs'
 import { CommonConstruct } from '../../../common'
-import { QueueProps } from './types'
+import { createCfnOutput } from '../../../utils'
 import { LambdaProps } from '../lambda'
+import { QueueProps } from './types'
 
 /**
  * @classdesc Provides operations on AWS Simple Queue Service.
@@ -13,7 +13,7 @@ import { LambdaProps } from '../lambda'
  * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
  * class CustomConstruct extends CommonConstruct {
- *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
+ *   constructor(parent: Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.sqsManager.createQueue('MySqs', this, {...})
@@ -29,12 +29,12 @@ export class SqsManager {
    * @param props
    * @param deadLetterQueue
    */
-  public createQueue(id: string, scope: CommonConstruct, props: QueueProps, deadLetterQueue?: sqs.IQueue) {
+  public createQueue(id: string, scope: CommonConstruct, props: QueueProps, deadLetterQueue?: IQueue) {
     if (!props) throw `Queue props undefined for ${id}`
 
-    const queue = new sqs.Queue(scope, id, {
+    const queue = new Queue(scope, id, {
       contentBasedDeduplication: props.contentBasedDeduplication,
-      dataKeyReuse: props.dataKeyReuseInSecs ? cdk.Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
+      dataKeyReuse: props.dataKeyReuseInSecs ? Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
       deadLetterQueue: !deadLetterQueue
         ? undefined
         : {
@@ -42,7 +42,7 @@ export class SqsManager {
             queue: deadLetterQueue,
           },
       deduplicationScope: props.deduplicationScope,
-      deliveryDelay: props.deliveryDelayInSecs ? cdk.Duration.seconds(props.deliveryDelayInSecs) : undefined,
+      deliveryDelay: props.deliveryDelayInSecs ? Duration.seconds(props.deliveryDelayInSecs) : undefined,
       encryption: props.encryption,
       encryptionMasterKey: props.encryptionMasterKey,
       fifo: props.fifo,
@@ -50,24 +50,24 @@ export class SqsManager {
       maxMessageSizeBytes: props.maxMessageSizeBytes,
       queueName: props.queueName,
       receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
-        ? cdk.Duration.seconds(props.receiveMessageWaitTimeInSecs)
+        ? Duration.seconds(props.receiveMessageWaitTimeInSecs)
         : props.receiveMessageWaitTime,
-      removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
-      retentionPeriod: props.retentionInDays ? cdk.Duration.days(props.retentionInDays) : cdk.Duration.days(7),
+      removalPolicy: props.removalPolicy ?? RemovalPolicy.DESTROY,
+      retentionPeriod: props.retentionInDays ? Duration.days(props.retentionInDays) : Duration.days(7),
       visibilityTimeout: props.visibilityTimeoutInSecs
-        ? cdk.Duration.seconds(props.visibilityTimeoutInSecs)
+        ? Duration.seconds(props.visibilityTimeoutInSecs)
         : props.visibilityTimeout,
     })
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(queue).add(tag.key, tag.value)
+        Tags.of(queue).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-queueArn`, scope, queue.queueArn)
-    utils.createCfnOutput(`${id}-queueName`, scope, queue.queueName)
-    utils.createCfnOutput(`${id}-queueUrl`, scope, queue.queueUrl)
+    createCfnOutput(`${id}-queueArn`, scope, queue.queueArn)
+    createCfnOutput(`${id}-queueName`, scope, queue.queueName)
+    createCfnOutput(`${id}-queueUrl`, scope, queue.queueUrl)
 
     return queue
   }
@@ -98,7 +98,7 @@ export class SqsManager {
     id: string,
     scope: CommonConstruct,
     props: LambdaProps,
-    deadLetterQueue: sqs.IQueue
+    deadLetterQueue: IQueue
   ) {
     let queueProps
     if (props.dlq) {

package/src/lib/services/aws/simple-storage-service/main.ts

@@ -1,21 +1,21 @@
-import * as cdk from 'aws-cdk-lib'
-import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
-import * as iam from 'aws-cdk-lib/aws-iam'
-import * as s3 from 'aws-cdk-lib/aws-s3'
-import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment'
-import * as utils from '../../../utils'
-import { LifecycleRule, S3BucketProps } from './types'
+import { Duration, RemovalPolicy, Stack, Tags } from 'aws-cdk-lib'
+import { IDistribution } from 'aws-cdk-lib/aws-cloudfront'
+import { Effect, PolicyDocument, PolicyStatement, ServicePrincipal } from 'aws-cdk-lib/aws-iam'
+import { BlockPublicAccess, Bucket, BucketEncryption, CfnBucket, CfnBucketPolicy, IBucket } from 'aws-cdk-lib/aws-s3'
+import { BucketDeployment, ISource, ServerSideEncryption, Source } from 'aws-cdk-lib/aws-s3-deployment'
 import { CommonConstruct } from '../../../common'
+import { createCfnOutput } from '../../../utils'
+import { LifecycleRule, S3BucketProps } from './types'
 
 /**
- * @classdesc Provides operations on AWS S3.
+ * @classdesc Provides operations on AWS S3
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
  * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
  * @example
  * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
  * class CustomConstruct extends CommonConstruct {
- *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
+ *   constructor(parent: Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.s3Manager.createS3Bucket('MyBucket', this)
@@ -36,12 +36,12 @@ export class S3Manager {
       bucketLifecycleRules.push({
         abortIncompleteMultipartUploadAfter: lifecycleRule.abortIncompleteMultipartUploadAfter,
         enabled: lifecycleRule.enabled,
-        expiration: lifecycleRule.expirationInDays ? cdk.Duration.days(lifecycleRule.expirationInDays) : undefined,
+        expiration: lifecycleRule.expirationInDays ? Duration.days(lifecycleRule.expirationInDays) : undefined,
         expirationDate: lifecycleRule.expirationDate,
         expiredObjectDeleteMarker: lifecycleRule.expiredObjectDeleteMarker,
         id: lifecycleRule.id,
         noncurrentVersionExpiration: lifecycleRule.noncurrentVersionExpirationInDays
-          ? cdk.Duration.days(lifecycleRule.noncurrentVersionExpirationInDays)
+          ? Duration.days(lifecycleRule.noncurrentVersionExpirationInDays)
           : undefined,
         noncurrentVersionTransitions: lifecycleRule.noncurrentVersionTransitions,
         prefix: lifecycleRule.prefix,
@@ -59,7 +59,7 @@ export class S3Manager {
    * @param bucketName the bucket name
    */
   protected static determineBucketNameByAccountAndRegion(scope: CommonConstruct, bucketName: string) {
-    return `${bucketName}-${cdk.Stack.of(scope).account}-${scope.props.region}-${scope.props.stage}`
+    return `${bucketName}-${Stack.of(scope).account}-${scope.props.region}-${scope.props.stage}`
   }
 
   /**
@@ -93,32 +93,32 @@ export class S3Manager {
   public createS3Bucket(id: string, scope: CommonConstruct, props: S3BucketProps) {
     if (!props) throw `S3 props undefined for ${id}`
 
-    let bucket: s3.IBucket
+    let bucket: IBucket
 
     const bucketName = S3Manager.determineBucketName(scope, props.bucketName)
 
     if (props.existingBucket && props.bucketName) {
-      bucket = s3.Bucket.fromBucketName(scope, `${id}`, bucketName)
+      bucket = Bucket.fromBucketName(scope, `${id}`, bucketName)
     } else {
       let logBucket
       if (props.logBucketName) {
         const logBucketName = S3Manager.determineBucketName(scope, props.logBucketName)
-        logBucket = s3.Bucket.fromBucketName(scope, `${id}-logs`, logBucketName)
+        logBucket = Bucket.fromBucketName(scope, `${id}-logs`, logBucketName)
       }
 
-      bucket = new s3.Bucket(scope, `${id}-bucket`, {
+      bucket = new Bucket(scope, `${id}-bucket`, {
         accessControl: props.accessControl,
         autoDeleteObjects: props.autoDeleteObjects,
-        blockPublicAccess: props.blockPublicAccess || s3.BlockPublicAccess.BLOCK_ALL,
+        blockPublicAccess: props.blockPublicAccess || BlockPublicAccess.BLOCK_ALL,
         bucketName: bucketName,
         cors: props.cors,
-        encryption: props.encryption || s3.BucketEncryption.S3_MANAGED,
+        encryption: props.encryption || BucketEncryption.S3_MANAGED,
         encryptionKey: props.encryptionKey,
         lifecycleRules: this.determineBucketLifecycleRules(props),
         metrics: props.metrics,
         objectOwnership: props.objectOwnership,
         publicReadAccess: props.publicReadAccess,
-        removalPolicy: props.removalPolicy || cdk.RemovalPolicy.RETAIN,
+        removalPolicy: props.removalPolicy || RemovalPolicy.RETAIN,
         serverAccessLogsBucket: logBucket,
         serverAccessLogsPrefix: props.serverAccessLogsPrefix,
         versioned: props.versioned,
@@ -127,7 +127,7 @@ export class S3Manager {
         websiteRoutingRules: props.websiteRoutingRules,
       })
 
-      const cfnBucket = bucket.node.defaultChild as s3.CfnBucket
+      const cfnBucket = bucket.node.defaultChild as CfnBucket
       cfnBucket.notificationConfiguration = {
         eventBridgeConfiguration: {
           eventBridgeEnabled: props.enableEventBridge ?? false,
@@ -137,12 +137,12 @@ export class S3Manager {
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(bucket).add(tag.key, tag.value)
+        Tags.of(bucket).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-bucketName`, scope, bucket.bucketName)
-    utils.createCfnOutput(`${id}-bucketArn`, scope, bucket.bucketArn)
+    createCfnOutput(`${id}-bucketName`, scope, bucket.bucketName)
+    createCfnOutput(`${id}-bucketArn`, scope, bucket.bucketArn)
 
     return bucket
   }
@@ -153,27 +153,27 @@ export class S3Manager {
    * @param scope scope in which this resource is defined
    * @param bucket
    */
-  public createBucketPolicyForCloudTrail(id: string, scope: CommonConstruct, bucket: s3.IBucket) {
-    const bucketPolicyDocument = new iam.PolicyDocument({
+  public createBucketPolicyForCloudTrail(id: string, scope: CommonConstruct, bucket: IBucket) {
+    const bucketPolicyDocument = new PolicyDocument({
       statements: [
-        new iam.PolicyStatement({
+        new PolicyStatement({
           actions: ['s3:GetBucketAcl'],
-          effect: iam.Effect.ALLOW,
-          principals: [new iam.ServicePrincipal('cloudtrail.amazonaws.com')],
+          effect: Effect.ALLOW,
+          principals: [new ServicePrincipal('cloudtrail.amazonaws.com')],
           resources: [bucket.bucketArn],
           sid: 'AWSCloudTrailAclCheck20150319',
         }),
-        new iam.PolicyStatement({
+        new PolicyStatement({
           actions: ['s3:PutObject'],
-          effect: iam.Effect.ALLOW,
-          principals: [new iam.ServicePrincipal('cloudtrail.amazonaws.com')],
+          effect: Effect.ALLOW,
+          principals: [new ServicePrincipal('cloudtrail.amazonaws.com')],
           resources: [bucket.arnForObjects('*')],
           sid: 'AWSCloudTrailWrite20150319',
         }),
       ],
     })
 
-    return new s3.CfnBucketPolicy(scope, `${id}`, {
+    return new CfnBucketPolicy(scope, `${id}`, {
       bucket: bucket.bucketName,
       policyDocument: bucketPolicyDocument,
     })
@@ -192,20 +192,20 @@ export class S3Manager {
   public doBucketDeployment(
     id: string,
     scope: CommonConstruct,
-    siteBucket: s3.IBucket,
-    distribution: cloudfront.IDistribution,
-    sources: s3deploy.ISource[],
+    siteBucket: IBucket,
+    distribution: IDistribution,
+    sources: ISource[],
     prefix: string,
     prune?: boolean
   ) {
-    new s3deploy.BucketDeployment(scope, `${id}`, {
+    new BucketDeployment(scope, `${id}`, {
       destinationBucket: siteBucket,
       destinationKeyPrefix: prefix,
       distribution: distribution,
       distributionPaths: ['/*'],
       memoryLimit: 1024,
       prune: !!prune,
-      serverSideEncryption: s3deploy.ServerSideEncryption.AES_256,
+      serverSideEncryption: ServerSideEncryption.AES_256,
       sources: sources,
     })
   }
@@ -217,17 +217,17 @@ export class S3Manager {
    * @param bucket bucket to create the folders in
    * @param folders list of folder names to be created in the bucket
    */
-  public createBucketFolders(id: string, scope: CommonConstruct, bucket: s3.IBucket, folders: string[]) {
+  public createBucketFolders(id: string, scope: CommonConstruct, bucket: IBucket, folders: string[]) {
     if (!folders || folders.length == 0) {
       throw `Folder unspecified for ${id}`
     }
 
     folders.forEach(folder => {
-      new s3deploy.BucketDeployment(scope, `${id}-${folder}`, {
+      new BucketDeployment(scope, `${id}-${folder}`, {
         destinationBucket: bucket,
         destinationKeyPrefix: folder,
         prune: false,
-        sources: [s3deploy.Source.data('README.md', `This is the ${folder} folder for ${id}`)],
+        sources: [Source.data('README.md', `This is the ${folder} folder for ${id}`)],
       })
     })
   }

package/src/lib/services/aws/step-function/main.ts

@@ -1,16 +1,38 @@
-import * as cdk from 'aws-cdk-lib'
-import * as apig from 'aws-cdk-lib/aws-apigateway'
-import * as dynamodb from 'aws-cdk-lib/aws-dynamodb'
-import * as iam from 'aws-cdk-lib/aws-iam'
-import * as lambda from 'aws-cdk-lib/aws-lambda'
-import * as logs from 'aws-cdk-lib/aws-logs'
-import * as sqs from 'aws-cdk-lib/aws-sqs'
-import * as sfn from 'aws-cdk-lib/aws-stepfunctions'
-import { DefinitionBody } from 'aws-cdk-lib/aws-stepfunctions'
-import * as tasks from 'aws-cdk-lib/aws-stepfunctions-tasks'
-import * as utils from '../../../utils'
+import { Duration } from 'aws-cdk-lib'
+import { IRestApi } from 'aws-cdk-lib/aws-apigateway'
+import { ITable } from 'aws-cdk-lib/aws-dynamodb'
+import { IRole } from 'aws-cdk-lib/aws-iam'
+import { IFunction } from 'aws-cdk-lib/aws-lambda'
+import { ILogGroup } from 'aws-cdk-lib/aws-logs'
+import { IQueue } from 'aws-cdk-lib/aws-sqs'
+import {
+  Choice,
+  DefinitionBody,
+  Fail,
+  IChainable,
+  IStateMachine,
+  LogLevel,
+  Map,
+  Parallel,
+  Pass,
+  StateMachine,
+  Succeed,
+  Wait,
+  WaitTime,
+} from 'aws-cdk-lib/aws-stepfunctions'
+import {
+  CallApiGatewayRestApiEndpoint,
+  DynamoAttributeValue,
+  DynamoDeleteItem,
+  DynamoGetItem,
+  DynamoPutItem,
+  LambdaInvoke,
+  SqsSendMessage,
+  StepFunctionsStartExecution,
+} from 'aws-cdk-lib/aws-stepfunctions-tasks'
 import { v4 as uuidv4 } from 'uuid'
 import { CommonConstruct } from '../../../common'
+import { createCfnOutput } from '../../../utils'
 import {
   SfnCallApiGatewayRestApiEndpointProps,
   SfnChoiceProps,
@@ -46,7 +68,7 @@ const DEFAULT_RETRY_CONFIG = [
  * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
  * class CustomConstruct extends CommonConstruct {
- *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
+ *   constructor(parent: Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.sfnManager.createSuccessStep('MyStep', this, myStepProps)
@@ -63,7 +85,7 @@ export class SfnManager {
    */
   public createSuccessStep(id: string, scope: CommonConstruct, props: SfnSucceedProps) {
     if (!props) throw `Step props undefined for ${id}`
-    return new sfn.Succeed(scope, `${props.name}`, {
+    return new Succeed(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Succeed step for ${props.name} - ${scope.props.stage} stage`,
@@ -79,7 +101,7 @@ export class SfnManager {
    */
   public createFailStep(id: string, scope: CommonConstruct, props: SfnFailProps) {
     if (!props) throw `Step props undefined for ${id}`
-    return new sfn.Fail(scope, `${props.name}`, {
+    return new Fail(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Fail step for ${props.name} - ${scope.props.stage} stage`,
@@ -95,7 +117,7 @@ export class SfnManager {
    */
   public createPassStep(id: string, scope: CommonConstruct, props: SfnPassProps) {
     if (!props) throw `Step props undefined for ${id}`
-    return new sfn.Pass(scope, `${props.name}`, {
+    return new Pass(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Pass step for ${props.name} - ${scope.props.stage} stage`,
@@ -111,7 +133,7 @@ export class SfnManager {
    */
   public createParallelStep(id: string, scope: CommonConstruct, props: SfnParallelProps) {
     if (!props) throw `Step props undefined for ${id}`
-    return new sfn.Parallel(scope, `${props.name}`, {
+    return new Parallel(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Parallel step for ${props.name} - ${scope.props.stage} stage`,
@@ -127,7 +149,7 @@ export class SfnManager {
    */
   public createChoiceStep(id: string, scope: CommonConstruct, props: SfnChoiceProps) {
     if (!props) throw `Step props undefined for ${id}`
-    return new sfn.Choice(scope, `${props.name}`, {
+    return new Choice(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
@@ -142,11 +164,11 @@ export class SfnManager {
    * @param props
    */
   public createWaitStep(id: string, scope: CommonConstruct, props: SfnWaitProps) {
-    return new sfn.Wait(scope, `${props.name}`, {
+    return new Wait(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
-        time: sfn.WaitTime.duration(cdk.Duration.seconds(props.delayInSeconds)),
+        time: WaitTime.duration(Duration.seconds(props.delayInSeconds)),
       },
     })
   }
@@ -163,11 +185,11 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnDynamoGetItemProps,
-    table: dynamodb.ITable,
-    tableKey: { [key: string]: tasks.DynamoAttributeValue }
+    table: ITable,
+    tableKey: { [key: string]: DynamoAttributeValue }
   ) {
     if (!props) throw `Step props undefined for ${id}`
-    const step = new tasks.DynamoGetItem(scope, `${props.name}`, {
+    const step = new DynamoGetItem(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `DynamoDB GetItem step for ${props.name} - ${scope.props.stage} stage`,
@@ -195,7 +217,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -214,11 +236,11 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnDynamoPutItemProps,
-    table: dynamodb.ITable,
-    tableItem: { [key: string]: tasks.DynamoAttributeValue }
+    table: ITable,
+    tableItem: { [key: string]: DynamoAttributeValue }
   ) {
     if (!props) throw `Step props undefined for ${id}`
-    const step = new tasks.DynamoPutItem(scope, `${props.name}`, {
+    const step = new DynamoPutItem(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
@@ -248,7 +270,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -267,11 +289,11 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnDynamoDeleteItemProps,
-    table: dynamodb.ITable,
-    tableKey: { [key: string]: tasks.DynamoAttributeValue }
+    table: ITable,
+    tableKey: { [key: string]: DynamoAttributeValue }
   ) {
     if (!props) throw `Step props undefined for ${id}`
-    const step = new tasks.DynamoDeleteItem(scope, `${props.name}`, {
+    const step = new DynamoDeleteItem(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `DynamoDB DeleteItem step for ${props.name} - ${scope.props.stage} stage`,
@@ -301,7 +323,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -315,15 +337,10 @@ export class SfnManager {
    * @param props
    * @param queue The queue to send the message to
    */
-  public createSendSqsMessageStep(
-    id: string,
-    scope: CommonConstruct,
-    props: SfnSqsSendMessageProps,
-    queue: sqs.IQueue
-  ) {
+  public createSendSqsMessageStep(id: string, scope: CommonConstruct, props: SfnSqsSendMessageProps, queue: IQueue) {
     if (!props) throw `Step props undefined for ${id}`
     if (!props.messageBody) throw 'Message body undefined'
-    const step = new tasks.SqsSendMessage(scope, `${props.name}`, {
+    const step = new SqsSendMessage(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
@@ -350,7 +367,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -364,14 +381,9 @@ export class SfnManager {
    * @param props
    * @param lambdaFunction
    */
-  public createLambdaStep(
-    id: string,
-    scope: CommonConstruct,
-    props: SfnLambdaInvokeProps,
-    lambdaFunction: lambda.IFunction
-  ) {
+  public createLambdaStep(id: string, scope: CommonConstruct, props: SfnLambdaInvokeProps, lambdaFunction: IFunction) {
     if (!props) throw `Step props undefined for ${id}`
-    const step = new tasks.LambdaInvoke(scope, `${props.name}`, {
+    const step = new LambdaInvoke(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
@@ -387,7 +399,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -406,12 +418,12 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnLambdaInvokeProps,
-    lambdaFunction: lambda.IFunction,
+    lambdaFunction: IFunction,
     skipExecution?: boolean
   ) {
     if (!props) throw `Step props undefined for ${id}`
-    if (skipExecution) return this.createPassStep(id, scope, { name: props.name, comment: props.comment })
-    const step = new tasks.LambdaInvoke(scope, `${props.name}`, {
+    if (skipExecution) return this.createPassStep(id, scope, { comment: props.comment, name: props.name })
+    const step = new LambdaInvoke(scope, `${props.name}`, {
       ...props,
       ...{
         comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
@@ -427,7 +439,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -445,10 +457,10 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnCallApiGatewayRestApiEndpointProps,
-    api: apig.IRestApi
+    api: IRestApi
   ) {
     if (!props) throw `Step props undefined for ${id}`
-    const step = new tasks.CallApiGatewayRestApiEndpoint(scope, `${props.name}`, {
+    const step = new CallApiGatewayRestApiEndpoint(scope, `${props.name}`, {
       ...props,
       ...{
         api,
@@ -465,7 +477,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -483,9 +495,9 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnStartExecutionProps,
-    stateMachine: sfn.IStateMachine
+    stateMachine: IStateMachine
   ) {
-    const step = new tasks.StepFunctionsStartExecution(scope, `${id}`, {
+    const step = new StepFunctionsStartExecution(scope, `${id}`, {
       ...props,
       associateWithParent: props.associateWithParent ?? true,
       inputPath: props.inputPath,
@@ -501,7 +513,7 @@ export class SfnManager {
     retries.forEach(retry =>
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? cdk.Duration.seconds(retry.intervalInSecs) : retry.interval },
+        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
     )
 
@@ -515,7 +527,7 @@ export class SfnManager {
    * @param props props for the map state
    */
   public createMapState(id: string, scope: CommonConstruct, props: SfnMapProps) {
-    return new sfn.Map(scope, `${id}`, props)
+    return new Map(scope, `${id}`, props)
   }
 
   /**
@@ -531,17 +543,17 @@ export class SfnManager {
     id: string,
     scope: CommonConstruct,
     props: SfnStateMachineProps,
-    definition: sfn.IChainable,
-    logGroup: logs.ILogGroup,
-    role?: iam.IRole
+    definition: IChainable,
+    logGroup: ILogGroup,
+    role?: IRole
   ) {
     if (!props) throw `State Machine props undefined for ${id}`
-    const stateMachine = new sfn.StateMachine(scope, `${id}`, {
+    const stateMachine = new StateMachine(scope, `${id}`, {
       definitionBody: DefinitionBody.fromChainable(definition),
       logs: {
         destination: logGroup,
         includeExecutionData: props.logs?.includeExecutionData ?? true,
-        level: props.logs?.level ?? sfn.LogLevel.ALL,
+        level: props.logs?.level ?? LogLevel.ALL,
       },
       role,
       stateMachineName: `${props.stateMachineName}-${scope.props.stage}`,
@@ -550,8 +562,8 @@ export class SfnManager {
       tracingEnabled: props.tracingEnabled,
     })
 
-    utils.createCfnOutput(`${id}-stateMachineName`, scope, stateMachine.stateMachineName)
-    utils.createCfnOutput(`${id}-stateMachineArn`, scope, stateMachine.stateMachineArn)
+    createCfnOutput(`${id}-stateMachineName`, scope, stateMachine.stateMachineName)
+    createCfnOutput(`${id}-stateMachineArn`, scope, stateMachine.stateMachineArn)
 
     return stateMachine
   }