@gradientedge/cdk-utils 8.122.0 → 8.123.0

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