Skip to content

Commit 0007a29

Browse files
authored
fix(vpc-v2): fixing default scope id (#31102)
### Issue # (if applicable) Closes . ### Reason for this change Fix current default scope ids for IPAM. ### Description of changes Fix current default scope ids for IPAM.. ### Description of how you validated changes Integration test deployment ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent a8b072c commit 0007a29

20 files changed

+84
-94
lines changed

packages/@aws-cdk/aws-ec2-alpha/lib/ipam.ts

+5
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,11 @@ class IpamScopeBase implements IIpamScopeBase {
415415
readonly scopeType?: IpamScopeType,
416416
) {
417417
this.scopeType = IpamScopeType.DEFAULT;
418+
if (!props.ipamScopeId) {
419+
throw new Error('ipamScopeId is required');
420+
} else {
421+
this.scopeId = props.ipamScopeId;
422+
}
418423
}
419424

420425
/**

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.assets.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/aws-cdk-vpcv2-alpha-new.template.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
"Properties": {
1616
"AddressFamily": "ipv6",
1717
"AwsService": "ec2",
18-
"IpamScopeId": "DefaultPublicScope",
18+
"IpamScopeId": {
19+
"Fn::GetAtt": [
20+
"Ipam50346F82",
21+
"PublicDefaultScopeId"
22+
]
23+
},
1924
"Locale": "eu-west-2",
2025
"PublicIpSource": "amazon"
2126
}

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/integ.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/integtestmodelDefaultTestDeployAssertCF40BD53.assets.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/manifest.json

+2-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.js.snapshot/tree.json

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.subnet-v2.ts

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import * as vpc_v2 from '../lib/vpc-v2';
1212
import * as ec2 from 'aws-cdk-lib/aws-ec2';
1313
import { AddressFamily, AwsServiceName, IpCidr, Ipam, IpamPoolPublicIpSource, SubnetV2 } from '../lib';
14-
//import { Ipv6Cidr } from '../lib';
1514
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
1615
import * as cdk from 'aws-cdk-lib';
1716
import { SubnetType } from 'aws-cdk-lib/aws-ec2';

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.assets.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/aws-cdk-vpcv2-alpha.template.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@
1414
"Type": "AWS::EC2::IPAMPool",
1515
"Properties": {
1616
"AddressFamily": "ipv4",
17-
"IpamScopeId": "DefaultPrivateScope",
17+
"IpamScopeId": {
18+
"Fn::GetAtt": [
19+
"IpamTestIpam6C9298EF",
20+
"PrivateDefaultScopeId"
21+
]
22+
},
1823
"Locale": "eu-central-1",
1924
"ProvisionedCidrs": [
2025
{
@@ -28,7 +33,12 @@
2833
"Properties": {
2934
"AddressFamily": "ipv6",
3035
"AwsService": "ec2",
31-
"IpamScopeId": "DefaultPublicScope",
36+
"IpamScopeId": {
37+
"Fn::GetAtt": [
38+
"IpamTestIpam6C9298EF",
39+
"PublicDefaultScopeId"
40+
]
41+
},
3242
"Locale": "eu-central-1",
3343
"PublicIpSource": "amazon"
3444
}

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/integ.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/integtestmodelDefaultTestDeployAssertCF40BD53.assets.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/manifest.json

+2-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.js.snapshot/tree.json

+18-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-ec2-alpha/test/integ.vpc-v2-alpha.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ new SubnetV2(stack, 'testsubnet', {
9292
subnetType: SubnetType.PRIVATE_ISOLATED,
9393
});
9494

95-
//validate ipv6
95+
//Validate ipv6 IPAM
9696
new SubnetV2(stack, 'validateIpv6', {
9797
vpc,
9898
ipv4CidrBlock: new IpCidr('10.3.0.0/24'),

0 commit comments

Comments
 (0)