@gradientedge/cdk-utils 8.122.0 → 8.123.0

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

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SfnManager = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_stepfunctions_1 = require("aws-cdk-lib/aws-stepfunctions");
 const aws_stepfunctions_tasks_1 = require("aws-cdk-lib/aws-stepfunctions-tasks");
+const lodash_1 = __importDefault(require("lodash"));
 const uuid_1 = require("uuid");
 const utils_1 = require("../../utils");
 const DEFAULT_RETRY_CONFIG = [
@@ -160,10 +164,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -202,10 +208,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -244,10 +252,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -284,10 +294,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -311,10 +323,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -341,10 +355,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -369,10 +385,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**
@@ -394,10 +412,12 @@ class SfnManager {
         if (!retries || retries.length === 0) {
             retries = DEFAULT_RETRY_CONFIG;
         }
-        retries.forEach(retry => step.addRetry({
-            ...retry,
-            ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
-        }));
+        lodash_1.default.forEach(retries, retry => {
+            step.addRetry({
+                ...retry,
+                ...{ interval: retry.intervalInSecs ? aws_cdk_lib_1.Duration.seconds(retry.intervalInSecs) : retry.interval },
+            });
+        });
         return step;
     }
     /**

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

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VpcManager = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
 const utils_1 = require("../../utils");
+const lodash_1 = __importDefault(require("lodash"));
 /**
  */
 const CommonVpcIdentifier = 'CommonVpc';
@@ -38,10 +42,10 @@ class VpcManager {
             maxAzs: props.maxAzs,
         });
         (0, utils_1.createCfnOutput)(`${id}Id`, scope, vpc.vpcId);
-        (0, utils_1.createCfnOutput)(`${id}PublicSubnetIds`, scope, vpc.publicSubnets.map(subnet => subnet.subnetId).toString());
-        (0, utils_1.createCfnOutput)(`${id}PrivateSubnetIds`, scope, vpc.privateSubnets.map(subnet => subnet.subnetId).toString());
-        (0, utils_1.createCfnOutput)(`${id}PublicSubnetRouteTableIds`, scope, vpc.publicSubnets.map(subnet => subnet.routeTable.routeTableId).toString());
-        (0, utils_1.createCfnOutput)(`${id}PrivateSubnetRouteTableIds`, scope, vpc.privateSubnets.map(subnet => subnet.routeTable.routeTableId).toString());
+        (0, utils_1.createCfnOutput)(`${id}PublicSubnetIds`, scope, lodash_1.default.map(vpc.publicSubnets, subnet => subnet.subnetId).toString());
+        (0, utils_1.createCfnOutput)(`${id}PrivateSubnetIds`, scope, lodash_1.default.map(vpc.privateSubnets, subnet => subnet.subnetId).toString());
+        (0, utils_1.createCfnOutput)(`${id}PublicSubnetRouteTableIds`, scope, lodash_1.default.map(vpc.publicSubnets, subnet => subnet.routeTable.routeTableId).toString());
+        (0, utils_1.createCfnOutput)(`${id}PrivateSubnetRouteTableIds`, scope, lodash_1.default.map(vpc.privateSubnets, subnet => subnet.routeTable.routeTableId).toString());
         (0, utils_1.createCfnOutput)(`${id}AvailabilityZones`, scope, vpc.availabilityZones.toString());
         (0, utils_1.createCfnOutput)(`${id}DefaultSecurityGroup`, scope, vpc.vpcDefaultSecurityGroup.toString());
         return vpc;

package/dist/src/lib/azure/common/stack.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const construct_1 = require("./construct");
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const cdktf_1 = require("cdktf");
+const lodash_1 = __importDefault(require("lodash"));
 const common_1 = require("../../common");
 /**
  * @classdesc Common stack to use as a base for all higher level constructs.
@@ -64,7 +65,7 @@ class CommonAzureStack extends cdktf_1.TerraformStack {
                 console.debug(`No additional contexts provided. Using default context properties from cdktf.json`);
             return;
         }
-        extraContexts.forEach((context) => {
+        lodash_1.default.forEach(extraContexts, (context) => {
             const extraContextPath = `${app_root_path_1.default.path}/${context}`;
             /* scenario where extra context is configured in cdk.json but absent in file system */
             if (!fs_1.default.existsSync(extraContextPath))
