@gradientedge/cdk-utils 6.0.0 → 6.2.0

package/dist/src/lib/construct/api-to-eventbridge-target/main.js

@@ -351,11 +351,12 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             return;
         }
         const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `/custom/api/${this.id}-rest-api-access-${this.props.stage}`,
+            logGroupName: `/custom/api/${this.id}-rest-api-access`,
             removalPolicy: cdk.RemovalPolicy.DESTROY,
         });
         this.apiToEventBridgeTargetRestApi.api = new apig.RestApi(this, `${this.id}-rest-api`, {
             ...{
+                cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
                 defaultIntegration: this.apiToEventBridgeTargetRestApi.integration,
                 defaultMethodOptions: {
                     methodResponses: [
@@ -364,7 +365,8 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
                     ],
                 },
                 deployOptions: {
-                    dataTraceEnabled: true,
+                    tracingEnabled: this.props.api.restApi?.deployOptions?.tracingEnabled,
+                    dataTraceEnabled: this.props.api.restApi?.deployOptions?.dataTraceEnabled,
                     description: `${this.id} - ${this.props.stage} stage`,
                     loggingLevel: apig.MethodLoggingLevel.INFO,
                     metricsEnabled: true,
@@ -382,7 +384,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
                 },
                 restApiName: `${this.id}-rest-api-${this.props.stage}`,
             },
-            ...this.props.api,
+            ...this.props.api.restApi,
         });
         this.addCfnOutput(`${this.id}-restApiId`, this.apiToEventBridgeTargetRestApi.api.restApiId);
         this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToEventBridgeTargetRestApi.api.root.resourceId);

package/dist/src/lib/construct/api-to-eventbridge-target-with-sns/main.js

@@ -152,7 +152,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (this.props.api.useExisting)
             return;
         this.apiDestinedLambda.policy = new iam.PolicyDocument({
-            statements: [this.iamManager.statementForReadSecrets(this), this.iamManager.statementForPutEvents()],
+            statements: [this.iamManager.statementForPutEvents([this.apiEvent.eventBus.eventBusArn])],
         });
     }
     /**
@@ -481,7 +481,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
             return;
         }
         const accessLogGroup = this.logManager.createLogGroup(`${this.id}-sns-rest-api-access-log`, this, {
-            logGroupName: `/custom/api/${this.id}-destined-rest-api-access-${this.props.stage}`,
+            logGroupName: `/custom/api/${this.id}-destined-rest-api-access`,
             removalPolicy: cdk.RemovalPolicy.DESTROY,
         });
         this.apiDestinedRestApi.api = new apig.RestApi(this, `${this.id}-sns-rest-api`, {

package/dist/src/lib/construct/graphql-api-lambda/main.js

@@ -120,7 +120,7 @@ class GraphQLApiLambda extends common_1.CommonConstruct {
      */
     createLambdaPolicy() {
         this.graphQLApiLambdaPolicy = new iam.PolicyDocument({
-            statements: [this.iamManager.statementForReadSecrets(this)],
+            statements: [this.iamManager.statementForCreateAnyLogStream()],
         });
     }
     /**

package/dist/src/lib/construct/site-with-ecs-backend/main.js

@@ -166,7 +166,7 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
      */
     createEcsPolicy() {
         this.siteEcsPolicy = new iam.PolicyDocument({
-            statements: [this.iamManager.statementForReadSecrets(this)],
+            statements: [this.iamManager.statementForCreateAnyLogStream()],
         });
     }
     /**

package/dist/src/lib/manager/aws/cloudfront-manager.d.ts

@@ -75,8 +75,9 @@ export declare class CloudFrontManager {
      * @param {s3.IBucket?} logBucket
      * @param {acm.ICertificate?} certificate
      * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
+     * @param {cloudfront.IResponseHeadersPolicy?} responseHeadersPolicy
      */
