@gradientedge/cdk-utils 8.122.0 → 8.123.0

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

@@ -1,8 +1,9 @@
 import * as cdk from 'aws-cdk-lib'
 import * as watch from 'aws-cdk-lib/aws-cloudwatch'
 import { IMetric } from 'aws-cdk-lib/aws-cloudwatch'
-import * as utils from '../../utils'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
+import * as utils from '../../utils'
 import {
   AlarmProps,
   AlarmStatusWidgetProps,
@@ -56,9 +57,10 @@ export class CloudWatchManager {
     if (!props.metricProps) throw `Could not find metricProps for Alarm props for id:${id}`
 
     const metrics: any = {}
-    this.determineMetrics(scope, props.metricProps).map(
-      (metric: watch.IMetric, index: number) => (metrics[`m${index}`] = metric)
-    )
+    _.map(this.determineMetrics(scope, props.metricProps), (metric: watch.IMetric, index: number) => {
+      metrics[`m${index}`] = metric
+    })
+
     const expression = new watch.MathExpression({
       expression: props.expression,
       period: props.periodInSecs ? cdk.Duration.seconds(props.periodInSecs) : cdk.Duration.minutes(5),
@@ -139,7 +141,9 @@ export class CloudWatchManager {
     if (!props || props.length == 0) throw `Widget props undefined`
 
     const widgets: any = []
-    props.forEach((widgetProps: any) => widgets.push(this.createWidget(widgetProps.id, scope, widgetProps)))
+    _.forEach(props, (widgetProps: any) => {
+      widgets.push(this.createWidget(widgetProps.id, scope, widgetProps))
+    })
 
     return widgets
   }
@@ -188,9 +192,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ distributionId: distributionId } })),
-      },
+      metricProps: _.map(metricProps, { ..._, distributionId }),
     })
   }
 
@@ -206,9 +208,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ stateMachineArn: stateMachineArn } })),
-      },
+      metricProps: _.map(metricProps, { ..._, stateMachineArn }),
     })
   }
 
@@ -225,12 +225,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({
-          ...metricProp,
-          ...{ eventBusName: eventBusName, ruleName: ruleName },
-        })),
-      },
+      metricProps: _.map(metricProps, { ..._, eventBusName, ruleName }),
     })
   }
 
@@ -246,9 +241,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ apiName: apiName } })),
-      },
+      metricProps: _.map(metricProps, { ..._, apiName }),
     })
   }
 
@@ -264,9 +257,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ functionName: functionName } })),
-      },
+      metricProps: _.map(metricProps, { ..._, functionName }),
     })
   }
 
@@ -282,9 +273,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ service: service } })),
-      },
+      metricProps: _.map(metricProps, { ..._, service }),
     })
   }
 
@@ -300,9 +289,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ clusterName: clusterName } })),
-      },
+      metricProps: _.map(metricProps, { ..._, clusterName }),
     })
   }
 
@@ -325,12 +312,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({
-          ...metricProp,
-          ...{ clusterName: clusterName, serviceName: serviceName },
-        })),
-      },
+      metricProps: _.map(metricProps, { ..._, clusterName, serviceName }),
     })
   }
 
@@ -346,9 +328,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ loadBalancer: loadBalancer } })),
-      },
+      metricProps: _.map(metricProps, { ..._, loadBalancer }),
     })
   }
 
@@ -364,9 +344,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      ...{
-        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ cacheClusterId: cacheClusterId } })),
-      },
+      metricProps: _.map(metricProps, { ..._, cacheClusterId }),
     })
   }
 
@@ -541,101 +519,77 @@ export class CloudWatchManager {
         if (metricProp.functionName) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              FunctionName: `${metricProp.functionName}`,
-            },
+            FunctionName: `${metricProp.functionName}`,
           }
         }
         if (metricProp.serviceName && metricProp.clusterName) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              ClusterName: `${metricProp.clusterName}`,
-              ServiceName: `${metricProp.serviceName}`,
-            },
+            ClusterName: `${metricProp.clusterName}`,
+            ServiceName: `${metricProp.serviceName}`,
           }
         }
         if (!metricProp.serviceName && metricProp.clusterName) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              ClusterName: `${metricProp.clusterName}`,
