@gradientedge/cdk-utils 8.124.0 → 8.126.0

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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.124.0",
+  "version": "8.126.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -46,15 +46,15 @@
     }
   },
   "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.410.0",
-    "@aws-sdk/credential-providers": "^3.410.0",
-    "@aws-sdk/types": "^3.410.0",
-    "@cdktf/provider-azurerm": "^10.0.2",
-    "@types/lodash": "^4.14.198",
-    "@types/node": "^20.6.0",
-    "@types/uuid": "^9.0.3",
+    "@aws-sdk/client-secrets-manager": "^3.418.0",
+    "@aws-sdk/credential-providers": "^3.418.0",
+    "@aws-sdk/types": "^3.418.0",
+    "@cdktf/provider-azurerm": "^10.0.4",
+    "@types/lodash": "^4.14.199",
+    "@types/node": "^20.7.0",
+    "@types/uuid": "^9.0.4",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.95.1",
+    "aws-cdk-lib": "^2.97.1",
     "cdktf": "^0.18.0",
     "constructs": "^10.2.70",
     "lodash": "^4.17.21",
@@ -65,22 +65,22 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.17",
+    "@babel/core": "^7.23.0",
     "@babel/eslint-parser": "^7.22.15",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@types/jest": "^29.5.4",
-    "@typescript-eslint/eslint-plugin": "^6.7.0",
-    "@typescript-eslint/parser": "^6.7.0",
-    "aws-cdk": "^2.95.1",
+    "@types/jest": "^29.5.5",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
+    "aws-cdk": "^2.97.1",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
     "commitizen": "^4.3.0",
     "docdash": "^2.0.2",
     "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsdoc": "^46.6.0",
+    "eslint-plugin-jsdoc": "^46.8.2",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-extended": "^4.0.1",
@@ -92,8 +92,8 @@
     "jsdoc-to-markdown": "^8.0.0",
     "prettier": "^3.0.3",
     "prettier-plugin-organize-imports": "^3.2.3",
-    "rimraf": "^5.0.1",
-    "semantic-release": "^21.1.1",
+    "rimraf": "^5.0.4",
+    "semantic-release": "^22.0.5",
     "taffydb": "^2.7.3",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",

package/src/lib/aws/services/api-gateway/main.ts

