@gradientedge/cdk-utils 8.122.0 → 8.123.0

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

@@ -240,10 +240,8 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
       this,
       {
         ...this.props.lambda.function,
-        ...{
-          onFailure: this.apiDestinedLambda.destinationFailure,
-          onSuccess: this.apiDestinedLambda.destinationSuccess,
-        },
+        onFailure: this.apiDestinedLambda.destinationFailure,
+        onSuccess: this.apiDestinedLambda.destinationSuccess,
       },
       this.apiDestinedLambda.role,
       this.apiDestinedLambda.layers,
@@ -276,9 +274,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationLogGroupSuccess() {
     if (this.props.api.useExisting) return
     this.apiEvent.logGroupSuccess = this.logManager.createLogGroup(`${this.id}-destination-success-log`, this, {
-      ...{
-        logGroupName: `/${this.id}/events/api-destination-success`,
-      },
+      logGroupName: `/${this.id}/events/api-destination-success`,
       ...this.props.event.logGroupSuccess,
     })
   }
@@ -289,20 +285,18 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationRuleSuccess() {
     if (this.props.api.useExisting) return
     this.props.event.ruleSuccess = {
-      ...{
-        eventPattern: {
-          detail: {
-            requestContext: {
-              condition: ['Success'],
-            },
-            responsePayload: {
-              source: ['custom:api-destined-lambda'],
-              sourceId: [this.id],
-            },
+      eventPattern: {
+        detail: {
+          requestContext: {
+            condition: ['Success'],
+          },
+          responsePayload: {
+            source: ['custom:api-destined-lambda'],
+            sourceId: [this.id],
           },
         },
-        ruleName: `${this.id}-api-destination-success`,
       },
+      ruleName: `${this.id}-api-destination-success`,
       ...this.props.event.ruleSuccess,
     }
     this.apiEvent.ruleSuccess = this.eventManager.createRule(
@@ -320,9 +314,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationLogGroupFailure() {
     if (this.props.api.useExisting) return
     this.apiEvent.logGroupFailure = this.logManager.createLogGroup(`${this.id}-destination-failure-log`, this, {
-      ...{
-        logGroupName: `/${this.id}/events/api-destination-failure`,
-      },
+      logGroupName: `/${this.id}/events/api-destination-failure`,
       ...this.props.event.logGroupFailure,
     })
   }
@@ -333,16 +325,14 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationRuleFailure() {
     if (this.props.api.useExisting) return
     this.props.event.ruleFailure = {
-      ...{
-        eventPattern: {
-          detail: {
-            responsePayload: {
-              errorType: ['Error'],
-            },
+      eventPattern: {
+        detail: {
+          responsePayload: {
+            errorType: ['Error'],
           },
         },
-        ruleName: `${this.id}-api-destination-failure`,
       },
+      ruleName: `${this.id}-api-destination-failure`,
       ...this.props.event.ruleFailure,
     }
     this.apiEvent.ruleFailure = this.eventManager.createRule(
@@ -414,12 +404,10 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedIntegrationResponse() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.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',
     }
   }
 
@@ -429,21 +417,19 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedIntegrationErrorResponse() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.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,
     }
   }
@@ -456,16 +442,14 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
     this.apiDestinedRestApi.integration = new Integration({
       integrationHttpMethod: 'POST',
       options: {
-        ...{
-          credentialsRole: this.apiDestinedRestApi.role,
-          integrationResponses: [
-            this.apiDestinedRestApi.integrationResponse,
-            this.apiDestinedRestApi.integrationErrorResponse,
-          ],
-          passthroughBehavior: PassthroughBehavior.NEVER,
-          requestParameters: this.apiDestinedRestApi.integrationRequestParameters,
-          requestTemplates: this.apiDestinedRestApi.integrationRequestTemplates,
-        },
+        credentialsRole: this.apiDestinedRestApi.role,
+        integrationResponses: [
+          this.apiDestinedRestApi.integrationResponse,
+          this.apiDestinedRestApi.integrationErrorResponse,
+        ],
+        passthroughBehavior: PassthroughBehavior.NEVER,
+        requestParameters: this.apiDestinedRestApi.integrationRequestParameters,
+        requestTemplates: this.apiDestinedRestApi.integrationRequestTemplates,
         ...this.props.api.integrationOptions,
       },
       type: IntegrationType.AWS,
@@ -479,17 +463,15 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedMethodResponse() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.methodResponse = {
-      ...{
-        responseModels: {
-          'application/json': this.apiDestinedRestApi.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.apiDestinedRestApi.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,
     }
   }
@@ -500,17 +482,15 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedMethodErrorResponse() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.methodErrorResponse = {
-      ...{
-        responseModels: {
-          'application/json': this.apiDestinedRestApi.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.apiDestinedRestApi.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,
     }
   }
@@ -534,30 +514,28 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
     })
 
     this.apiDestinedRestApi.api = new RestApi(this, `${this.id}-sns-rest-api`, {
-      ...{
-        defaultCorsPreflightOptions: {
-          allowHeaders: Cors.DEFAULT_HEADERS,
-          allowMethods: ['POST'],
-          allowOrigins: Cors.ALL_ORIGINS,
-        },
-        defaultIntegration: this.apiDestinedRestApi.integration,
-        defaultMethodOptions: {
-          methodResponses: [this.apiDestinedRestApi.methodResponse, this.apiDestinedRestApi.methodErrorResponse],
-        },
-        deployOptions: {
-          accessLogDestination: new LogGroupLogDestination(accessLogGroup),
-          accessLogFormat: AccessLogFormat.jsonWithStandardFields(),
-          dataTraceEnabled: true,
-          description: `${this.id} - ${this.props.stage} stage`,
-          loggingLevel: MethodLoggingLevel.INFO,
-          metricsEnabled: true,
-          stageName: this.props.stage,
-        },
-        endpointConfiguration: {
-          types: [EndpointType.REGIONAL],
-        },
-        restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
+      defaultCorsPreflightOptions: {
+        allowHeaders: Cors.DEFAULT_HEADERS,
+        allowMethods: ['POST'],
+        allowOrigins: Cors.ALL_ORIGINS,
       },
+      defaultIntegration: this.apiDestinedRestApi.integration,
+      defaultMethodOptions: {
+        methodResponses: [this.apiDestinedRestApi.methodResponse, this.apiDestinedRestApi.methodErrorResponse],
+      },
+      deployOptions: {
+        accessLogDestination: new LogGroupLogDestination(accessLogGroup),
+        accessLogFormat: AccessLogFormat.jsonWithStandardFields(),
+        dataTraceEnabled: true,
+        description: `${this.id} - ${this.props.stage} stage`,
+        loggingLevel: MethodLoggingLevel.INFO,
+        metricsEnabled: true,
+        stageName: this.props.stage,
+      },
+      endpointConfiguration: {
+        types: [EndpointType.REGIONAL],
+      },
+      restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
       ...this.props.api,
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId)
@@ -570,16 +548,14 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedResponseModel() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.responseModel = new Model(this, `${this.id}-response-model`, {
+      contentType: 'application/json',
+      modelName: 'ResponseModel',
       restApi: this.apiDestinedRestApi.api,
-      ...{
-        contentType: 'application/json',
-        modelName: 'ResponseModel',
-        schema: {
-          properties: { message: { type: JsonSchemaType.STRING } },
-          schema: JsonSchemaVersion.DRAFT4,
-          title: 'pollResponse',
-          type: JsonSchemaType.OBJECT,
-        },
+      schema: {
+        properties: { message: { type: JsonSchemaType.STRING } },
+        schema: JsonSchemaVersion.DRAFT4,
+        title: 'pollResponse',
+        type: JsonSchemaType.OBJECT,
       },
       ...this.props.api.responseModel,
     })
@@ -591,19 +567,17 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinedErrorResponseModel() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.errorResponseModel = new Model(this, `${this.id}-error-response-model`, {
+      contentType: 'application/json',
+      modelName: 'ErrorResponseModel',
       restApi: this.apiDestinedRestApi.api,
-      ...{
-        contentType: 'application/json',
-        modelName: 'ErrorResponseModel',
-        schema: {
-          properties: {
-            message: { type: JsonSchemaType.STRING },
-            state: { type: JsonSchemaType.STRING },
-          },
-          schema: JsonSchemaVersion.DRAFT4,
-          title: 'errorResponse',
-          type: JsonSchemaType.OBJECT,
+      schema: {
+        properties: {
+          message: { type: JsonSchemaType.STRING },
+          state: { type: JsonSchemaType.STRING },
         },
+        schema: JsonSchemaVersion.DRAFT4,
+        title: 'errorResponse',
+        type: JsonSchemaType.OBJECT,
       },
       ...this.props.api.errorResponseModel,
     })

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

@@ -162,16 +162,14 @@ export class ApiToLambdaTarget extends CommonConstruct {
 
     this.props.api.restApi = {
       ...this.props.api.restApi,
-      ...{
-        defaultMethodOptions: {
-          methodResponses: [
-            this.apiToLambdaTargetRestApi.methodResponse,
-            this.apiToLambdaTargetRestApi.methodErrorResponse,
-          ],
-        },
-        deployOptions: {
-          accessLogDestination: new LogGroupLogDestination(accessLogGroup),
-        },
+      defaultMethodOptions: {
+        methodResponses: [
+          this.apiToLambdaTargetRestApi.methodResponse,
+          this.apiToLambdaTargetRestApi.methodErrorResponse,
+        ],
+      },
+      deployOptions: {
+        accessLogDestination: new LogGroupLogDestination(accessLogGroup),
       },
     }
 

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

@@ -5,6 +5,7 @@ import { AssetCode, IFunction, ILayerVersion, LayerVersion } from 'aws-cdk-lib/a
 import { IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { GraphQlApiLambdaEnvironment, GraphQlApiLambdaProps } from './types'
 
@@ -151,7 +152,7 @@ export class GraphQLApiLambda extends CommonConstruct {
 
     if (!this.props.graphqlApiLambdaLayerSources) return
 
-    this.props.graphqlApiLambdaLayerSources.forEach((source: AssetCode, index: number) => {
+    _.forEach(this.props.graphqlApiLambdaLayerSources, (source: AssetCode, index: number) => {
       layers.push(this.lambdaManager.createLambdaLayer(`${this.id}-layer-${index}`, this, source))
     })
 
@@ -205,8 +206,8 @@ export class GraphQLApiLambda extends CommonConstruct {
    */
   protected createApiBasePathMapping() {
     const apiRootPaths = this.props.apiRootPaths
-    if (apiRootPaths && apiRootPaths.length > 0) {
-      apiRootPaths.forEach((apiRootPath: string) => {
+    if (apiRootPaths && !_.isEmpty(apiRootPaths)) {
+      _.forEach(apiRootPaths, (apiRootPath: string) => {
         this.graphQLApiBasePathMappings.push(
           new BasePathMapping(this, `${this.id}-base-bath-mapping-${apiRootPath}`, {
             basePath: apiRootPath,

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

@@ -3,6 +3,7 @@ import { ISecurityGroup, IVpc, Peer, Port, SecurityGroup } from 'aws-cdk-lib/aws
 import { CfnReplicationGroup } from 'aws-cdk-lib/aws-elasticache'
 import { ManagedPolicy } from 'aws-cdk-lib/aws-iam'
 import { Construct } from 'constructs'
+import _ from 'lodash'
 import { GraphQLApiLambda } from '..'
 import * as utils from '../../utils'
 import { GraphQlApiLambdaWithCacheProps } from './types'
@@ -91,7 +92,7 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
       `${this.id}-elasticache`,
       this,
       this.props.graphQLElastiCache,
-      this.graphQLVpc.privateSubnets.map(subnet => subnet.subnetId),
+      _.map(this.graphQLVpc.privateSubnets, subnet => subnet.subnetId),
       [this.graphQLSecurityGroup.securityGroupId]
     )
   }

package/src/lib/aws/construct/lambda-with-iam-access/main.ts

@@ -4,6 +4,7 @@ import { CfnAccessKey, Policy, PolicyDocument, PolicyStatement, Role, User } fro
 import { AssetCode, IFunction, ILayerVersion, LayerVersion } from 'aws-cdk-lib/aws-lambda'
 import { CfnSecret, Secret } from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { LambdaWithIamAccessEnvironment, LambdaWithIamAccessProps } from './types'
 
@@ -112,7 +113,7 @@ export class LambdaWithIamAccess extends CommonConstruct {
 
     if (!this.props.lambdaLayerSources) return
 
-    this.props.lambdaLayerSources.forEach((source: AssetCode, index: number) => {
+    _.forEach(this.props.lambdaLayerSources, (source: AssetCode, index: number) => {
       layers.push(this.lambdaManager.createLambdaLayer(`${this.id}-layer-${index}`, this, source))
     })
 

package/src/lib/aws/construct/rest-api-lambda/main.ts

@@ -5,6 +5,7 @@ import { AssetCode, IFunction, ILayerVersion, LayerVersion } from 'aws-cdk-lib/a
 import { IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { RestApiLambdaEnvironment, RestApiLambdaProps } from './types'
 
@@ -152,7 +153,7 @@ export abstract class RestApiLambda extends CommonConstruct {
 
     if (!this.props.restApiLambdaLayerSources) return
 
-    this.props.restApiLambdaLayerSources.forEach((source: AssetCode, index: number) => {
+    _.forEach(this.props.restApiLambdaLayerSources, (source: AssetCode, index: number) => {
       layers.push(this.lambdaManager.createLambdaLayer(`${this.id}-layer-${index}`, this, source))
     })
 
@@ -208,8 +209,8 @@ export abstract class RestApiLambda extends CommonConstruct {
    */
   protected createApiBasePathMapping() {
     const apiRootPaths = this.props.apiRootPaths
-    if (apiRootPaths && apiRootPaths.length > 0) {
-      apiRootPaths.forEach((apiRootPath: string) => {
+    if (apiRootPaths && !_.isEmpty(apiRootPaths)) {
+      _.forEach(apiRootPaths, (apiRootPath: string) => {
         this.restApiBasePathMappings.push(
           new BasePathMapping(this, `${this.id}-base-bath-mapping-${apiRootPath}`, {
             basePath: apiRootPath,

package/src/lib/aws/construct/rest-api-lambda-with-cache/main.ts

@@ -3,6 +3,7 @@ import { ISecurityGroup, IVpc, Peer, Port, SecurityGroup } from 'aws-cdk-lib/aws
 import { CfnReplicationGroup } from 'aws-cdk-lib/aws-elasticache'
 import { ManagedPolicy } from 'aws-cdk-lib/aws-iam'
 import { Construct } from 'constructs'
+import _ from 'lodash'
 import { RestApiLambda } from '..'
 import { createCfnOutput } from '../../utils'
 import { RestApiLambdaWithCacheProps } from './types'
@@ -94,7 +95,7 @@ export abstract class RestApiLambdaWithCache extends RestApiLambda {
       `${this.id}-elasticache`,
       this,
       this.props.restApiCache,
-      this.restApivpc.privateSubnets.map(subnet => subnet.subnetId),
+      _.map(this.restApivpc.privateSubnets, subnet => subnet.subnetId),
       [this.restApiSecurityGroup.securityGroupId]
     )
 

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

@@ -405,15 +405,14 @@ export class SiteWithEcsBackend extends CommonConstruct {
         name: `${this.id}-fs`,
       })
 
-      if (this.props.siteTask.mountPoints && this.props.siteTask.mountPoints.length > 0) {
-        this.props.siteTask.mountPoints.forEach(
-          mountPoint =>
-            this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
-              containerPath: mountPoint.containerPath,
-              readOnly: mountPoint.readOnly,
-              sourceVolume: `${this.id}-fs`,
-            })
-        )
+      if (this.props.siteTask.mountPoints && !_.isEmpty(this.props.siteTask.mountPoints)) {
+        _.forEach(this.props.siteTask.mountPoints, mountPoint => {
+          this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
+            containerPath: mountPoint.containerPath,
+            readOnly: mountPoint.readOnly,
+            sourceVolume: `${this.id}-fs`,
+          })
+        })
       }
     }
 

package/src/lib/aws/construct/static-asset-deployment/main.ts

@@ -1,6 +1,7 @@
 import { IBucket } from 'aws-cdk-lib/aws-s3'
 import { BucketDeployment } from 'aws-cdk-lib/aws-s3-deployment'
 import { Construct } from 'constructs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { StaticAssetDeploymentProps } from './types'
 
@@ -62,7 +63,7 @@ export class StaticAssetDeployment extends CommonConstruct {
     if (!staticAssetsForExport) return
 
     /* optional additional exports needed for asset urls */
-    staticAssetsForExport.forEach(asset => {
+    _.forEach(staticAssetsForExport, asset => {
       this.addCfnOutput(asset.key, this.staticAssetBucket.s3UrlForObject(asset.value))
     })
   }

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

@@ -13,6 +13,7 @@ import {
 } from 'aws-cdk-lib/aws-apigateway'
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
 import { IFunction } from 'aws-cdk-lib/aws-lambda'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { LambdaRestApiProps } from './types'
@@ -83,8 +84,8 @@ export class ApiManager {
       retainDeployments: props.retainDeployments,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(api).add(tag.key, tag.value)
       })
     }
@@ -153,12 +154,13 @@ export class ApiManager {
         allowOrigins: allowedOrigins ?? Cors.ALL_ORIGINS,
       },
     })
-    methods.forEach(method =>
+
+    _.forEach(methods, method => {
       resource.addMethod(method, integration, {
         authorizer,
         requestParameters: methodRequestParameters,
       })
-    )
+    })
     createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
 
     if (addProxy) {
@@ -170,12 +172,13 @@ export class ApiManager {
           allowOrigins: allowedOrigins ?? Cors.ALL_ORIGINS,
         },
       })
-      methods.forEach(method =>
+
+      _.forEach(methods, method => {
         resourceProxy.addMethod(method, proxyIntegration ?? integration, {
           authorizer,
           requestParameters: methodRequestParameters,
         })
-      )
+      })
       createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId)
     }
 

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

@@ -26,6 +26,7 @@ import { CommonConstruct, CommonStack } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { LambdaEdgeProps } from '../lambda'
 import { CloudFrontProps, CloudfrontFunctionProps, DistributionProps } from './types'
+import _ from 'lodash'
 
 /**
  * @classdesc Provides operations on AWS
@@ -115,8 +116,8 @@ export class CloudFrontManager {
       webACLId: props.webACLId,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(distribution).add(tag.key, tag.value)
       })
     }
@@ -180,8 +181,8 @@ export class CloudFrontManager {
       webAclId: props.webAclId,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(distribution).add(tag.key, tag.value)
       })
     }
@@ -244,8 +245,8 @@ export class CloudFrontManager {
       webAclId: props.webAclId,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(distribution).add(tag.key, tag.value)
       })
     }
@@ -306,7 +307,7 @@ export class CloudFrontManager {
       vpc: vpc,
     })
 
-    if (props.tags && props.tags.length > 0) {
+    if (props.tags && !_.isEmpty(props.tags)) {
       props.tags.forEach(tag => {
         Tags.of(edgeFunction).add(tag.key, tag.value)
       })

package/src/lib/aws/services/cloudwatch/logs.ts

@@ -1,7 +1,8 @@
 import * as cdk from 'aws-cdk-lib'
 import * as logs from 'aws-cdk-lib/aws-logs'
-import * as utils from '../../utils'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
+import * as utils from '../../utils'
 import { LogProps, MetricFilterProps } from './types'
 
 /**
@@ -66,8 +67,8 @@ export class LogManager {
       retentionInDays: props.retention,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         cdk.Tags.of(logGroup).add(tag.key, tag.value)
       })
     }
@@ -93,8 +94,8 @@ export class LogManager {
       retention: props.retention,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         cdk.Tags.of(logGroup).add(tag.key, tag.value)
       })
     }