-            },
+            ClusterName: `${metricProp.clusterName}`,
           }
         }
         if (metricProp.serviceName && !metricProp.clusterName) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              ServiceName: `${metricProp.serviceName}`,
-            },
+            ServiceName: `${metricProp.serviceName}`,
           }
         }
         if (metricProp.loadBalancer) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              LoadBalancer: `${metricProp.loadBalancer}`,
-            },
+            LoadBalancer: `${metricProp.loadBalancer}`,
           }
         }
         if (metricProp.service) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              service: `${metricProp.service}`,
-            },
+            service: `${metricProp.service}`,
           }
         }
         if (metricProp.distributionId) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              DistributionId: `${metricProp.distributionId}`,
-              Region: `Global`,
-            },
+            DistributionId: `${metricProp.distributionId}`,
+            Region: `Global`,
           }
         }
         if (metricProp.apiName) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              ApiName: `${metricProp.apiName}`,
-            },
+            ApiName: `${metricProp.apiName}`,
           }
         }
         if (metricProp.cacheClusterId) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              CacheClusterId: `${metricProp.cacheClusterId}`,
-            },
+            CacheClusterId: `${metricProp.cacheClusterId}`,
           }
         }
         if (metricProp.dbClusterIdentifier) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              DBClusterIdentifier: `${metricProp.dbClusterIdentifier}`,
-            },
+            DBClusterIdentifier: `${metricProp.dbClusterIdentifier}`,
           }
         }
         if (metricProp.stateMachineArn) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              StateMachineArn: `${metricProp.stateMachineArn}`,
