@gradientedge/cdk-utils 8.124.0 → 8.125.0

package/src/lib/aws/services/lambda/main.ts

@@ -101,39 +101,36 @@ export class LambdaManager {
 
     const lambdaFunction = new Function(scope, `${id}`, {
       ...props,
-      ...{
-        allowPublicSubnet: !!vpc,
-        architecture: props.architecture ?? Architecture.ARM_64,
-        code: code,
-        deadLetterQueue: deadLetterQueue,
-        environment: {
-          LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
-            ? ''
-            : scope.ssmManager.readStringParameter(
-                `${id}-sm-ts`,
-                scope,
-                `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
-              ),
-          REGION: scope.props.region,
-          STAGE: scope.props.stage,
-          ...environment,
-        },
-        filesystem: accessPoint ? 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 Role ? role : undefined,
-        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
-        securityGroups: securityGroups,
-        timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(15),
-        tracing: scope.props.defaultTracing ?? props.tracing,
-        vpc,
-        vpcSubnets,
+      allowPublicSubnet: !!vpc,
+      architecture: props.architecture ?? Architecture.ARM_64,
+      code,
+      deadLetterQueue,
+      environment: {
+        LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+          ? ''
+          : scope.ssmManager.readStringParameter(
+              `${id}-sm-ts`,
+              scope,
+              `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
+            ),
+        REGION: scope.props.region,
+        STAGE: scope.props.stage,
+        ...environment,
       },
+      filesystem: accessPoint ? 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 Role ? role : undefined,
+      runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
+      securityGroups,
+      timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(15),
+      tracing: scope.props.defaultTracing ?? props.tracing,
+      vpc,
+      vpcSubnets,
     })
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
@@ -254,36 +251,31 @@ export class LambdaManager {
 
     const lambdaFunction = new DockerImageFunction(scope, `${id}`, {
       ...props,
-      ...{
-        allowPublicSubnet: !!vpc,
-        architecture: props.architecture ?? Architecture.ARM_64,
-        code: code,
-        deadLetterQueue: deadLetterQueue,
-        environment: {
-          LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
-            ? ''
-            : scope.ssmManager.readStringParameter(
-                `${id}-sm-ts`,
-                scope,
-                `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
-              ),
-          REGION: scope.props.region,
-          STAGE: scope.props.stage,
-          ...environment,
-        },
-        filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
-        functionName: functionName,
-        insightsVersion: props.insightsVersion,
-        logRetention: scope.props.logRetention ?? props.logRetention,
-        reservedConcurrentExecutions: props.reservedConcurrentExecutions,
-        role: role instanceof Role ? role : undefined,
-        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
-        securityGroups: securityGroups,
-        timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(1),
-        tracing: props.tracing,
-        vpc,
-        vpcSubnets,
+      allowPublicSubnet: !!vpc,
+      architecture: props.architecture ?? Architecture.ARM_64,
+      code,
+      deadLetterQueue,
+      environment: {
+        LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+          ? ''
+          : scope.ssmManager.readStringParameter(
+              `${id}-sm-ts`,
+              scope,
+              `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
+            ),
+        REGION: scope.props.region,
+        STAGE: scope.props.stage,
+        ...environment,
       },
+      filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
+      functionName,
+      logRetention: scope.props.logRetention ?? props.logRetention,
+      role: role instanceof Role ? role : undefined,
+      securityGroups: securityGroups,
+      timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(1),
+      tracing: props.tracing,
+      vpc,
+      vpcSubnets,
     })
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
@@ -318,17 +310,7 @@ export class LambdaManager {
 
     const lambdaFunctionAlias = new 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,
     })
 
     createCfnOutput(`${id}-lambdaAliasName`, scope, lambdaFunctionAlias.functionArn)

package/src/lib/aws/services/secrets-manager/main.ts

@@ -59,7 +59,7 @@ export class SecretsManager {
   public async resolveSecretValue(region: string, secretId: string, secretKey: string) {
     const client = new SecretsManagerClient({
       credentials: determineCredentials(),
-      region: region,
+      region,
     })
     const command = new GetSecretValueCommand({
       SecretId: secretId,

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

@@ -39,8 +39,8 @@ export class SnsManager {
     if (!props) throw `Subscription props undefined for ${id}`
 
     const topic = new Topic(scope, id, {
+      ...props,
       displayName: `${props.topicName}-${scope.props.stage}`,
-      fifo: props.fifo,
       topicName: `${props.topicName}-${scope.props.stage}`,
     })
 
@@ -70,8 +70,8 @@ export class SnsManager {
     if (!props) throw `Subscription props undefined for ${id}`
 
     const topic = new Topic(scope, id, {
+      ...props,
       displayName: `${props.topicName}-${scope.props.stage}`,
-      fifo: props.fifo,
       topicName: `${props.topicName}-${scope.props.stage}`,
     })
 

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

@@ -34,7 +34,7 @@ export class SqsManager {
     if (!props) throw `Queue props undefined for ${id}`
 
     const queue = new Queue(scope, id, {
-      contentBasedDeduplication: props.contentBasedDeduplication,
+      ...props,
       dataKeyReuse: props.dataKeyReuseInSecs ? Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
       deadLetterQueue: !deadLetterQueue
         ? undefined
@@ -42,14 +42,7 @@ export class SqsManager {
             maxReceiveCount: props.maxReceiveCount ?? 5,
             queue: deadLetterQueue,
           },
-      deduplicationScope: props.deduplicationScope,
       deliveryDelay: props.deliveryDelayInSecs ? 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
         ? Duration.seconds(props.receiveMessageWaitTimeInSecs)
         : props.receiveMessageWaitTime,

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

@@ -35,19 +35,11 @@ export class S3Manager {
     const bucketLifecycleRules: LifecycleRule[] = []
     _.forEach(props.lifecycleRules, lifecycleRule => {
       bucketLifecycleRules.push({
-        abortIncompleteMultipartUploadAfter: lifecycleRule.abortIncompleteMultipartUploadAfter,
-        enabled: lifecycleRule.enabled,
+        ...lifecycleRule,
         expiration: lifecycleRule.expirationInDays ? Duration.days(lifecycleRule.expirationInDays) : undefined,
-        expirationDate: lifecycleRule.expirationDate,
-        expiredObjectDeleteMarker: lifecycleRule.expiredObjectDeleteMarker,
-        id: lifecycleRule.id,
         noncurrentVersionExpiration: lifecycleRule.noncurrentVersionExpirationInDays
           ? Duration.days(lifecycleRule.noncurrentVersionExpirationInDays)
           : undefined,
-        noncurrentVersionTransitions: lifecycleRule.noncurrentVersionTransitions,
-        prefix: lifecycleRule.prefix,
-        tagFilters: lifecycleRule.tagFilters,
-        transitions: lifecycleRule.transitions,
       })
     })
 
@@ -108,24 +100,13 @@ export class S3Manager {
       }
 
       bucket = new Bucket(scope, `${id}-bucket`, {
-        accessControl: props.accessControl,
-        autoDeleteObjects: props.autoDeleteObjects,
+        ...props,
         blockPublicAccess: props.blockPublicAccess || BlockPublicAccess.BLOCK_ALL,
-        bucketName: bucketName,
-        cors: props.cors,
+        bucketName,
         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 || RemovalPolicy.RETAIN,
         serverAccessLogsBucket: logBucket,
-        serverAccessLogsPrefix: props.serverAccessLogsPrefix,
-        versioned: props.versioned,
-        websiteErrorDocument: props.websiteErrorDocument,
-        websiteIndexDocument: props.websiteIndexDocument,
-        websiteRoutingRules: props.websiteRoutingRules,
       })
 
       const cfnBucket = bucket.node.defaultChild as CfnBucket

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

@@ -88,9 +88,7 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     return new 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`,
     })
   }
 
@@ -104,9 +102,7 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     return new 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`,
     })
   }
 
@@ -120,9 +116,7 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     return new 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`,
     })
   }
 
@@ -136,9 +130,7 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     return new 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`,
     })
   }
 
@@ -152,9 +144,7 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     return new 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`,
     })
   }
 
@@ -167,10 +157,8 @@ export class SfnManager {
   public createWaitStep(id: string, scope: CommonConstruct, props: SfnWaitProps) {
     return new Wait(scope, `${props.name}`, {
       ...props,
-      ...{
-        comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
-        time: WaitTime.duration(Duration.seconds(props.delayInSeconds)),
-      },
+      comment: `Choice step for ${props.name} - ${scope.props.stage} stage`,
+      time: WaitTime.duration(Duration.seconds(props.delayInSeconds)),
     })
   }
 
@@ -192,22 +180,9 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     const step = new 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
@@ -218,7 +193,7 @@ export class SfnManager {
     _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
+        interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval,
       })
     })
 
@@ -243,24 +218,9 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     const step = new 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
@@ -296,24 +256,9 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     const step = new 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
@@ -343,21 +288,8 @@ export class SfnManager {
     if (!props.messageBody) throw 'Message body undefined'
     const step = new 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
@@ -368,7 +300,7 @@ export class SfnManager {
     _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
+        interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval,
       })
     })
 
@@ -386,10 +318,8 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     const step = new 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
@@ -400,7 +330,7 @@ export class SfnManager {
     _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
+        interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval,
       })
     })
 
@@ -426,10 +356,8 @@ export class SfnManager {
     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`,
-        lambdaFunction,
-      },
+      comment: `Lambda step for ${props.name} - ${scope.props.stage} stage`,
+      lambdaFunction,
     })
 
     let retries = props.retries
@@ -440,7 +368,7 @@ export class SfnManager {
     _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
+        interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval,
       })
     })
 
@@ -463,11 +391,9 @@ export class SfnManager {
     if (!props) throw `Step props undefined for ${id}`
     const step = new 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
@@ -478,7 +404,7 @@ export class SfnManager {
     _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
+        interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval,
       })
     })
 
