fix: ipv6AssignAddressOnCreation(true) on isolated subnet causes depl…

…oy error
aws · Jan 29, 2024 · 89e41cf · 89e41cf
1 parent 6a7a24a
commit 89e41cf
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc.ts
@@ -1801,6 +1801,11 @@ export class Vpc extends VpcBase {
           privateSubnet.node.addDependency(this.ipv6CidrBlock);
         }
       });
+      (this.isolatedSubnets as PrivateSubnet[]).forEach((isolatedSubnet) => {
+        if (this.ipv6CidrBlock !== undefined) {
+          isolatedSubnet.node.addDependency(this.ipv6CidrBlock);
+        }
+      });
     }
   }
 

diff --git a/packages/aws-cdk-lib/aws-ec2/test/vpc.test.ts b/packages/aws-cdk-lib/aws-ec2/test/vpc.test.ts
@@ -1330,6 +1330,38 @@ describe('vpc', () => {
 
       Template.fromStack(stack).resourceCountIs('Custom::VpcRestrictDefaultSG', 0);
     });
+
+    test.each(
+      [
+        {
+          subnetType: SubnetType.PRIVATE_ISOLATED,
+        },
+        {
+          subnetType: SubnetType.PRIVATE_WITH_EGRESS,
+          additionalSubnetConfig: [{ subnetType: SubnetType.PUBLIC, name: 'public' }],
+        },
+        {
+          subnetType: SubnetType.PUBLIC,
+        },
+      ],
+    )('subnet has dependent on the CIDR block when ipv6AssignAddressOnCreation is set to true, ', (testData) => {
+      const stack = getTestStack();
+      new Vpc(stack, 'TheVPC', {
+        ipProtocol: IpProtocol.DUAL_STACK,
+        maxAzs: 1,
+        subnetConfiguration: [
+          {
+            subnetType: testData.subnetType,
+            name: 'subnetName',
+            ipv6AssignAddressOnCreation: true,
+          },
+          ...testData.additionalSubnetConfig ?? [],
+        ],
+      });
+      Template.fromStack(stack).hasResource('AWS::EC2::Subnet', {
+        DependsOn: ['TheVPCipv6cidrF3E84E30'],
+      });
+    });
   });
 
   describe('fromVpcAttributes', () => {