-            },
+            StateMachineArn: `${metricProp.stateMachineArn}`,
           }
         }
 
         if (metricProp.eventBusName && metricProp.ruleName) {
           metricDimensions = {
             ...metricProp.dimensionsMap,
-            ...{
-              EventBusName: `${metricProp.eventBusName}`,
-              RuleName: `${metricProp.ruleName}`,
-            },
+            EventBusName: `${metricProp.eventBusName}`,
+            RuleName: `${metricProp.ruleName}`,
           }
         }
         const metric = new watch.Metric({
@@ -679,7 +633,7 @@ export class CloudWatchManager {
   private determineAlarms(id: string, scope: CommonConstruct, alarmProps: watch.AlarmProps[]) {
     const alarms: watch.IAlarm[] = []
     if (alarmProps) {
-      alarmProps.forEach((alarmProp: watch.AlarmProps) => {
+      _.forEach(alarmProps, (alarmProp: watch.AlarmProps) => {
         if (!alarmProp.alarmName) throw `Alarm name undefined for ${id}`
         const alarmArn = `arn:aws:cloudwatch:${cdk.Stack.of(scope).region}:${cdk.Stack.of(scope).account}:alarm:${
           alarmProp.alarmName

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

@@ -1,5 +1,6 @@
 import { Tags } from 'aws-cdk-lib'
 import { Table } from 'aws-cdk-lib/aws-dynamodb'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { TableProps } from './types'
@@ -50,8 +51,8 @@ export class DynamodbManager {
       writeCapacity: props.writeCapacity,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(table).add(tag.key, tag.value)
       })
     }

package/src/lib/aws/services/elastic-container-service/main.ts

@@ -14,6 +14,7 @@ import {
 import { ApplicationLoadBalancedFargateService } from 'aws-cdk-lib/aws-ecs-patterns'
 import { Role } from 'aws-cdk-lib/aws-iam'
 import { ILogGroup } from 'aws-cdk-lib/aws-logs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { EcsApplicationLoadBalancedFargateServiceProps, EcsClusterProps, EcsTaskProps } from './types'
@@ -55,8 +56,8 @@ export class EcsManager {
       vpc: vpc,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(ecsCluster).add(tag.key, tag.value)
       })
     }
@@ -132,8 +133,8 @@ export class EcsManager {
       secrets: secrets,
     })
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(ecsTask).add(tag.key, tag.value)
       })
     }

package/src/lib/aws/services/elastic-file-system/main.ts

@@ -1,6 +1,7 @@
 import { RemovalPolicy } from 'aws-cdk-lib'
 import { ISecurityGroup, IVpc, SubnetSelection } from 'aws-cdk-lib/aws-ec2'
 import { FileSystem, LifecyclePolicy, OutOfInfrequentAccessPolicy, PerformanceMode } from 'aws-cdk-lib/aws-efs'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { EfsAccessPointOptions, EfsFileSystemProps } from './types'
@@ -71,7 +72,7 @@ export class EfsManager {
     createCfnOutput(`${id}-fileSystemId`, scope, fileSystem.fileSystemId)
 
     /* provision access points if specified */
-    if (accessPointOptions && accessPointOptions.length > 0) {
+    if (accessPointOptions && !_.isEmpty(accessPointOptions)) {
       for (const [index, accessPointOption] of accessPointOptions.entries()) {
         if (!accessPointOption.path) throw `Undefined access point path for option: [${accessPointOption}], id: [${id}]`
         const accessPoint = fileSystem.addAccessPoint(`${id}-ap-${index}`, {

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

@@ -1,5 +1,6 @@
 import { Tags } from 'aws-cdk-lib'
 import { CfnCacheCluster, CfnReplicationGroup, CfnSubnetGroup } from 'aws-cdk-lib/aws-elasticache'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { ElastiCacheProps, ReplicatedElastiCacheProps } from './types'
@@ -80,8 +81,8 @@ export class ElastiCacheManager {
 
     elasticacheCluster.addDependency(subnetGroup)
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(elasticacheCluster).add(tag.key, tag.value)
       })
     }

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

@@ -6,6 +6,7 @@ import { CfnPermission, IFunction } from 'aws-cdk-lib/aws-lambda'
 import { CfnPipe } from 'aws-cdk-lib/aws-pipes'
 import { IQueue } from 'aws-cdk-lib/aws-sqs'
 import { IStateMachine } from 'aws-cdk-lib/aws-stepfunctions'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { EventBusProps, EventRuleProps, RuleProps, SqsToSfnPipeProps } from './types'
@@ -72,14 +73,14 @@ export class EventManager {
       schedule: props.schedule,
     })
 
-    if (targets && targets.length > 0) {
-      targets.forEach(target => {
+    if (targets && !_.isEmpty(targets)) {
+      _.forEach(targets, target => {
         rule.addTarget(target)
       })
     }
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(rule).add(tag.key, tag.value)
       })
     }

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

@@ -15,6 +15,7 @@ import {
   LayerVersion,
 } from 'aws-cdk-lib/aws-lambda'
 import { SqsEventSource } from 'aws-cdk-lib/aws-lambda-event-sources'
+import _ from 'lodash'
 import { CommonConstruct, CommonStack } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { CloudFrontManager } from '../cloudfront'
@@ -144,7 +145,7 @@ export class LambdaManager {
       )
     }
 
-    if (props.lambdaAliases && props.lambdaAliases.length > 0) {
+    if (props.lambdaAliases && !_.isEmpty(props.lambdaAliases)) {
       props.lambdaAliases.forEach(alias => {
         const aliasId = alias.id ?? `${id}-${alias.aliasName}`
         const functionAlias = this.createLambdaFunctionAlias(`${aliasId}`, scope, alias, lambdaFunction.currentVersion)
@@ -160,8 +161,8 @@ export class LambdaManager {
       })
     }
 
-    if (props.tags && props.tags.length > 0) {
-      props.tags.forEach(tag => {
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
         Tags.of(lambdaFunction).add(tag.key, tag.value)
       })
     }

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

@@ -1,6 +1,7 @@
 import { IFunction } from 'aws-cdk-lib/aws-lambda'
 import { Topic } from 'aws-cdk-lib/aws-sns'
 import { EmailSubscription, LambdaSubscription } from 'aws-cdk-lib/aws-sns-subscriptions'
+import _ from 'lodash'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput } from '../../utils'
 import { SubscriptionProps } from './types'
@@ -43,8 +44,8 @@ export class SnsManager {
       topicName: `${props.topicName}-${scope.props.stage}`,
     })
 
-    if (emails && emails.length > 0) {
-      emails.forEach((email: string) => topic.addSubscription(new EmailSubscription(email)))
+    if (emails && !_.isEmpty(emails)) {
+      _.forEach(emails, (email: string) => topic.addSubscription(new EmailSubscription(email)))
     }
 
     createCfnOutput(`${id}-subscriptionArn`, scope, topic.topicArn)

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