Adapted to allow VPCs that do not have isolated or private subnets

elsa-data · Sep 7, 2023 · a49f8af · a49f8af
1 parent b919565
commit a49f8af
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 29 deletions.
diff --git a/packages/client/infrastructure-client.ts b/packages/client/infrastructure-client.ts
@@ -1,6 +1,6 @@
 import { ArnComponents, aws_route53 as route53, Stack } from "aws-cdk-lib";
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
-import { IVpc, SecurityGroup, Vpc } from "aws-cdk-lib/aws-ec2";
+import { IVpc, SecurityGroup, Vpc, VpcAttributes } from "aws-cdk-lib/aws-ec2";
 import {
   HttpNamespace,
   IHttpNamespace,
@@ -30,6 +30,10 @@ export interface DnsResult {
   readonly certificate: ICertificate;
 }
 
+type Mutable<T> = {
+  -readonly [k in keyof T]: T[k];
+};
+
 export class InfrastructureClient {
   constructor(protected infrastructureStackId: string) {}
 
@@ -74,7 +78,7 @@ export class InfrastructureClient {
       return StringParameter.valueFromLookup(scope, parameterName).split(",");
     };
 
-    return Vpc.fromVpcAttributes(scope, "VPC", {
+    const vpcAttrs: Mutable<VpcAttributes> = {
       vpcId: StringParameter.valueFromLookup(
         scope,
         vpcIdParameterName(this.infrastructureStackId)
@@ -88,19 +92,31 @@ export class InfrastructureClient {
       publicSubnetRouteTableIds: getStringListLookup(
         vpcPublicSubnetRouteTableIdsParameterName(this.infrastructureStackId)
       ),
-      privateSubnetIds: getStringListLookup(
+    };
+
+    // try to bring in this private subnets if present
+    try {
+      vpcAttrs.privateSubnetIds = getStringListLookup(
         vpcPrivateSubnetIdsParameterName(this.infrastructureStackId)
-      ),
-      privateSubnetRouteTableIds: getStringListLookup(
+      );
+      vpcAttrs.privateSubnetRouteTableIds = getStringListLookup(
         vpcPrivateSubnetRouteTableIdsParameterName(this.infrastructureStackId)
-      ),
-      isolatedSubnetIds: getStringListLookup(
+      );
+    } catch (e) {}
+
+    // try to bring in the isolated subnets if present
+    try {
+      vpcAttrs.isolatedSubnetIds = getStringListLookup(
         vpcIsolatedSubnetIdsParameterName(this.infrastructureStackId)
-      ),
-      isolatedSubnetRouteTableIds: getStringListLookup(
+      );
+
+      vpcAttrs.isolatedSubnetRouteTableIds = getStringListLookup(
         vpcIsolatedSubnetRouteTableIdsParameterName(this.infrastructureStackId)
-      ),
-    });
+      );
+    } catch (e) {}
+
+    // actually make the VPC object
+    return Vpc.fromVpcAttributes(scope, "VPC", vpcAttrs);
   }
 
   /**

diff --git a/packages/stack/infrastructure-stack.ts b/packages/stack/infrastructure-stack.ts
@@ -98,27 +98,33 @@ export class InfrastructureStack extends Stack {
       stringListValue: vpc.publicSubnets.map((a) => a.routeTable.routeTableId),
     });
 
-    new StringListParameter(this, "PrivateSubnetIdsParameter", {
-      parameterName: vpcPrivateSubnetIdsParameterName(id),
-      stringListValue: vpc.privateSubnets.map((a) => a.subnetId),
-    });
+    if (vpc.privateSubnets && vpc.privateSubnets.length > 0) {
+      new StringListParameter(this, "PrivateSubnetIdsParameter", {
+        parameterName: vpcPrivateSubnetIdsParameterName(id),
+        stringListValue: vpc.privateSubnets.map((a) => a.subnetId),
+      });
 
-    new StringListParameter(this, "PrivateSubnetRouteTableIdsParameter", {
-      parameterName: vpcPrivateSubnetRouteTableIdsParameterName(id),
-      stringListValue: vpc.privateSubnets.map((a) => a.routeTable.routeTableId),
-    });
+      new StringListParameter(this, "PrivateSubnetRouteTableIdsParameter", {
+        parameterName: vpcPrivateSubnetRouteTableIdsParameterName(id),
+        stringListValue: vpc.privateSubnets.map(
+          (a) => a.routeTable.routeTableId
+        ),
+      });
+    }
 
-    new StringListParameter(this, "IsolatedSubnetIdsParameter", {
-      parameterName: vpcIsolatedSubnetIdsParameterName(id),
-      stringListValue: vpc.isolatedSubnets.map((a) => a.subnetId),
-    });
+    if (vpc.isolatedSubnets && vpc.isolatedSubnets.length > 0) {
+      new StringListParameter(this, "IsolatedSubnetIdsParameter", {
+        parameterName: vpcIsolatedSubnetIdsParameterName(id),
+        stringListValue: vpc.isolatedSubnets.map((a) => a.subnetId),
+      });
 
-    new StringListParameter(this, "IsolatedSubnetRouteTableIdsParameter", {
-      parameterName: vpcIsolatedSubnetRouteTableIdsParameterName(id),
-      stringListValue: vpc.isolatedSubnets.map(
-        (a) => a.routeTable.routeTableId
-      ),
-    });
+      new StringListParameter(this, "IsolatedSubnetRouteTableIdsParameter", {
+        parameterName: vpcIsolatedSubnetRouteTableIdsParameterName(id),
+        stringListValue: vpc.isolatedSubnets.map(
+          (a) => a.routeTable.routeTableId
+        ),
+      });
+    }
 
     {
       const sg = new SecurityGroup(this, "SecurityGroup", {