Merge pull request #2438 from guardian/an/one-stack-multiple-vpcs

vpc construct: only try setting context if unset
guardian · Sep 3, 2024 · f1bcb7b · f1bcb7b
2 parents 10cad8d + 8e8a20f
commit f1bcb7b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/.changeset/dirty-cherries-hug.md b/.changeset/dirty-cherries-hug.md
@@ -0,0 +1,5 @@
+---
+"@guardian/cdk": patch
+---
+
+Fix bug preventing creation of multiple VPCs in single stack
diff --git a/src/constructs/vpc/vpc.test.ts b/src/constructs/vpc/vpc.test.ts
@@ -11,4 +11,13 @@ describe("The GuVpc construct", () => {
     new GuVpc(stack, "MyVpc");
     expect(Template.fromStack(stack).toJSON()).toMatchSnapshot();
   });
+
+  it("should be possible to create two vpcs in the same stack", () => {
+    const stack = simpleGuStackForTesting({
+      stack: "test-stack",
+      env: { region: "eu-west-1", account: "000000000000" },
+    });
+    new GuVpc(stack, "MyVpc");
+    new GuVpc(stack, "MyOtherVpc");
+  });
 });
diff --git a/src/constructs/vpc/vpc.ts b/src/constructs/vpc/vpc.ts
@@ -61,11 +61,11 @@ export class GuVpc extends Vpc {
       );
     }
 
-    node.setContext(`availability-zones:account=${account}:region=eu-west-1`, [
-      "eu-west-1a",
-      "eu-west-1b",
-      "eu-west-1c",
-    ]);
+    const contextKey = `availability-zones:account=${account}:region=eu-west-1`;
+
+    if (node.tryGetContext(contextKey) === undefined) {
+      node.setContext(contextKey, ["eu-west-1a", "eu-west-1b", "eu-west-1c"]);
+    }
   }
 
   constructor(scope: GuStack, id: string, props?: GuVpcProps) {