@@ -76,7 +77,7 @@ class CommonAzureStack extends cdktf_1.TerraformStack {
             /* parse as JSON properties */
             const extraContextProps = JSON.parse(extraContextPropsBuffer.toString('utf-8'));
             /* set each of the property into the cdk node context */
-            Object.keys(extraContextProps).forEach((propKey) => {
+            lodash_1.default.keys(extraContextProps).forEach((propKey) => {
                 this.node.setContext(propKey, extraContextProps[propKey]);
             });
         });
@@ -110,13 +111,10 @@ class CommonAzureStack extends cdktf_1.TerraformStack {
         /* parse as JSON properties */
         const stageContextProps = JSON.parse(stageContextPropsBuffer.toString('utf-8'));
         /* set each of the property into the cdk node context */
-        Object.keys(stageContextProps).forEach((propKey) => {
+        lodash_1.default.keys(stageContextProps).forEach((propKey) => {
             /* handle object, array properties */
             if (typeof stageContextProps[propKey] === 'object' && !Array.isArray(stageContextProps[propKey])) {
-                this.node.setContext(propKey, {
-                    ...this.node.tryGetContext(propKey),
-                    ...stageContextProps[propKey],
-                });
+                this.node.setContext(propKey, lodash_1.default.merge(this.node.tryGetContext(propKey), stageContextProps[propKey]));
             }
             else {
                 /* handle all other primitive properties */

package/dist/src/lib/common/index.js

@@ -13,16 +13,20 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyMixins = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 __exportStar(require("./construct"), exports);
 __exportStar(require("./stack"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 const applyMixins = (derivedCtor, constructors) => {
-    constructors.forEach(baseCtor => {
-        Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
-            Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
+    lodash_1.default.forEach(constructors, baseConstructor => {
+        Object.getOwnPropertyNames(baseConstructor.prototype).forEach(name => {
+            Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseConstructor.prototype, name) || Object.create(null));
         });
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.122.0",
+  "version": "8.123.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -46,15 +46,15 @@
     }
   },
   "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.405.0",
-    "@aws-sdk/credential-providers": "^3.405.0",
-    "@aws-sdk/types": "^3.398.0",
-    "@cdktf/provider-azurerm": "^10.0.1",
-    "@types/lodash": "^4.14.197",
+    "@aws-sdk/client-secrets-manager": "^3.408.0",
+    "@aws-sdk/credential-providers": "^3.408.0",
+    "@aws-sdk/types": "^3.408.0",
+    "@cdktf/provider-azurerm": "^10.0.2",
+    "@types/lodash": "^4.14.198",
     "@types/node": "^20.5.9",
     "@types/uuid": "^9.0.3",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.94.0",
+    "aws-cdk-lib": "^2.95.0",
     "cdktf": "^0.18.0",
     "constructs": "^10.2.70",
     "lodash": "^4.17.21",
@@ -71,7 +71,7 @@
     "@types/jest": "^29.5.4",
     "@typescript-eslint/eslint-plugin": "^6.6.0",
     "@typescript-eslint/parser": "^6.6.0",
-    "aws-cdk": "^2.94.0",
+    "aws-cdk": "^2.95.0",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
     "commitizen": "^4.3.0",

package/src/lib/aws/common/stack.ts

@@ -5,6 +5,7 @@ import { CommonConstruct } from './construct'
 import { CommonStackProps } from './types'
 
 import appRoot from 'app-root-path'
+import _ from 'lodash'
 import { isDevStage } from '../../common'
 
 /**
@@ -75,7 +76,7 @@ export class CommonStack extends Stack {
       return
     }
 
-    extraContexts.forEach((context: string) => {
+    _.forEach(extraContexts, (context: string) => {
       const extraContextPath = `${appRoot.path}/${context}`
 
       /* scenario where extra context is configured in cdk.json but absent in file system */
@@ -89,7 +90,7 @@ export class CommonStack extends Stack {
       const extraContextProps = JSON.parse(extraContextPropsBuffer.toString('utf-8'))
 
       /* set each of the property into the cdk node context */
-      Object.keys(extraContextProps).forEach((propKey: any) => {
+      _.keys(extraContextProps).forEach((propKey: any) => {
         this.node.setContext(propKey, extraContextProps[propKey])
       })
     })
@@ -125,13 +126,10 @@ export class CommonStack extends Stack {
     const stageContextProps = JSON.parse(stageContextPropsBuffer.toString('utf-8'))
 
     /* set each of the property into the cdk node context */
-    Object.keys(stageContextProps).forEach((propKey: any) => {
+    _.keys(stageContextProps).forEach((propKey: any) => {
       /* handle object, array properties */
       if (typeof stageContextProps[propKey] === 'object' && !Array.isArray(stageContextProps[propKey])) {
-        this.node.setContext(propKey, {
-          ...this.node.tryGetContext(propKey),
-          ...stageContextProps[propKey],
-        })
+        this.node.setContext(propKey, _.merge(this.node.tryGetContext(propKey), stageContextProps[propKey]))
       } else {
         /* handle all other primitive properties */
         this.node.setContext(propKey, stageContextProps[propKey])

package/src/lib/aws/construct/api-to-any-target/main.ts

@@ -12,8 +12,8 @@ import {
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import { ApiToAnyTargetProps, ApiToAnyTargetRestApiResource, ApiToAnyTargetRestApiType } from './types'
 import { ApiToAnyTargetRestApi } from './target'
+import { ApiToAnyTargetProps, ApiToAnyTargetRestApiResource, ApiToAnyTargetRestApiType } from './types'
 
 /**
  * @classdesc Provides a construct to create and deploy a shallow API Gateway
@@ -127,33 +127,31 @@ export class ApiToAnyTarget extends CommonConstruct {
     }
 
     this.apiToAnyTargetRestApi.api = new RestApi(this, `${this.id}-rest-api`, {
-      ...{
-        cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
-        defaultCorsPreflightOptions: {
-          allowHeaders: Cors.DEFAULT_HEADERS,
-          allowMethods: Cors.ALL_METHODS,
-          allowOrigins: Cors.ALL_ORIGINS,
-        },
-        defaultIntegration: this.apiToAnyTargetRestApi.integration,
-        defaultMethodOptions: {
-          methodResponses: [this.apiToAnyTargetRestApi.methodResponse, this.apiToAnyTargetRestApi.methodErrorResponse],
-        },
-        deploy: this.props.api.restApi?.deploy ?? true,
-        deployOptions: {
-          accessLogDestination: new LogGroupLogDestination(this.apiToAnyTargetRestApi.accessLogGroup),
-          accessLogFormat: AccessLogFormat.jsonWithStandardFields(),
-          dataTraceEnabled: this.props.api.restApi?.deployOptions?.dataTraceEnabled,
-          description: `${this.id} - ${this.props.stage} stage`,
-          loggingLevel: MethodLoggingLevel.INFO,
-          metricsEnabled: true,
-          stageName: this.props.stage,
-          tracingEnabled: this.props.api.restApi?.deployOptions?.tracingEnabled,
-        },
-        endpointConfiguration: {
-          types: [this.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL],
-        },
-        restApiName: `${this.id}-rest-api-${this.props.stage}`,
+      cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
+      defaultCorsPreflightOptions: {
+        allowHeaders: Cors.DEFAULT_HEADERS,
+        allowMethods: Cors.ALL_METHODS,
+        allowOrigins: Cors.ALL_ORIGINS,
+      },
+      defaultIntegration: this.apiToAnyTargetRestApi.integration,
+      defaultMethodOptions: {
+        methodResponses: [this.apiToAnyTargetRestApi.methodResponse, this.apiToAnyTargetRestApi.methodErrorResponse],
+      },
+      deploy: this.props.api.restApi?.deploy ?? true,
+      deployOptions: {
+        accessLogDestination: new LogGroupLogDestination(this.apiToAnyTargetRestApi.accessLogGroup),
+        accessLogFormat: AccessLogFormat.jsonWithStandardFields(),
+        dataTraceEnabled: this.props.api.restApi?.deployOptions?.dataTraceEnabled,
+        description: `${this.id} - ${this.props.stage} stage`,
+        loggingLevel: MethodLoggingLevel.INFO,
+        metricsEnabled: true,
+        stageName: this.props.stage,
+        tracingEnabled: this.props.api.restApi?.deployOptions?.tracingEnabled,
+      },
+      endpointConfiguration: {
+        types: [this.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL],
       },
+      restApiName: `${this.id}-rest-api-${this.props.stage}`,
       ...this.props.api.restApi,
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToAnyTargetRestApi.api.restApiId)

package/src/lib/aws/construct/api-to-eventbridge-target/main.ts

@@ -187,12 +187,10 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
   protected createApiToEventBridgeTargetRule() {
     if (this.props.api.useExisting) return
     this.props.event.rule = {
-      ...{
-        eventPattern: {
-          source: ['api-to-eventbridge-target'],
-        },
-        ruleName: `${this.id}-api-to-eventbridge-target`,
+      eventPattern: {
+        source: ['api-to-eventbridge-target'],
       },
+      ruleName: `${this.id}-api-to-eventbridge-target`,
       ...this.props.event.rule,
     }
     this.apiEvent.rule = this.eventManager.createRule(
@@ -261,12 +259,10 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
   protected createApiToEventBridgeTargetIntegrationResponse() {
     if (!this.props.api.withResource) return
     this.apiToEventBridgeTargetRestApi.integrationResponse = this.props.api.integrationResponse ?? {
-      ...{
-        responseTemplates: {
-          'application/json': JSON.stringify({ message: 'Payload Submitted' }),
-        },
-        statusCode: '200',
+      responseTemplates: {
+        'application/json': JSON.stringify({ message: 'Payload Submitted' }),
       },
+      statusCode: '200',
     }
   }
 
@@ -276,21 +272,19 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
   protected createApiToEventBridgeTargetIntegrationErrorResponse() {
     if (!this.props.api.withResource) return
     this.apiToEventBridgeTargetRestApi.integrationErrorResponse = {
-      ...{
-        responseParameters: {
-          'method.response.header.Access-Control-Allow-Credentials': "'true'",
-          'method.response.header.Access-Control-Allow-Origin': "'*'",
-          'method.response.header.Content-Type': "'application/json'",
-        },
-        responseTemplates: {
-          'application/json': JSON.stringify({
-            message: "$util.escapeJavaScript($input.path('$.errorMessage'))",
-            state: 'error',
-          }),
-        },
-        selectionPattern: '^\\[Error\\].*',
-        statusCode: '400',
+      responseParameters: {
+        'method.response.header.Access-Control-Allow-Credentials': "'true'",
+        'method.response.header.Access-Control-Allow-Origin': "'*'",
+        'method.response.header.Content-Type': "'application/json'",
       },
+      responseTemplates: {
+        'application/json': JSON.stringify({
+          message: "$util.escapeJavaScript($input.path('$.errorMessage'))",
+          state: 'error',
+        }),
+      },
+      selectionPattern: '^\\[Error\\].*',
+      statusCode: '400',
       ...this.props.api.integrationErrorResponse,
     }
   }
@@ -303,16 +297,14 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     this.apiToEventBridgeTargetRestApi.integration = new Integration({
       integrationHttpMethod: 'POST',
       options: {
-        ...{
-          credentialsRole: this.apiToEventBridgeTargetRestApi.role,
-          integrationResponses: [
-            this.apiToEventBridgeTargetRestApi.integrationResponse,
-            this.apiToEventBridgeTargetRestApi.integrationErrorResponse,
-          ],
-          passthroughBehavior: PassthroughBehavior.NEVER,
-          requestParameters: this.apiToEventBridgeTargetRestApi.integrationRequestParameters,
-          requestTemplates: this.apiToEventBridgeTargetRestApi.integrationRequestTemplates,
-        },
+        credentialsRole: this.apiToEventBridgeTargetRestApi.role,
+        integrationResponses: [
+          this.apiToEventBridgeTargetRestApi.integrationResponse,
+          this.apiToEventBridgeTargetRestApi.integrationErrorResponse,
+        ],
+        passthroughBehavior: PassthroughBehavior.NEVER,
+        requestParameters: this.apiToEventBridgeTargetRestApi.integrationRequestParameters,
+        requestTemplates: this.apiToEventBridgeTargetRestApi.integrationRequestTemplates,
         ...this.props.api.integrationOptions,
       },
       type: IntegrationType.AWS,
@@ -326,17 +318,15 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
   protected createApiToEventBridgeTargetMethodResponse() {
     if (!this.props.api.withResource) return
     this.apiToEventBridgeTargetRestApi.methodResponse = {
-      ...{
-        responseModels: {
-          'application/json': this.apiToEventBridgeTargetRestApi.responseModel,
-        },
-        responseParameters: {
-          'method.response.header.Access-Control-Allow-Credentials': true,
-          'method.response.header.Access-Control-Allow-Origin': true,
-          'method.response.header.Content-Type': true,
-        },
-        statusCode: '200',
+      responseModels: {
+        'application/json': this.apiToEventBridgeTargetRestApi.responseModel,
       },
+      responseParameters: {
+        'method.response.header.Access-Control-Allow-Credentials': true,
+        'method.response.header.Access-Control-Allow-Origin': true,
+        'method.response.header.Content-Type': true,
+      },
+      statusCode: '200',
       ...this.props.api.methodResponse,
     }
   }
@@ -347,17 +337,15 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
   protected createApiToEventBridgeTargetMethodErrorResponse() {
     if (!this.props.api.withResource) return
     this.apiToEventBridgeTargetRestApi.methodErrorResponse = {
-      ...{
-        responseModels: {
-          'application/json': this.apiToEventBridgeTargetRestApi.errorResponseModel,
-        },
-        responseParameters: {
-          'method.response.header.Access-Control-Allow-Credentials': true,
-          'method.response.header.Access-Control-Allow-Origin': true,
-          'method.response.header.Content-Type': true,
-        },
-        statusCode: '400',
+      responseModels: {
+        'application/json': this.apiToEventBridgeTargetRestApi.errorResponseModel,
       },
+      responseParameters: {
+        'method.response.header.Access-Control-Allow-Credentials': true,
+        'method.response.header.Access-Control-Allow-Origin': true,
+        'method.response.header.Content-Type': true,
+      },
+      statusCode: '400',
       ...this.props.api.methodErrorResponse,
     }
   }
@@ -387,36 +375,34 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     }
 
     this.apiToEventBridgeTargetRestApi.api = new RestApi(this, `${this.id}-rest-api`, {
-      ...{
-        cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
-        defaultCorsPreflightOptions: {
-          allowHeaders: Cors.DEFAULT_HEADERS,
-          allowMethods: ['POST'],
-          allowOrigins: Cors.ALL_ORIGINS,
-        },
-        defaultIntegration: this.apiToEventBridgeTargetRestApi.integration,
-        defaultMethodOptions: {
-          methodResponses: [
-            this.apiToEventBridgeTargetRestApi.methodResponse,
-            this.apiToEventBridgeTargetRestApi.methodErrorResponse,
-          ],
-        },
-        deploy: this.props.api.restApi?.deploy ?? true,
-        deployOptions: {
-          accessLogDestination: new LogGroupLogDestination(this.apiToEventBridgeTargetRestApi.accessLogGroup),
-          accessLogFormat: AccessLogFormat.jsonWithStandardFields(),
-          dataTraceEnabled: this.props.api.restApi?.deployOptions?.dataTraceEnabled,
-          description: `${this.id} - ${this.props.stage} stage`,
-          loggingLevel: MethodLoggingLevel.INFO,
-          metricsEnabled: true,
-          stageName: this.props.stage,
-          tracingEnabled: this.props.api.restApi?.deployOptions?.tracingEnabled,
-        },
-        endpointConfiguration: {
-          types: [EndpointType.REGIONAL],
-        },
-        restApiName: `${this.id}-rest-api-${this.props.stage}`,
+      cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
+      defaultCorsPreflightOptions: {
+        allowHeaders: Cors.DEFAULT_HEADERS,
+        allowMethods: ['POST'],
+        allowOrigins: Cors.ALL_ORIGINS,
+      },
+      defaultIntegration: this.apiToEventBridgeTargetRestApi.integration,
+      defaultMethodOptions: {
+        methodResponses: [
+          this.apiToEventBridgeTargetRestApi.methodResponse,
+          this.apiToEventBridgeTargetRestApi.methodErrorResponse,
+        ],
+      },
+      deploy: this.props.api.restApi?.deploy ?? true,
+      deployOptions: {
+        accessLogDestination: new LogGroupLogDestination(this.apiToEventBridgeTargetRestApi.accessLogGroup),
+        accessLogFormat: AccessLogFormat.jsonWithStandardFields(),
+        dataTraceEnabled: this.props.api.restApi?.deployOptions?.dataTraceEnabled,
+        description: `${this.id} - ${this.props.stage} stage`,
+        loggingLevel: MethodLoggingLevel.INFO,
+        metricsEnabled: true,
+        stageName: this.props.stage,
+        tracingEnabled: this.props.api.restApi?.deployOptions?.tracingEnabled,
       },
+      endpointConfiguration: {
+        types: [EndpointType.REGIONAL],
+      },
+      restApiName: `${this.id}-rest-api-${this.props.stage}`,
       ...this.props.api.restApi,
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToEventBridgeTargetRestApi.api.restApiId)
@@ -430,15 +416,13 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     if (!this.props.api.withResource) return
     this.apiToEventBridgeTargetRestApi.responseModel = new Model(this, `${this.id}-response-model`, {
       restApi: this.apiToEventBridgeTargetRestApi.api,
-      ...{
-        contentType: 'application/json',
-        modelName: 'ResponseModel',
-        schema: {
-          properties: { message: { type: JsonSchemaType.STRING } },
-          schema: JsonSchemaVersion.DRAFT4,
-          title: 'pollResponse',
-          type: JsonSchemaType.OBJECT,
-        },
+      contentType: 'application/json',
+      modelName: 'ResponseModel',
+      schema: {
+        properties: { message: { type: JsonSchemaType.STRING } },
+        schema: JsonSchemaVersion.DRAFT4,
+        title: 'pollResponse',
+        type: JsonSchemaType.OBJECT,
       },
       ...this.props.api.responseModel,
     })
@@ -451,18 +435,16 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     if (!this.props.api.withResource) return
     this.apiToEventBridgeTargetRestApi.errorResponseModel = new Model(this, `${this.id}-error-response-model`, {
       restApi: this.apiToEventBridgeTargetRestApi.api,
-      ...{
-        contentType: 'application/json',
-        modelName: 'ErrorResponseModel',
-        schema: {
-          properties: {
-            message: { type: JsonSchemaType.STRING },
-            state: { type: JsonSchemaType.STRING },
-          },
-          schema: JsonSchemaVersion.DRAFT4,
-          title: 'errorResponse',
-          type: JsonSchemaType.OBJECT,
+      contentType: 'application/json',
+      modelName: 'ErrorResponseModel',
+      schema: {
+        properties: {
+          message: { type: JsonSchemaType.STRING },
+          state: { type: JsonSchemaType.STRING },
         },
+        schema: JsonSchemaVersion.DRAFT4,
+        title: 'errorResponse',
+        type: JsonSchemaType.OBJECT,
       },
       ...this.props.api.errorResponseModel,
     })