@@ -46,42 +46,22 @@ export class ApiManager {
   public createLambdaRestApi(id: string, scope: CommonConstruct, props: LambdaRestApiProps, lambdaFunction: IFunction) {
     if (!props) throw `Api props undefined for ${id}`
     const api = new LambdaRestApi(scope, `${id}`, {
-      binaryMediaTypes: props.binaryMediaTypes,
+      ...props,
       cloudWatchRole: props.cloudWatchRole || false,
-      defaultCorsPreflightOptions: props.defaultCorsPreflightOptions,
-      defaultMethodOptions: props.defaultMethodOptions,
       deploy: props.deploy || true,
       deployOptions: {
-        accessLogDestination: props.deployOptions?.accessLogDestination,
-        accessLogFormat: props.deployOptions?.accessLogFormat,
-        cacheClusterEnabled: props.deployOptions?.cacheClusterEnabled,
-        cacheClusterSize: props.deployOptions?.cacheClusterSize,
-        cachingEnabled: props.deployOptions?.cachingEnabled,
-        clientCertificateId: props.deployOptions?.clientCertificateId,
-        dataTraceEnabled: props.deployOptions?.dataTraceEnabled,
+        ...props.deployOptions,
         description: `${id} - ${scope.props.stage} stage`,
-        documentationVersion: props.deployOptions?.documentationVersion,
-        loggingLevel: props.deployOptions?.loggingLevel,
-        methodOptions: props.deployOptions?.methodOptions,
-        metricsEnabled: props.deployOptions?.metricsEnabled,
         stageName: scope.props.stage,
-        tracingEnabled: props.deployOptions?.tracingEnabled,
-        variables: props.deployOptions?.variables,
       },
-      domainName: props.domainName,
       endpointConfiguration: {
+        ...props.endpointConfiguration,
         types: props.endpointConfiguration?.types || [EndpointType.REGIONAL],
-        vpcEndpoints: props.endpointConfiguration?.vpcEndpoints,
       },
-      endpointTypes: props.endpointTypes,
       failOnWarnings: props.failOnWarnings || false,
       handler: lambdaFunction,
-      minCompressionSize: props.minCompressionSize,
-      parameters: props.parameters,
-      policy: props.policy,
       proxy: props.proxy ?? true,
       restApiName: `${props.restApiName}-${scope.props.stage}`,
-      retainDeployments: props.retainDeployments,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -105,8 +85,8 @@ export class ApiManager {
    */
   public createApiDomain(id: string, scope: CommonConstruct, domainName: string, certificate: ICertificate) {
     const apiDomain = new DomainName(scope, `${id}`, {
-      certificate: certificate,
-      domainName: domainName,
+      certificate,
+      domainName,
       endpointType: scope.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL,
       securityPolicy: SecurityPolicy.TLS_1_2,
     })
@@ -189,11 +169,11 @@ export class ApiManager {
    * @summary Method to create an api deployment
    * @param id
    * @param scope
-   * @param restApi
+   * @param api
    */
-  public createApiDeployment(id: string, scope: CommonConstruct, restApi: IRestApi) {
+  public createApiDeployment(id: string, scope: CommonConstruct, api: IRestApi) {
     new Deployment(scope, `${id}`, {
-      api: restApi,
+      api,
       retainDeployments: false,
     })
   }

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

@@ -50,9 +50,8 @@ export class AppConfigManager {
     if (!props) throw `AppConfig props undefined for ${id}`
 
     const application = new CfnApplication(scope, `${id}`, {
-      description: props.application.description,
+      ...props.application,
       name: `${props.application.name}-${scope.props.stage}`,
-      tags: props.application.tags,
     })
 
     createCfnOutput(`${id}-ApplicationId`, scope, Fn.ref(application.logicalId))
@@ -78,11 +77,9 @@ export class AppConfigManager {
     if (!props) throw `AppConfig props undefined for ${id}`
 
     const environment = new CfnEnvironment(scope, `${id}`, {
-      applicationId: applicationId,
-      description: props.environment.description,
-      monitors: props.environment.monitors,
+      ...props.environment,
+      applicationId,
       name: props.environment.name ?? scope.props.stage,
-      tags: props.environment.tags,
     })
 
     createCfnOutput(`${id}-configurationEnvironmentId`, scope, Fn.ref(environment.logicalId))
@@ -93,7 +90,7 @@ export class AppConfigManager {
 
   /**
    * @summary Method to create an AppConfig Configuration Profile for a given application
-   * - <p>&#9888; The <b>locationUri</b> is defaulted to <i>hosted</i> if undefined</p>
+   * - The <b>locationUri</b> is defaulted to <i>hosted</i> if undefined</p>
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param applicationId id of the application
@@ -109,14 +106,10 @@ export class AppConfigManager {
     if (!props) throw `AppConfig props undefined for ${id}`
 
     const profile = new CfnConfigurationProfile(scope, `${id}`, {
-      applicationId: applicationId,
-      description: props.configurationProfile.description,
+      ...props.configurationProfile,
+      applicationId,
       locationUri: props.configurationProfile.locationUri || 'hosted',
       name: `${props.configurationProfile.name}-${scope.props.stage}`,
-      retrievalRoleArn: props.configurationProfile.retrievalRoleArn,
-      tags: props.configurationProfile.tags,
-      type: props.configurationProfile.type,
-      validators: props.configurationProfile.validators,
     })
 
     createCfnOutput(`${id}-configurationProfileId`, scope, Fn.ref(profile.logicalId))

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

@@ -87,12 +87,9 @@ export class CloudFrontManager {
     if (!props) throw `CloudFront props undefined for ${id}`
 
     const distribution = new CloudFrontWebDistribution(scope, `${id}`, {
+      ...props,
       comment: `${id} - ${scope.props.stage} stage`,
-      defaultRootObject: props.defaultRootObject,
-      enableIpV6: props.enableIpV6,
       enabled: props.enabled ?? true,
-      errorConfigurations: props.errorConfigurations,
-      geoRestriction: props.geoRestriction,
       httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
       loggingConfig: {
         bucket: logBucket,
@@ -113,7 +110,6 @@ export class CloudFrontManager {
         securityPolicy: SecurityPolicyProtocol.TLS_V1_1_2016,
         sslMethod: SSLMethod.SNI,
       }),
-      webACLId: props.webACLId,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -154,31 +150,23 @@ export class CloudFrontManager {
     defaultFunctionAssociations?: FunctionAssociation[]
   ) {
     const distribution = new Distribution(scope, `${id}`, {
-      additionalBehaviors: props.additionalBehaviors,
-      certificate: certificate,
+      ...props,
+      certificate,
       comment: `${id} - ${scope.props.stage} stage`,
       defaultBehavior: {
-        cachePolicy: props.defaultBehavior ? props.defaultBehavior.cachePolicy : undefined,
-        edgeLambdas: props.defaultBehavior ? props.defaultBehavior.edgeLambdas : undefined,
+        ...props.defaultBehavior,
         functionAssociations: defaultFunctionAssociations ?? undefined,
-        origin: origin,
-        originRequestPolicy: props.defaultBehavior ? props.defaultBehavior.originRequestPolicy : undefined,
-        viewerProtocolPolicy: props.defaultBehavior ? props.defaultBehavior.viewerProtocolPolicy : undefined,
+        origin,
       },
-      defaultRootObject: props.defaultRootObject,
       domainNames: aliases,
-      enableIpv6: props.enableIpv6,
       enableLogging: props.enableLogging ?? true,
       enabled: props.enabled ?? true,
-      errorResponses: props.errorResponses,
-      geoRestriction: props.geoRestriction,
       httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
-      logBucket: logBucket,
+      logBucket,
       logFilePrefix: props.logFilePrefix ?? `edge/`,
       logIncludesCookies: props.logIncludesCookies ?? true,
       minimumProtocolVersion: props.minimumProtocolVersion ?? SecurityPolicyProtocol.TLS_V1_2_2021,
       priceClass: props.priceClass ?? PriceClass.PRICE_CLASS_ALL,
-      webAclId: props.webAclId,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

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

@@ -53,9 +53,9 @@ export class CloudTrailManager {
     const role = scope.iamManager.createRoleForCloudTrail(`${id}Role`, scope, logGroup)
 
     const cloudTrail = new CfnTrail(scope, `${id}`, {
+      ...props,
       cloudWatchLogsLogGroupArn: logGroup.attrArn,
       cloudWatchLogsRoleArn: role.attrArn,
-      enableLogFileValidation: props.enableLogFileValidation,
       eventSelectors: [
         {
           dataResources: [
@@ -68,9 +68,6 @@ export class CloudTrailManager {
           readWriteType: 'WriteOnly',
         },
       ],
-      includeGlobalServiceEvents: props.includeGlobalServiceEvents,
-      isLogging: props.isLogging,
-      isMultiRegionTrail: props.isMultiRegionTrail,
       s3BucketName: logBucket.bucketName,
       s3KeyPrefix: `logs-${props.trailName}`,
       tags: [{ key: 'service', value: scope.props.name }],