fix(vpc): fixing default scope id

aws · Aug 14, 2024 · 8b007d2 · 8b007d2
1 parent 94b68d7
commit 8b007d2
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 92 deletions.
diff --git a/packages/@aws-cdk/aws-ec2-alpha/lib/ipam.ts b/packages/@aws-cdk/aws-ec2-alpha/lib/ipam.ts
@@ -415,6 +415,11 @@ class IpamScopeBase implements IIpamScopeBase {
     readonly scopeType?: IpamScopeType,
   ) {
     this.scopeType = IpamScopeType.DEFAULT;
+    if (!props.ipamScopeId) {
+      throw new Error('ipamScopeId is required');
+    } else {
+      this.scopeId = props.ipamScopeId;
+    }
   }
 
   /**

diff --git a/...ws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json b/...ws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json
diff --git a/...-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json b/...-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json
@@ -15,7 +15,12 @@
    "Properties": {
     "AddressFamily": "ipv6",
     "AwsService": "ec2",
-    "IpamScopeId": "DefaultPublicScope",
+    "IpamScopeId": {
+     "Fn::GetAtt": [
+      "Ipam50346F82",
+      "PublicDefaultScopeId"
+     ]
+    },
     "Locale": "eu-west-2",
     "PublicIpSource": "amazon"
    }

diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/cdk.out b/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/cdk.out
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/integ.json b/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/integ.json
diff --git a/...est/integ.subnet-v2.js.snapshot/integtestmodelDefaultTestDeployAssertCF40BD53.assets.json b/...est/integ.subnet-v2.js.snapshot/integtestmodelDefaultTestDeployAssertCF40BD53.assets.json
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/manifest.json b/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/tree.json b/packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/tree.json
diff --git a/...aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json b/...aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json
diff --git a/...s-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json b/...s-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json
@@ -14,7 +14,12 @@
    "Type": "AWS::EC2::IPAMPool",
    "Properties": {
     "AddressFamily": "ipv4",
-    "IpamScopeId": "DefaultPrivateScope",
+    "IpamScopeId": {
+     "Fn::GetAtt": [
+      "IpamTestIpam6C9298EF",
+      "PrivateDefaultScopeId"
+     ]
+    },
     "Locale": "eu-central-1",
     "ProvisionedCidrs": [
      {
@@ -28,7 +33,12 @@
    "Properties": {
     "AddressFamily": "ipv6",
     "AwsService": "ec2",
-    "IpamScopeId": "DefaultPublicScope",
+    "IpamScopeId": {
+     "Fn::GetAtt": [
+      "IpamTestIpam6C9298EF",
+      "PublicDefaultScopeId"
+     ]
+    },
     "Locale": "eu-central-1",
     "PublicIpSource": "amazon"
    }

diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/cdk.out b/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/cdk.out
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/integ.json b/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/integ.json
diff --git a/.../integ.vpc-v2-alpha.js.snapshot/integtestmodelDefaultTestDeployAssertCF40BD53.assets.json b/.../integ.vpc-v2-alpha.js.snapshot/integtestmodelDefaultTestDeployAssertCF40BD53.assets.json
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json b/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json b/packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json
diff --git a/packages/@aws-cdk/aws-ec2-alpha/test/ipam.test.ts b/packages/@aws-cdk/aws-ec2-alpha/test/ipam.test.ts
@@ -43,7 +43,9 @@ describe('IPAM Test', () => {
       'AWS::EC2::IPAMPool',
       {
         AddressFamily: 'ipv6',
-        IpamScopeId: 'DefaultPublicScope',
+        IpamScopeId: {
+          "Fn::GetAtt": [ "Ipam50346F82", "PublicDefaultScopeId" ]
+        },
         Locale: 'us-west-2',
       },
     ); //End Template
@@ -69,7 +71,9 @@ describe('IPAM Test', () => {
       'AWS::EC2::IPAMPool',
       {
         AddressFamily: 'ipv4',
-        IpamScopeId: 'DefaultPrivateScope',
+        IpamScopeId:  {
+          "Fn::GetAtt": [ "Ipam50346F82", "PrivateDefaultScopeId" ]
+        },
         Locale: 'us-west-2',
       },
     ); //End Template
@@ -97,7 +101,9 @@ describe('IPAM Test', () => {
           Type: 'AWS::EC2::IPAMPool',
           Properties: {
             AddressFamily: 'ipv6',
-            IpamScopeId: 'DefaultPublicScope',
+            IpamScopeId: {
+              "Fn::GetAtt": [ "TestIpamDBF92BA8", "PublicDefaultScopeId" ]
+            },
             Locale: 'us-west-2',
           },
         },
@@ -129,7 +135,9 @@ describe('IPAM Test', () => {
           Type: 'AWS::EC2::IPAMPool',
           Properties: {
             AddressFamily: 'ipv6',
-            IpamScopeId: 'DefaultPublicScope',
+            IpamScopeId: {
+              "Fn::GetAtt": [ "TestIpamDBF92BA8", "PublicDefaultScopeId" ]
+            },
             Locale: 'us-west-2',
           },
         },