@gradientedge/cdk-utils 8.123.0 → 8.125.0

package/dist/src/lib/aws/services/key-management-service/main.js

@@ -30,16 +30,8 @@ class KmsManager {
         if (!props)
             throw `KMS Key props undefined for ${id}`;
         const key = new aws_kms_1.Key(scope, `${id}`, {
-            admins: props.admins,
+            ...props,
             alias: `${props.alias}-${scope.props.stage}`,
-            description: props.description,
-            enableKeyRotation: props.enableKeyRotation,
-            enabled: props.enabled,
-            keySpec: props.keySpec,
-            keyUsage: props.keyUsage,
-            pendingWindow: props.pendingWindow,
-            policy: props.policy,
-            removalPolicy: props.removalPolicy,
         });
         (0, utils_1.createCfnOutput)(`${id}-keyId`, scope, key.keyId);
         (0, utils_1.createCfnOutput)(`${id}-keyArn`, scope, key.keyArn);

package/dist/src/lib/aws/services/lambda/main.js

@@ -73,34 +73,31 @@ class LambdaManager {
         }
         const lambdaFunction = new aws_lambda_1.Function(scope, `${id}`, {
             ...props,
-            ...{
-                allowPublicSubnet: !!vpc,
-                architecture: props.architecture ?? aws_lambda_1.Architecture.ARM_64,
-                code: code,
-                deadLetterQueue: deadLetterQueue,
-                environment: {
-                    LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
-                        ? ''
-                        : scope.ssmManager.readStringParameter(`${id}-sm-ts`, scope, `${systems_manager_1.SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`),
-                    REGION: scope.props.region,
-                    STAGE: scope.props.stage,
-                    ...environment,
-                },
-                filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
-                functionName: functionName,
-                handler: handler || 'index.lambda_handler',
-                insightsVersion: props.insightsVersion,
-                layers: layers,
-                logRetention: scope.props.logRetention ?? props.logRetention,
-                reservedConcurrentExecutions: props.reservedConcurrentExecutions ?? scope.props.defaultReservedLambdaConcurrentExecutions,
-                role: role instanceof aws_iam_1.Role ? role : undefined,
-                runtime: props.runtime ?? scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME,
-                securityGroups: securityGroups,
-                timeout: props.timeoutInSecs ? aws_cdk_lib_1.Duration.seconds(props.timeoutInSecs) : aws_cdk_lib_1.Duration.minutes(15),
-                tracing: scope.props.defaultTracing ?? props.tracing,
-                vpc,
-                vpcSubnets,
+            allowPublicSubnet: !!vpc,
+            architecture: props.architecture ?? aws_lambda_1.Architecture.ARM_64,
+            code,
+            deadLetterQueue,
+            environment: {
+                LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+                    ? ''
+                    : scope.ssmManager.readStringParameter(`${id}-sm-ts`, scope, `${systems_manager_1.SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`),
+                REGION: scope.props.region,
+                STAGE: scope.props.stage,
+                ...environment,
             },
+            filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
+            functionName,
+            handler: handler || 'index.lambda_handler',
+            layers,
+            logRetention: scope.props.logRetention ?? props.logRetention,
+            reservedConcurrentExecutions: props.reservedConcurrentExecutions ?? scope.props.defaultReservedLambdaConcurrentExecutions,
+            role: role instanceof aws_iam_1.Role ? role : undefined,
+            runtime: props.runtime ?? scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME,
+            securityGroups,
+            timeout: props.timeoutInSecs ? aws_cdk_lib_1.Duration.seconds(props.timeoutInSecs) : aws_cdk_lib_1.Duration.minutes(15),
+            tracing: scope.props.defaultTracing ?? props.tracing,
+            vpc,
+            vpcSubnets,
         });
         if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
             lambdaFunction.addEventSource(new aws_lambda_event_sources_1.SqsEventSource(lambdaFunction.deadLetterQueue, {
@@ -173,32 +170,27 @@ class LambdaManager {
         }
         const lambdaFunction = new aws_lambda_1.DockerImageFunction(scope, `${id}`, {
             ...props,
-            ...{
-                allowPublicSubnet: !!vpc,
-                architecture: props.architecture ?? aws_lambda_1.Architecture.ARM_64,
-                code: code,
-                deadLetterQueue: deadLetterQueue,
-                environment: {
-                    LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
-                        ? ''
-                        : scope.ssmManager.readStringParameter(`${id}-sm-ts`, scope, `${systems_manager_1.SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`),
-                    REGION: scope.props.region,
-                    STAGE: scope.props.stage,
-                    ...environment,
-                },
-                filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
-                functionName: functionName,
-                insightsVersion: props.insightsVersion,
-                logRetention: scope.props.logRetention ?? props.logRetention,
-                reservedConcurrentExecutions: props.reservedConcurrentExecutions,
-                role: role instanceof aws_iam_1.Role ? role : undefined,
-                runtime: props.runtime ?? scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME,
-                securityGroups: securityGroups,
-                timeout: props.timeoutInSecs ? aws_cdk_lib_1.Duration.seconds(props.timeoutInSecs) : aws_cdk_lib_1.Duration.minutes(1),
-                tracing: props.tracing,
-                vpc,
-                vpcSubnets,
+            allowPublicSubnet: !!vpc,
+            architecture: props.architecture ?? aws_lambda_1.Architecture.ARM_64,
+            code,
+            deadLetterQueue,
+            environment: {
+                LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+                    ? ''
+                    : scope.ssmManager.readStringParameter(`${id}-sm-ts`, scope, `${systems_manager_1.SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`),
+                REGION: scope.props.region,
+                STAGE: scope.props.stage,
+                ...environment,
             },
+            filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
+            functionName,
+            logRetention: scope.props.logRetention ?? props.logRetention,
+            role: role instanceof aws_iam_1.Role ? role : undefined,
+            securityGroups: securityGroups,
+            timeout: props.timeoutInSecs ? aws_cdk_lib_1.Duration.seconds(props.timeoutInSecs) : aws_cdk_lib_1.Duration.minutes(1),
+            tracing: props.tracing,
+            vpc,
+            vpcSubnets,
         });
         if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
             lambdaFunction.addEventSource(new aws_lambda_event_sources_1.SqsEventSource(lambdaFunction.deadLetterQueue, {
@@ -222,17 +214,7 @@ class LambdaManager {
             throw `Lambda Alias props undefined for ${id}`;
         const lambdaFunctionAlias = new aws_lambda_1.Alias(scope, `${id}`, {
             ...props,
-            ...{
-                additionalVersions: props.additionalVersions,
-                aliasName: props.aliasName,
-                description: props.description,
-                maxEventAge: props.maxEventAge,
-                onFailure: props.onFailure,
-                onSuccess: props.onSuccess,
-                provisionedConcurrentExecutions: props.provisionedConcurrentExecutions,
-                retryAttempts: props.retryAttempts,
-                version: lambdaVersion,
-            },
+            version: lambdaVersion,
         });
         (0, utils_1.createCfnOutput)(`${id}-lambdaAliasName`, scope, lambdaFunctionAlias.functionArn);
         (0, utils_1.createCfnOutput)(`${id}-lambdaAliasArn`, scope, lambdaFunctionAlias.functionName);

package/dist/src/lib/aws/services/secrets-manager/main.js

@@ -56,7 +56,7 @@ class SecretsManager {
     async resolveSecretValue(region, secretId, secretKey) {
         const client = new client_secrets_manager_1.SecretsManagerClient({
             credentials: (0, utils_1.determineCredentials)(),
-            region: region,
+            region,
         });
         const command = new client_secrets_manager_1.GetSecretValueCommand({
             SecretId: secretId,

package/dist/src/lib/aws/services/simple-notification-service/main.js

@@ -36,8 +36,8 @@ class SnsManager {
         if (!props)
             throw `Subscription props undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
+            ...props,
             displayName: `${props.topicName}-${scope.props.stage}`,
-            fifo: props.fifo,
             topicName: `${props.topicName}-${scope.props.stage}`,
         });
         if (emails && !lodash_1.default.isEmpty(emails)) {
@@ -58,8 +58,8 @@ class SnsManager {
         if (!props)
             throw `Subscription props undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
+            ...props,
             displayName: `${props.topicName}-${scope.props.stage}`,
-            fifo: props.fifo,
             topicName: `${props.topicName}-${scope.props.stage}`,
         });
         topic.addSubscription(new aws_sns_subscriptions_1.LambdaSubscription(lambdaFunction));

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

@@ -36,7 +36,7 @@ class SqsManager {
         if (!props)
             throw `Queue props undefined for ${id}`;
         const queue = new aws_sqs_1.Queue(scope, id, {
-            contentBasedDeduplication: props.contentBasedDeduplication,
+            ...props,
             dataKeyReuse: props.dataKeyReuseInSecs ? aws_cdk_lib_1.Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
             deadLetterQueue: !deadLetterQueue
                 ? undefined
@@ -44,14 +44,7 @@ class SqsManager {
                     maxReceiveCount: props.maxReceiveCount ?? 5,
                     queue: deadLetterQueue,
                 },
-            deduplicationScope: props.deduplicationScope,
             deliveryDelay: props.deliveryDelayInSecs ? aws_cdk_lib_1.Duration.seconds(props.deliveryDelayInSecs) : undefined,
-            encryption: props.encryption,
-            encryptionMasterKey: props.encryptionMasterKey,
-            fifo: props.fifo,
-            fifoThroughputLimit: props.fifoThroughputLimit,
-            maxMessageSizeBytes: props.maxMessageSizeBytes,
-            queueName: props.queueName,
             receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
                 ? aws_cdk_lib_1.Duration.seconds(props.receiveMessageWaitTimeInSecs)
                 : props.receiveMessageWaitTime,

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

@@ -37,19 +37,11 @@ class S3Manager {
         const bucketLifecycleRules = [];
         lodash_1.default.forEach(props.lifecycleRules, lifecycleRule => {
             bucketLifecycleRules.push({
-                abortIncompleteMultipartUploadAfter: lifecycleRule.abortIncompleteMultipartUploadAfter,
-                enabled: lifecycleRule.enabled,
+                ...lifecycleRule,
                 expiration: lifecycleRule.expirationInDays ? aws_cdk_lib_1.Duration.days(lifecycleRule.expirationInDays) : undefined,
-                expirationDate: lifecycleRule.expirationDate,
-                expiredObjectDeleteMarker: lifecycleRule.expiredObjectDeleteMarker,
-                id: lifecycleRule.id,
                 noncurrentVersionExpiration: lifecycleRule.noncurrentVersionExpirationInDays
                     ? aws_cdk_lib_1.Duration.days(lifecycleRule.noncurrentVersionExpirationInDays)
                     : undefined,
-                noncurrentVersionTransitions: lifecycleRule.noncurrentVersionTransitions,
-                prefix: lifecycleRule.prefix,
-                tagFilters: lifecycleRule.tagFilters,
-                transitions: lifecycleRule.transitions,
             });
         });
         return bucketLifecycleRules;
@@ -103,24 +95,13 @@ class S3Manager {
                 logBucket = aws_s3_1.Bucket.fromBucketName(scope, `${id}-logs`, logBucketName);
             }
             bucket = new aws_s3_1.Bucket(scope, `${id}-bucket`, {
-                accessControl: props.accessControl,
-                autoDeleteObjects: props.autoDeleteObjects,
+                ...props,
                 blockPublicAccess: props.blockPublicAccess || aws_s3_1.BlockPublicAccess.BLOCK_ALL,
-                bucketName: bucketName,
-                cors: props.cors,
+                bucketName,
                 encryption: props.encryption || aws_s3_1.BucketEncryption.S3_MANAGED,
-                encryptionKey: props.encryptionKey,
                 lifecycleRules: this.determineBucketLifecycleRules(props),
-                metrics: props.metrics,
-                objectOwnership: props.objectOwnership,
-                publicReadAccess: props.publicReadAccess,
                 removalPolicy: props.removalPolicy || aws_cdk_lib_1.RemovalPolicy.RETAIN,
                 serverAccessLogsBucket: logBucket,
-                serverAccessLogsPrefix: props.serverAccessLogsPrefix,
-                versioned: props.versioned,
-                websiteErrorDocument: props.websiteErrorDocument,
-                websiteIndexDocument: props.websiteIndexDocument,
-                websiteRoutingRules: props.websiteRoutingRules,
             });
             const cfnBucket = bucket.node.defaultChild;
             cfnBucket.notificationConfiguration = {

package/dist/src/lib/aws/services/step-function/main.js

@@ -46,9 +46,7 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         return new aws_stepfunctions_1.Succeed(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Succeed step for ${props.name} - ${scope.props.stage} stage`,
-            },
+            comment: `Succeed step for ${props.name} - ${scope.props.stage} stage`,
         });
     }
     /**
@@ -62,9 +60,7 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         return new aws_stepfunctions_1.Fail(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Fail step for ${props.name} - ${scope.props.stage} stage`,
-            },
+            comment: `Fail step for ${props.name} - ${scope.props.stage} stage`,
         });
     }
     /**
@@ -78,9 +74,7 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         return new aws_stepfunctions_1.Pass(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Pass step for ${props.name} - ${scope.props.stage} stage`,
-            },
+            comment: `Pass step for ${props.name} - ${scope.props.stage} stage`,
         });
     }
     /**
@@ -94,9 +88,7 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         return new aws_stepfunctions_1.Parallel(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Parallel step for ${props.name} - ${scope.props.stage} stage`,
-            },
+            comment: `Parallel step for ${props.name} - ${scope.props.stage} stage`,
         });
     }
     /**
@@ -110,9 +102,7 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         return new aws_stepfunctions_1.Choice(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
-            },
+            comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
         });
     }
     /**
@@ -124,10 +114,8 @@ class SfnManager {
     createWaitStep(id, scope, props) {
         return new aws_stepfunctions_1.Wait(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
-                time: aws_stepfunctions_1.WaitTime.duration(aws_cdk_lib_1.Duration.seconds(props.delayInSeconds)),
-            },
+            comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
+            time: aws_stepfunctions_1.WaitTime.duration(aws_cdk_lib_1.Duration.seconds(props.delayInSeconds)),
         });
     }
     /**
@@ -143,22 +131,9 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         const step = new aws_stepfunctions_tasks_1.DynamoGetItem(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `DynamoDB GetItem step for ${props.name} - ${scope.props.stage} stage`,
-                consistentRead: props.consistentRead,
-                expressionAttributeNames: props.expressionAttributeNames,
-                heartbeatTimeout: props.heartbeatTimeout,
-                inputPath: props.inputPath,
-                integrationPattern: props.integrationPattern,
-                key: tableKey,
-                outputPath: props.outputPath,
-                projectionExpression: props.projectionExpression,
-                resultPath: props.resultPath,
-                resultSelector: props.resultSelector,
-                returnConsumedCapacity: props.returnConsumedCapacity,
-                table: table,
-                taskTimeout: props.taskTimeout,
-            },
+            comment: `DynamoDB GetItem step for ${props.name} - ${scope.props.stage} stage`,
+            key: tableKey,
+            table,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -167,7 +142,7 @@ class SfnManager {
         lodash_1.default.forEach(retries, retry => {
             step.addRetry({
                 ...retry,
-                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+                interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval,
             });
         });
         return step;
@@ -185,24 +160,9 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         const step = new aws_stepfunctions_tasks_1.DynamoPutItem(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
-                conditionExpression: props.conditionExpression,
-                expressionAttributeNames: props.expressionAttributeNames,
-                expressionAttributeValues: props.expressionAttributeValues,
-                heartbeatTimeout: props.heartbeatTimeout,
-                inputPath: props.inputPath,
-                integrationPattern: props.integrationPattern,
-                item: tableItem,
-                outputPath: props.outputPath,
-                resultPath: props.resultPath,
-                resultSelector: props.resultSelector,
-                returnConsumedCapacity: props.returnConsumedCapacity,
-                returnItemCollectionMetrics: props.returnItemCollectionMetrics,
-                returnValues: props.returnValues,
-                table: table,
-                taskTimeout: props.taskTimeout,
-            },
+            comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
+            item: tableItem,
+            table,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -229,24 +189,9 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         const step = new aws_stepfunctions_tasks_1.DynamoDeleteItem(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `DynamoDB DeleteItem step for ${props.name} - ${scope.props.stage} stage`,
-                conditionExpression: props.conditionExpression,
-                expressionAttributeNames: props.expressionAttributeNames,
-                expressionAttributeValues: props.expressionAttributeValues,
-                heartbeatTimeout: props.heartbeatTimeout,
-                inputPath: props.inputPath,
-                integrationPattern: props.integrationPattern,
-                key: tableKey,
-                outputPath: props.outputPath,
-                resultPath: props.resultPath,
-                resultSelector: props.resultSelector,
-                returnConsumedCapacity: props.returnConsumedCapacity,
-                returnItemCollectionMetrics: props.returnItemCollectionMetrics,
-                returnValues: props.returnValues,
-                table: table,
-                taskTimeout: props.taskTimeout,
-            },
+            comment: `DynamoDB DeleteItem step for ${props.name} - ${scope.props.stage} stage`,
+            key: tableKey,
+            table,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -274,21 +219,8 @@ class SfnManager {
             throw 'Message body undefined';
         const step = new aws_stepfunctions_tasks_1.SqsSendMessage(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
-                delay: props.delay,
-                heartbeatTimeout: props.heartbeatTimeout,
-                inputPath: props.inputPath,
-                integrationPattern: props.integrationPattern,
-                messageBody: props.messageBody,
-                messageDeduplicationId: props.messageDeduplicationId,
-                messageGroupId: props.messageGroupId,
-                outputPath: props.outputPath,
-                queue: queue,
-                resultPath: props.resultPath,
-                resultSelector: props.resultSelector,
-                taskTimeout: props.taskTimeout,
-            },
+            comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
+            queue,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -297,7 +229,7 @@ class SfnManager {
         lodash_1.default.forEach(retries, retry => {
             step.addRetry({
                 ...retry,
-                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+                interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval,
             });
         });
         return step;
@@ -314,10 +246,8 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         const step = new aws_stepfunctions_tasks_1.LambdaInvoke(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
-                lambdaFunction,
-            },
+            comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
+            lambdaFunction,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -326,7 +256,7 @@ class SfnManager {
         lodash_1.default.forEach(retries, retry => {
             step.addRetry({
                 ...retry,
-                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+                interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval,
             });
         });
         return step;
@@ -346,10 +276,8 @@ class SfnManager {
             return this.createPassStep(id, scope, { comment: props.comment, name: props.name });
         const step = new aws_stepfunctions_tasks_1.LambdaInvoke(scope, `${props.name}`, {
             ...props,
-            ...{
-                comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
-                lambdaFunction,
-            },
+            comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
+            lambdaFunction,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -358,7 +286,7 @@ class SfnManager {
         lodash_1.default.forEach(retries, retry => {
             step.addRetry({
                 ...retry,
-                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+                interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval,
             });
         });
         return step;
@@ -375,11 +303,9 @@ class SfnManager {
             throw `Step props undefined for ${id}`;
         const step = new aws_stepfunctions_tasks_1.CallApiGatewayRestApiEndpoint(scope, `${props.name}`, {
             ...props,
-            ...{
-                api,
-                comment: `API step for ${props.name} - ${scope.props.stage} stage`,
-                stageName: scope.props.stage,
-            },
+            api,
+            comment: `API step for ${props.name} - ${scope.props.stage} stage`,
+            stageName: scope.props.stage,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -388,7 +314,7 @@ class SfnManager {
         lodash_1.default.forEach(retries, retry => {
             step.addRetry({
                 ...retry,
-                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+                interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval,
             });
         });
         return step;
@@ -404,9 +330,8 @@ class SfnManager {
         const step = new aws_stepfunctions_tasks_1.StepFunctionsStartExecution(scope, `${id}`, {
             ...props,
             associateWithParent: props.associateWithParent ?? true,
-            inputPath: props.inputPath,
             name: props.name ?? (0, uuid_1.v4)(),
-            stateMachine: stateMachine,
+            stateMachine,
         });
         let retries = props.retries;
         if (!retries || retries.length === 0) {
@@ -415,7 +340,7 @@ class SfnManager {
         lodash_1.default.forEach(retries, retry => {
             step.addRetry({
                 ...retry,
-                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+                interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval,
             });
         });
         return step;
@@ -442,6 +367,7 @@ class SfnManager {
         if (!props)
             throw `State Machine props undefined for ${id}`;
         const stateMachine = new aws_stepfunctions_1.StateMachine(scope, `${id}`, {
+            ...props,
             definitionBody: aws_stepfunctions_1.DefinitionBody.fromChainable(definition),
             logs: {
                 destination: logGroup,
@@ -450,9 +376,6 @@ class SfnManager {
             },
             role,
             stateMachineName: `${props.stateMachineName}-${scope.props.stage}`,
-            stateMachineType: props.stateMachineType,
-            timeout: props.timeout,
-            tracingEnabled: props.tracingEnabled,
         });
         (0, utils_1.createCfnOutput)(`${id}-stateMachineName`, scope, stateMachine.stateMachineName);
         (0, utils_1.createCfnOutput)(`${id}-stateMachineArn`, scope, stateMachine.stateMachineArn);

package/dist/src/lib/aws/services/systems-manager/main.js

@@ -32,9 +32,9 @@ class SsmManager {
         if (!props)
             throw `Parameter props undefined for ${id}`;
         const parameter = new aws_ssm_1.StringParameter(scope, `${id}`, {
+            ...props,
             description: `${props.description} - ${scope.props.stage} stage`,
             parameterName: `${props.parameterName}-${scope.props.stage}`,
-            stringValue: props.stringValue,
         });
         (0, utils_1.createCfnOutput)(`${id}-parameterArn`, scope, parameter.parameterArn);
         (0, utils_1.createCfnOutput)(`${id}-parameterName`, scope, parameter.parameterName);
@@ -64,8 +64,8 @@ class SsmManager {
         if (!region || region == '')
             throw `Invalid region for ${id}`;
         return new SSMParameterReader(scope, `${id}`, {
-            parameterName: parameterName,
-            region: region,
+            parameterName,
+            region,
         }).getParameterValue();
     }
 }

package/dist/src/lib/aws/services/virtual-private-cloud/main.js

@@ -38,8 +38,7 @@ class VpcManager {
         if (!props)
             throw `Vpc props undefined for ${id}`;
         const vpc = new aws_ec2_1.Vpc(scope, `${id}`, {
-            ipAddresses: props.ipAddresses,
-            maxAzs: props.maxAzs,
+            ...props,
         });
         (0, utils_1.createCfnOutput)(`${id}Id`, scope, vpc.vpcId);
         (0, utils_1.createCfnOutput)(`${id}PublicSubnetIds`, scope, lodash_1.default.map(vpc.publicSubnets, subnet => subnet.subnetId).toString());

package/dist/src/lib/aws/services/web-application-firewall/main.js

@@ -30,11 +30,9 @@ class WafManager {
         if (!props)
             throw `WAF Ip Set props undefined for ${id}`;
         const ipSet = new aws_wafv2_1.CfnIPSet(scope, `${id}`, {
-            addresses: props.addresses,
+            ...props,
             description: `IP Set for ${id} - ${scope.props.stage} stage`,
-            ipAddressVersion: props.ipAddressVersion,
             name: scope.isProductionStage() ? props.name : `${props.name}-${scope.props.stage}`,
-            scope: props.scope,
         });
         (0, utils_1.createCfnOutput)(`${id}-ipSetId`, scope, ipSet.attrId);
         (0, utils_1.createCfnOutput)(`${id}-ipSetArn`, scope, ipSet.attrArn);
@@ -50,13 +48,10 @@ class WafManager {
         if (!props)
             throw `WAF WebACL props undefined for ${id}`;
         const webAcl = new aws_wafv2_1.CfnWebACL(scope, `${id}`, {
-            defaultAction: props.defaultAction,
+            ...props,
             description: `Web Acl for ${id} - ${scope.props.stage} stage`,
             name: scope.isProductionStage() ? props.name : `${props.name}-${scope.props.stage}`,
-            rules: props.rules,
-            scope: props.scope,
             tags: [{ key: 'service', value: scope.props.name }],
-            visibilityConfig: props.visibilityConfig,
         });
         (0, utils_1.createCfnOutput)(`${id}-webAclId`, scope, webAcl.attrId);
         (0, utils_1.createCfnOutput)(`${id}-webAclArn`, scope, webAcl.attrArn);