-    createDistributionWithHttpOrigin(id: string, scope: common.CommonConstruct, props: types.DistributionProps, origin: origins.HttpOrigin, domainNames: string[], logBucket?: s3.IBucket, certificate?: acm.ICertificate, defaultFunctionAssociations?: cloudfront.FunctionAssociation[]): cdk.aws_cloudfront.Distribution;
+    createDistributionWithHttpOrigin(id: string, scope: common.CommonConstruct, props: types.DistributionProps, origin: origins.HttpOrigin, domainNames: string[], logBucket?: s3.IBucket, certificate?: acm.ICertificate, defaultFunctionAssociations?: cloudfront.FunctionAssociation[], responseHeadersPolicy?: cloudfront.IResponseHeadersPolicy): cdk.aws_cloudfront.Distribution;
     /**
      * @summary Method to provision a Lambda@Edge function
      *

package/dist/src/lib/manager/aws/cloudfront-manager.js

@@ -173,8 +173,9 @@ class CloudFrontManager {
      * @param {s3.IBucket?} logBucket
      * @param {acm.ICertificate?} certificate
      * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
+     * @param {cloudfront.IResponseHeadersPolicy?} responseHeadersPolicy
      */
-    createDistributionWithHttpOrigin(id, scope, props, origin, domainNames, logBucket, certificate, defaultFunctionAssociations) {
+    createDistributionWithHttpOrigin(id, scope, props, origin, domainNames, logBucket, certificate, defaultFunctionAssociations, responseHeadersPolicy) {
         const distribution = new cloudfront.Distribution(scope, `${id}`, {
             certificate: certificate,
             comment: `${id} - ${scope.props.stage} stage`,
@@ -184,6 +185,7 @@ class CloudFrontManager {
                 originRequestPolicy: props.defaultBehavior ? props.defaultBehavior.originRequestPolicy : undefined,
                 functionAssociations: defaultFunctionAssociations ?? undefined,
                 viewerProtocolPolicy: props.defaultBehavior ? props.defaultBehavior.viewerProtocolPolicy : undefined,
+                responseHeadersPolicy: responseHeadersPolicy ?? undefined,
             },
             additionalBehaviors: props.additionalBehaviors,
             defaultRootObject: props.defaultRootObject,

package/dist/src/lib/manager/aws/ecs-manager.js

@@ -60,6 +60,11 @@ class EcsManager {
         const ecsCluster = new ecs.Cluster(scope, `${id}`, {
             clusterName: `${props.clusterName}-${scope.props.stage}`,
             vpc: vpc,
+            defaultCloudMapNamespace: props.defaultCloudMapNamespace,
+            capacity: props.capacity,
+            enableFargateCapacityProviders: props.enableFargateCapacityProviders,
+            containerInsights: props.containerInsights,
+            executeCommandConfiguration: props.executeCommandConfiguration,
         });
         utils.createCfnOutput(`${id}-clusterArn`, scope, ecsCluster.clusterArn);
         utils.createCfnOutput(`${id}-clusterName`, scope, ecsCluster.clusterName);

package/dist/src/lib/manager/aws/lambda-manager.js

@@ -115,6 +115,7 @@ class LambdaManager {
                 timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
                 vpc: vpc,
                 vpcSubnets: vpcSubnets,
+                tracing: props.tracing,
             },
         });
         utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

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

@@ -377,12 +377,13 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     }
 
     const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-      logGroupName: `/custom/api/${this.id}-rest-api-access-${this.props.stage}`,
+      logGroupName: `/custom/api/${this.id}-rest-api-access`,
       removalPolicy: cdk.RemovalPolicy.DESTROY,
     })
 
     this.apiToEventBridgeTargetRestApi.api = new apig.RestApi(this, `${this.id}-rest-api`, {
       ...{
+        cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
         defaultIntegration: this.apiToEventBridgeTargetRestApi.integration,
         defaultMethodOptions: {
           methodResponses: [
@@ -391,7 +392,8 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
           ],
         },
         deployOptions: {
-          dataTraceEnabled: true,
+          tracingEnabled: this.props.api.restApi?.deployOptions?.tracingEnabled,
+          dataTraceEnabled: this.props.api.restApi?.deployOptions?.dataTraceEnabled,
           description: `${this.id} - ${this.props.stage} stage`,
           loggingLevel: apig.MethodLoggingLevel.INFO,
           metricsEnabled: true,
@@ -409,7 +411,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
         },
         restApiName: `${this.id}-rest-api-${this.props.stage}`,
       },
-      ...this.props.api,
+      ...this.props.api.restApi,
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToEventBridgeTargetRestApi.api.restApiId)
     this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToEventBridgeTargetRestApi.api.root.resourceId)

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