@@ -501,9 +427,8 @@ export class SfnManager {
     const step = new StepFunctionsStartExecution(scope, `${id}`, {
       ...props,
       associateWithParent: props.associateWithParent ?? true,
-      inputPath: props.inputPath,
       name: props.name ?? uuidv4(),
-      stateMachine: stateMachine,
+      stateMachine,
     })
 
     let retries = props.retries
@@ -514,7 +439,7 @@ export class SfnManager {
     _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
-        ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
+        interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval,
       })
     })
 
@@ -550,6 +475,7 @@ export class SfnManager {
   ) {
     if (!props) throw `State Machine props undefined for ${id}`
     const stateMachine = new StateMachine(scope, `${id}`, {
+      ...props,
       definitionBody: DefinitionBody.fromChainable(definition),
       logs: {
         destination: logGroup,
@@ -558,9 +484,6 @@ export class SfnManager {
       },
       role,
       stateMachineName: `${props.stateMachineName}-${scope.props.stage}`,
-      stateMachineType: props.stateMachineType,
-      timeout: props.timeout,
-      tracingEnabled: props.tracingEnabled,
     })
 
     createCfnOutput(`${id}-stateMachineName`, scope, stateMachine.stateMachineName)

package/src/lib/aws/services/systems-manager/main.ts

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

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

@@ -34,8 +34,7 @@ export class VpcManager {
   public createVpc(id: string, scope: CommonConstruct, props: VpcProps) {
     if (!props) throw `Vpc props undefined for ${id}`
     const vpc = new Vpc(scope, `${id}`, {
-      ipAddresses: props.ipAddresses,
-      maxAzs: props.maxAzs,
+      ...props,
     })
 
     createCfnOutput(`${id}Id`, scope, vpc.vpcId)

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

@@ -30,11 +30,9 @@ export class WafManager {
     if (!props) throw `WAF Ip Set props undefined for ${id}`
 
     const ipSet = new 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,
     })
 
     createCfnOutput(`${id}-ipSetId`, scope, ipSet.attrId)
@@ -53,13 +51,10 @@ export class WafManager {
     if (!props) throw `WAF WebACL props undefined for ${id}`
 
     const webAcl = new 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,
     })
 
     createCfnOutput(`${id}-webAclId`, scope, webAcl.attrId)