fix(aws-cdk): fix VpcNetwork.importFromContext() (#2008)

jogold · rix0rrr · commit e1a1a7ba5d37 · 2019-03-13T13:38:41.000+01:00
Check VpnGateways length in VPC provider, which would lead to failure to import VPCs without VPN gateways. Fixes #1998
diff --git a/packages/aws-cdk/lib/context-providers/vpcs.ts b/packages/aws-cdk/lib/context-providers/vpcs.ts
@@ -85,7 +85,9 @@ export class VpcNetworkContextProviderPlugin implements ContextProviderPlugin {
         }
       ]
     }).promise();
-    const vpnGatewayId = vpnGatewayResponse.VpnGateways ? vpnGatewayResponse.VpnGateways[0].VpnGatewayId : undefined;
+    const vpnGatewayId = vpnGatewayResponse.VpnGateways && vpnGatewayResponse.VpnGateways.length === 1
+      ? vpnGatewayResponse.VpnGateways[0].VpnGatewayId
+      : undefined;
 
     return {
       vpcId,

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,9 @@ export class VpcNetworkContextProviderPlugin implements ContextProviderPlugin {`
`85`	`85`	`}`
`86`	`86`	`]`
`87`	`87`	`}).promise();`
`88`		`- const vpnGatewayId = vpnGatewayResponse.VpnGateways ? vpnGatewayResponse.VpnGateways[0].VpnGatewayId : undefined;`
	`88`	`+ const vpnGatewayId = vpnGatewayResponse.VpnGateways && vpnGatewayResponse.VpnGateways.length === 1`
	`89`	`+ ? vpnGatewayResponse.VpnGateways[0].VpnGatewayId`
	`90`	`+ : undefined;`
`89`	`91`
`90`	`92`	`return {`
`91`	`93`	`vpcId,`