@@ -162,7 +162,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedLambdaPolicy() {
     if (this.props.api.useExisting) return
     this.apiDestinedLambda.policy = new iam.PolicyDocument({
-      statements: [this.iamManager.statementForReadSecrets(this), this.iamManager.statementForPutEvents()],
+      statements: [this.iamManager.statementForPutEvents([this.apiEvent.eventBus.eventBusArn])],
     })
   }
 
@@ -536,7 +536,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
     }
 
     const accessLogGroup = this.logManager.createLogGroup(`${this.id}-sns-rest-api-access-log`, this, {
-      logGroupName: `/custom/api/${this.id}-destined-rest-api-access-${this.props.stage}`,
+      logGroupName: `/custom/api/${this.id}-destined-rest-api-access`,
       removalPolicy: cdk.RemovalPolicy.DESTROY,
     })
 

package/src/lib/construct/graphql-api-lambda/main.ts

@@ -125,7 +125,7 @@ export class GraphQLApiLambda extends CommonConstruct {
    */
   protected createLambdaPolicy() {
     this.graphQLApiLambdaPolicy = new iam.PolicyDocument({
-      statements: [this.iamManager.statementForReadSecrets(this)],
+      statements: [this.iamManager.statementForCreateAnyLogStream()],
     })
   }
 

package/src/lib/construct/site-with-ecs-backend/main.ts

@@ -177,7 +177,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
    */
   protected createEcsPolicy() {
     this.siteEcsPolicy = new iam.PolicyDocument({
-      statements: [this.iamManager.statementForReadSecrets(this)],
+      statements: [this.iamManager.statementForCreateAnyLogStream()],
     })
   }
 

package/src/lib/manager/aws/cloudfront-manager.ts

@@ -180,6 +180,7 @@ export class CloudFrontManager {
    * @param {s3.IBucket?} logBucket
    * @param {acm.ICertificate?} certificate
    * @param {cloudfront.FunctionAssociation?} defaultFunctionAssociations
+   * @param {cloudfront.IResponseHeadersPolicy?} responseHeadersPolicy
    */
   public createDistributionWithHttpOrigin(
     id: string,
@@ -189,7 +190,8 @@ export class CloudFrontManager {
     domainNames: string[],
     logBucket?: s3.IBucket,
     certificate?: acm.ICertificate,
-    defaultFunctionAssociations?: cloudfront.FunctionAssociation[]
+    defaultFunctionAssociations?: cloudfront.FunctionAssociation[],
+    responseHeadersPolicy?: cloudfront.IResponseHeadersPolicy
   ) {
     const distribution = new cloudfront.Distribution(scope, `${id}`, {
       certificate: certificate,
@@ -200,6 +202,7 @@ export class CloudFrontManager {
         originRequestPolicy: props.defaultBehavior ? props.defaultBehavior.originRequestPolicy : undefined,
         functionAssociations: defaultFunctionAssociations ?? undefined,
         viewerProtocolPolicy: props.defaultBehavior ? props.defaultBehavior.viewerProtocolPolicy : undefined,
+        responseHeadersPolicy: responseHeadersPolicy ?? undefined,
       },
       additionalBehaviors: props.additionalBehaviors,
       defaultRootObject: props.defaultRootObject,

package/src/lib/manager/aws/ecs-manager.ts

@@ -40,6 +40,11 @@ export class EcsManager {
     const ecsCluster = new ecs.Cluster(scope, `${id}`, {
       clusterName: `${props.clusterName}-${scope.props.stage}`,
       vpc: vpc,
+      defaultCloudMapNamespace: props.defaultCloudMapNamespace,
+      capacity: props.capacity,
+      enableFargateCapacityProviders: props.enableFargateCapacityProviders,
+      containerInsights: props.containerInsights,
+      executeCommandConfiguration: props.executeCommandConfiguration,
     })
 
     utils.createCfnOutput(`${id}-clusterArn`, scope, ecsCluster.clusterArn)

package/src/lib/manager/aws/lambda-manager.ts

@@ -114,6 +114,7 @@ export class LambdaManager {
         timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
         vpc: vpc,
         vpcSubnets: vpcSubnets,
+        tracing: props.tracing,
       },
     })