@gradientedge/cdk-utils 8.122.0 → 8.124.0

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

@@ -1,5 +1,6 @@
 import { Duration, RemovalPolicy, Tags } from 'aws-cdk-lib'
 import { IQueue, Queue } from 'aws-cdk-lib/aws-sqs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { LambdaProps } from '../lambda'
@@ -59,8 +60,8 @@ export class SqsManager {
         : props.visibilityTimeout,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(queue).add(tag.key, tag.value)
       })
     }

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

@@ -3,6 +3,7 @@ import { IDistribution } from 'aws-cdk-lib/aws-cloudfront'
 import { Effect, PolicyDocument, PolicyStatement, ServicePrincipal } from 'aws-cdk-lib/aws-iam'
 import { BlockPublicAccess, Bucket, BucketEncryption, CfnBucket, CfnBucketPolicy, IBucket } from 'aws-cdk-lib/aws-s3'
 import { BucketDeployment, ISource, ServerSideEncryption, Source } from 'aws-cdk-lib/aws-s3-deployment'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { LifecycleRule, S3BucketProps } from './types'
@@ -32,7 +33,7 @@ export class S3Manager {
     if (!props.lifecycleRules) return undefined
 
     const bucketLifecycleRules: LifecycleRule[] = []
-    props.lifecycleRules.forEach(lifecycleRule => {
+    _.forEach(props.lifecycleRules, lifecycleRule => {
       bucketLifecycleRules.push({
         abortIncompleteMultipartUploadAfter: lifecycleRule.abortIncompleteMultipartUploadAfter,
         enabled: lifecycleRule.enabled,
@@ -135,8 +136,8 @@ export class S3Manager {
       }
     }
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(bucket).add(tag.key, tag.value)
       })
     }
@@ -222,7 +223,7 @@ export class S3Manager {
       throw `Folder unspecified for ${id}`
     }
 
-    folders.forEach(folder => {
+    _.forEach(folders, folder => {
       new BucketDeployment(scope, `${id}-${folder}`, {
         destinationBucket: bucket,
         destinationKeyPrefix: folder,

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

@@ -30,6 +30,7 @@ import {
   SqsSendMessage,
   StepFunctionsStartExecution,
 } from 'aws-cdk-lib/aws-stepfunctions-tasks'
+import _ from 'lodash'
 import { v4 as uuidv4 } from 'uuid'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
@@ -214,12 +215,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -267,12 +268,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -320,12 +321,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -364,12 +365,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -396,12 +397,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -436,12 +437,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -474,12 +475,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }
@@ -510,12 +511,12 @@ export class SfnManager {
       retries = DEFAULT_RETRY_CONFIG
     }
 
-    retries.forEach(retry =>
+    _.forEach(retries, retry => {
       step.addRetry({
         ...retry,
         ...{ interval: retry.intervalInSecs ? Duration.seconds(retry.intervalInSecs) : retry.interval },
       })
-    )
+    })
 
     return step
   }

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

@@ -2,6 +2,7 @@ import { Tags } from 'aws-cdk-lib'
 import { Vpc, VpcProps } from 'aws-cdk-lib/aws-ec2'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
+import _ from 'lodash'
 
 /**
  */
@@ -38,17 +39,17 @@ export class VpcManager {
     })
 
     createCfnOutput(`${id}Id`, scope, vpc.vpcId)
-    createCfnOutput(`${id}PublicSubnetIds`, scope, vpc.publicSubnets.map(subnet => subnet.subnetId).toString())
-    createCfnOutput(`${id}PrivateSubnetIds`, scope, vpc.privateSubnets.map(subnet => subnet.subnetId).toString())
+    createCfnOutput(`${id}PublicSubnetIds`, scope, _.map(vpc.publicSubnets, subnet => subnet.subnetId).toString())
+    createCfnOutput(`${id}PrivateSubnetIds`, scope, _.map(vpc.privateSubnets, subnet => subnet.subnetId).toString())
     createCfnOutput(
       `${id}PublicSubnetRouteTableIds`,
       scope,
-      vpc.publicSubnets.map(subnet => subnet.routeTable.routeTableId).toString()
+      _.map(vpc.publicSubnets, subnet => subnet.routeTable.routeTableId).toString()
     )
     createCfnOutput(
       `${id}PrivateSubnetRouteTableIds`,
       scope,
-      vpc.privateSubnets.map(subnet => subnet.routeTable.routeTableId).toString()
+      _.map(vpc.privateSubnets, subnet => subnet.routeTable.routeTableId).toString()
     )
     createCfnOutput(`${id}AvailabilityZones`, scope, vpc.availabilityZones.toString())
     createCfnOutput(`${id}DefaultSecurityGroup`, scope, vpc.vpcDefaultSecurityGroup.toString())

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

@@ -3,9 +3,10 @@ import { CommonAzureConstruct } from './construct'
 import { CommonAzureStackProps } from './types'
 
 import appRoot from 'app-root-path'
-import { App, TerraformStack } from 'cdktf'
-import { isDevStage } from '../../common'
+import { TerraformStack } from 'cdktf'
 import { Construct } from 'constructs'
+import _ from 'lodash'
+import { isDevStage } from '../../common'
 
 /**
  * @classdesc Common stack to use as a base for all higher level constructs.
@@ -70,7 +71,7 @@ export class CommonAzureStack extends TerraformStack {
       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 */
@@ -84,7 +85,7 @@ export class CommonAzureStack extends TerraformStack {
       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])
       })
     })
@@ -120,13 +121,10 @@ export class CommonAzureStack extends TerraformStack {
     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/common/index.ts

@@ -1,15 +1,17 @@
+import _ from 'lodash'
+
 export * from './construct'
 export * from './stack'
 export * from './types'
 export * from './utils'
 
 export const applyMixins = (derivedCtor: any, constructors: any[]) => {
-  constructors.forEach(baseCtor => {
-    Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
+  _.forEach(constructors, baseConstructor => {
+    Object.getOwnPropertyNames(baseConstructor.prototype).forEach(name => {
       Object.defineProperty(
         derivedCtor.prototype,
         name,
-        Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null)
+        Object.getOwnPropertyDescriptor(baseConstructor.prototype, name) || Object.create(null)
       )
     })
   })