@fjall/components-infrastructure 0.69.2 → 0.69.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,17 +19,13 @@ class ManagedPlatform extends managedAccount_1.ManagedAccount {
|
|
|
19
19
|
});
|
|
20
20
|
// Convert accounts to flat array for IpamPool
|
|
21
21
|
const orgAccounts = Object.values(props.accounts).flatMap((account) => Array.isArray(account) ? account : [account]);
|
|
22
|
-
// Create IPAM
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
region: region,
|
|
29
|
-
ipamScope: ipam.privateDefaultScopeId
|
|
30
|
-
});
|
|
31
|
-
}
|
|
22
|
+
// Create IPAM pool hierarchy for all regions
|
|
23
|
+
new ipamPool_1.IpamPool(this, "IpamPool", {
|
|
24
|
+
orgAccounts,
|
|
25
|
+
regions: allRegions,
|
|
26
|
+
ipamScope: ipam.privateDefaultScopeId
|
|
27
|
+
});
|
|
32
28
|
}
|
|
33
29
|
}
|
|
34
30
|
exports.ManagedPlatform = ManagedPlatform;
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFuYWdlZFBsYXRmb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vbGliL3BhdHRlcm5zL2F3cy9tYW5hZ2VkUGxhdGZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsZ0RBQTZDO0FBQzdDLHNFQUFtRTtBQUVuRSxxREFBdUU7QUFDdkUscURBQWtEO0FBVWxELE1BQWEsZUFBZ0IsU0FBUSwrQkFBYztJQUNqRCxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQTJCO1FBQ25FLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXhCLDZCQUE2QjtRQUM3QixNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFTLEdBQUUsQ0FBQztRQUMzQixNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDO1lBQzdDLENBQUMsQ0FBQyxNQUFNLENBQUMsVUFBVTtZQUNuQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyw2Q0FBNkM7UUFFakUsMENBQTBDO1FBQzFDLE1BQU0sSUFBSSxHQUFHLElBQUksV0FBSSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUU7WUFDbEMsT0FBTyxFQUFFLFVBQVU7U0FDcEIsQ0FBQyxDQUFDO1FBRUgsOENBQThDO1FBQzlDLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQ3BFLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FDN0MsQ0FBQztRQUVGLDZDQUE2QztRQUM3QyxJQUFJLG1CQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRTtZQUM3QixXQUFXO1lBQ1gsT0FBTyxFQUFFLFVBQVU7WUFDbkIsU0FBUyxFQUFFLElBQUksQ0FBQyxxQkFBcUI7U0FDdEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBM0JELDBDQTJCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElwYW0gfSBmcm9tIFwiLi4vLi4vY29uZmlnL2F3cy9pcGFtXCI7XG5pbXBvcnQgeyBJcGFtUG9vbCB9IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL25ldHdvcmtpbmcvaXBhbVBvb2xcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBNYW5hZ2VkQWNjb3VudCwgTWFuYWdlZEFjY291bnRQcm9wcyB9IGZyb20gXCIuL21hbmFnZWRBY2NvdW50XCI7XG5pbXBvcnQgeyBnZXRDb25maWcgfSBmcm9tIFwiLi4vLi4vdXRpbHMvZ2V0Q29uZmlnXCI7XG5cbnR5cGUgQWNjb3VudHNDb25maWcgPSB7XG4gIHJlYWRvbmx5IFtrZXk6IHN0cmluZ106IHJlYWRvbmx5IHN0cmluZ1tdIHwgc3RyaW5nO1xufTtcblxuaW50ZXJmYWNlIE1hbmFnZWRQbGF0Zm9ybVByb3BzIGV4dGVuZHMgTWFuYWdlZEFjY291bnRQcm9wcyB7XG4gIGFjY291bnRzOiBBY2NvdW50c0NvbmZpZztcbn1cblxuZXhwb3J0IGNsYXNzIE1hbmFnZWRQbGF0Zm9ybSBleHRlbmRzIE1hbmFnZWRBY2NvdW50IHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IE1hbmFnZWRQbGF0Zm9ybVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCBwcm9wcyk7XG5cbiAgICAvLyBHZXQgYWxsIGNvbmZpZ3VyZWQgcmVnaW9uc1xuICAgIGNvbnN0IGNvbmZpZyA9IGdldENvbmZpZygpO1xuICAgIGNvbnN0IGFsbFJlZ2lvbnMgPSBjb25maWcuYWxsUmVnaW9ucy5sZW5ndGggPiAwXG4gICAgICA/IGNvbmZpZy5hbGxSZWdpb25zXG4gICAgICA6IFtwcm9wcy5yZWdpb25dOyAvLyBGYWxsYmFjayB0byBhdCBsZWFzdCB0aGUgZGVwbG95bWVudCByZWdpb25cblxuICAgIC8vIENyZWF0ZSBJUEFNIHdpdGggYWxsIHJlZ2lvbnMgY29uZmlndXJlZFxuICAgIGNvbnN0IGlwYW0gPSBuZXcgSXBhbSh0aGlzLCBcIklwYW1cIiwge1xuICAgICAgcmVnaW9uczogYWxsUmVnaW9uc1xuICAgIH0pO1xuXG4gICAgLy8gQ29udmVydCBhY2NvdW50cyB0byBmbGF0IGFycmF5IGZvciBJcGFtUG9vbFxuICAgIGNvbnN0IG9yZ0FjY291bnRzID0gT2JqZWN0LnZhbHVlcyhwcm9wcy5hY2NvdW50cykuZmxhdE1hcCgoYWNjb3VudCkgPT5cbiAgICAgIEFycmF5LmlzQXJyYXkoYWNjb3VudCkgPyBhY2NvdW50IDogW2FjY291bnRdXG4gICAgKTtcblxuICAgIC8vIENyZWF0ZSBJUEFNIHBvb2wgaGllcmFyY2h5IGZvciBhbGwgcmVnaW9uc1xuICAgIG5ldyBJcGFtUG9vbCh0aGlzLCBcIklwYW1Qb29sXCIsIHtcbiAgICAgIG9yZ0FjY291bnRzLFxuICAgICAgcmVnaW9uczogYWxsUmVnaW9ucyxcbiAgICAgIGlwYW1TY29wZTogaXBhbS5wcml2YXRlRGVmYXVsdFNjb3BlSWRcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -3,7 +3,7 @@ import { Construct } from "constructs";
|
|
|
3
3
|
export interface IpamPoolProps extends StackProps {
|
|
4
4
|
orgAccounts: string[];
|
|
5
5
|
ipamScope?: string;
|
|
6
|
-
|
|
6
|
+
regions: string[];
|
|
7
7
|
/**
|
|
8
8
|
* The netmask length (/CIDR) each child IPAM pool should receive.
|
|
9
9
|
* Controls the size of CIDR blocks automatically allocated to VPCs from the pool.
|
|
@@ -19,7 +19,7 @@ export interface IpamPoolProps extends StackProps {
|
|
|
19
19
|
}
|
|
20
20
|
interface IpamPoolStackProps extends StackProps {
|
|
21
21
|
orgAccounts: string[];
|
|
22
|
-
|
|
22
|
+
regions: string[];
|
|
23
23
|
}
|
|
24
24
|
export declare class IpamPool extends Construct {
|
|
25
25
|
constructor(scope: Construct, id: string, props: IpamPoolProps);
|
|
@@ -11,8 +11,10 @@ class IpamPool extends constructs_1.Construct {
|
|
|
11
11
|
super(scope, id);
|
|
12
12
|
// Get the default IPAM scope ID from props, or CFN import
|
|
13
13
|
const IpamPrivateDefaultScopeId = props.ipamScope || aws_cdk_lib_1.Fn.importValue("IpamPrivateDefaultScopeId");
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
const regions = props.regions;
|
|
15
|
+
if (!regions || regions.length === 0) {
|
|
16
|
+
throw new Error("At least one region must be specified for IPAM pools");
|
|
17
|
+
}
|
|
16
18
|
const organisationAccounts = props.orgAccounts.map((account) => account.toLowerCase());
|
|
17
19
|
// Determine the child-pool CIDR size (defaults to /20)
|
|
18
20
|
const defaultNetmaskLength = props.allocationDefaultNetmaskLength ?? 20;
|
|
@@ -31,13 +33,13 @@ class IpamPool extends constructs_1.Construct {
|
|
|
31
33
|
console.warn(`Warning: allocationDefaultNetmaskLength (/${defaultNetmaskLength}) is larger than provisionedNetmaskLength (/${provisionedNetmaskLength}). ` +
|
|
32
34
|
`VPC allocation may fail if the pool cannot satisfy the request.`);
|
|
33
35
|
}
|
|
34
|
-
// Create
|
|
36
|
+
// Create ONE top-level pool (no locale) that contains all CIDRs
|
|
35
37
|
const rootPool = new aws_ec2_1.CfnIPAMPool(this, "TopLevelIpamPool", {
|
|
36
|
-
description: `Root IPAM pool`,
|
|
38
|
+
description: `Root IPAM pool (Global)`,
|
|
37
39
|
addressFamily: "ipv4",
|
|
38
40
|
ipamScopeId: IpamPrivateDefaultScopeId,
|
|
39
|
-
locale
|
|
40
|
-
// Explicitly provision the
|
|
41
|
+
// No locale for the top-level pool - it's global
|
|
42
|
+
// Explicitly provision the main CIDR blocks at the top-level
|
|
41
43
|
provisionedCidrs: [
|
|
42
44
|
{ cidr: "10.0.0.0/8" },
|
|
43
45
|
{ cidr: "172.16.0.0/12" },
|
|
@@ -55,68 +57,97 @@ class IpamPool extends constructs_1.Construct {
|
|
|
55
57
|
}
|
|
56
58
|
]
|
|
57
59
|
});
|
|
58
|
-
// Create
|
|
59
|
-
for (const
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
|
|
60
|
+
// Create regional pools as children of the root pool
|
|
61
|
+
for (const region of regions) {
|
|
62
|
+
const regionSuffix = region.replace(/-/g, "");
|
|
63
|
+
// Create a regional pool for this specific region
|
|
64
|
+
const regionalPool = new aws_ec2_1.CfnIPAMPool(this, `RegionalPool${regionSuffix}`, {
|
|
65
|
+
description: `Regional IPAM pool - ${region}`,
|
|
63
66
|
addressFamily: "ipv4",
|
|
64
67
|
ipamScopeId: IpamPrivateDefaultScopeId,
|
|
65
|
-
locale: region,
|
|
66
|
-
// Allocate from
|
|
67
|
-
sourceIpamPoolId: rootPool.attrIpamPoolId,
|
|
68
|
-
allocationDefaultNetmaskLength: defaultNetmaskLength,
|
|
69
|
-
allocationResourceTags: [
|
|
70
|
-
{
|
|
71
|
-
key: "fjall:operations:pool",
|
|
72
|
-
value: `${accountId}`
|
|
73
|
-
}
|
|
74
|
-
],
|
|
68
|
+
locale: region, // Set the locale for this regional pool
|
|
69
|
+
sourceIpamPoolId: rootPool.attrIpamPoolId, // Allocate from root pool
|
|
75
70
|
autoImport: true,
|
|
76
71
|
tags: [
|
|
77
72
|
{
|
|
78
73
|
key: "fjall:operations:pool",
|
|
79
|
-
value:
|
|
74
|
+
value: `regional-${region}`
|
|
80
75
|
},
|
|
81
76
|
{
|
|
82
|
-
key: "fjall:costAllocation:
|
|
83
|
-
value:
|
|
77
|
+
key: "fjall:costAllocation:type",
|
|
78
|
+
value: "regional"
|
|
84
79
|
}
|
|
85
80
|
]
|
|
86
81
|
});
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
const share = new resourceShare_1.ResourceShare(this, `${account}${region}IpamResourceShare`, {
|
|
93
|
-
name: `${account}IpamResourceShare.${region}`,
|
|
94
|
-
allowExternalPrincipals: false,
|
|
95
|
-
principals: [accountId],
|
|
96
|
-
resourceArns: [ipamPool.attrArn],
|
|
97
|
-
tags: [
|
|
98
|
-
{
|
|
99
|
-
key: "fjall:costAllocation:account",
|
|
100
|
-
value: `${account}`
|
|
101
|
-
}
|
|
102
|
-
]
|
|
103
|
-
});
|
|
104
|
-
// Ensure the share is created only after the CIDR is provisioned
|
|
105
|
-
share.node.addDependency(cidrAllocation);
|
|
106
|
-
// Create region-specific suffix for unique exports
|
|
107
|
-
const regionSuffix = region.replace(/-/g, "");
|
|
108
|
-
// Expose the pool ID for cross-stack usage (e.g. VPC allocations)
|
|
109
|
-
// Include region in export name to ensure uniqueness across regions
|
|
110
|
-
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolId${accountId}${regionSuffix}`, {
|
|
111
|
-
key: `IpamPoolId${accountId}${regionSuffix}`,
|
|
112
|
-
value: ipamPool.attrIpamPoolId,
|
|
113
|
-
exportName: `IpamPoolId${accountId}${regionSuffix}`
|
|
114
|
-
});
|
|
115
|
-
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolArn${accountId}${regionSuffix}`, {
|
|
116
|
-
key: `IpamPoolArn${accountId}${regionSuffix}`,
|
|
117
|
-
value: ipamPool.attrArn,
|
|
118
|
-
exportName: `IpamPoolArn${accountId}${regionSuffix}`
|
|
82
|
+
// Provision a large CIDR block for this regional pool
|
|
83
|
+
// Allocate a /10 for each region from the parent pool
|
|
84
|
+
const regionalCidrAllocation = new aws_ec2_1.CfnIPAMPoolCidr(this, `RegionalPoolCidr${regionSuffix}`, {
|
|
85
|
+
ipamPoolId: regionalPool.attrIpamPoolId,
|
|
86
|
+
netmaskLength: 10 // Each region gets a /10 (4,194,304 IPs)
|
|
119
87
|
});
|
|
88
|
+
// Create account pools under each regional pool
|
|
89
|
+
for (const account of organisationAccounts) {
|
|
90
|
+
const accountId = (0, getAccountId_1.default)(account);
|
|
91
|
+
const ipamPool = new aws_ec2_1.CfnIPAMPool(this, `${account}IpamPool${regionSuffix}`, {
|
|
92
|
+
description: `${account} - IPAM pool - ${region}`,
|
|
93
|
+
addressFamily: "ipv4",
|
|
94
|
+
ipamScopeId: IpamPrivateDefaultScopeId,
|
|
95
|
+
locale: region,
|
|
96
|
+
// Allocate from the regional pool (not root pool)
|
|
97
|
+
sourceIpamPoolId: regionalPool.attrIpamPoolId,
|
|
98
|
+
allocationDefaultNetmaskLength: defaultNetmaskLength,
|
|
99
|
+
allocationResourceTags: [
|
|
100
|
+
{
|
|
101
|
+
key: "fjall:operations:pool",
|
|
102
|
+
value: `${accountId}`
|
|
103
|
+
}
|
|
104
|
+
],
|
|
105
|
+
autoImport: true,
|
|
106
|
+
tags: [
|
|
107
|
+
{
|
|
108
|
+
key: "fjall:operations:pool",
|
|
109
|
+
value: `${accountId}`
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
key: "fjall:costAllocation:accountName",
|
|
113
|
+
value: `${account}`
|
|
114
|
+
}
|
|
115
|
+
]
|
|
116
|
+
});
|
|
117
|
+
// Ensure the account pool is created after the regional CIDR allocation
|
|
118
|
+
ipamPool.node.addDependency(regionalCidrAllocation);
|
|
119
|
+
const cidrAllocation = new aws_ec2_1.CfnIPAMPoolCidr(this, `${account}PoolCidr${provisionedNetmaskLength}${regionSuffix}`, {
|
|
120
|
+
ipamPoolId: ipamPool.attrIpamPoolId,
|
|
121
|
+
netmaskLength: provisionedNetmaskLength
|
|
122
|
+
});
|
|
123
|
+
// Share the pool with the target account so that VPCs can allocate
|
|
124
|
+
const share = new resourceShare_1.ResourceShare(this, `${account}IpamResourceShare${regionSuffix}`, {
|
|
125
|
+
name: `${account}IpamResourceShare.${region}`,
|
|
126
|
+
allowExternalPrincipals: false,
|
|
127
|
+
principals: [accountId],
|
|
128
|
+
resourceArns: [ipamPool.attrArn],
|
|
129
|
+
tags: [
|
|
130
|
+
{
|
|
131
|
+
key: "fjall:costAllocation:account",
|
|
132
|
+
value: `${account}`
|
|
133
|
+
}
|
|
134
|
+
]
|
|
135
|
+
});
|
|
136
|
+
// Ensure the share is created only after the CIDR is provisioned
|
|
137
|
+
share.node.addDependency(cidrAllocation);
|
|
138
|
+
// Expose the pool ID for cross-stack usage (e.g. VPC allocations)
|
|
139
|
+
// Include region in export name to ensure uniqueness across regions
|
|
140
|
+
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolId${accountId}${regionSuffix}`, {
|
|
141
|
+
key: `IpamPoolId${accountId}${regionSuffix}`,
|
|
142
|
+
value: ipamPool.attrIpamPoolId,
|
|
143
|
+
exportName: `IpamPoolId${accountId}${regionSuffix}`
|
|
144
|
+
});
|
|
145
|
+
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolArn${accountId}${regionSuffix}`, {
|
|
146
|
+
key: `IpamPoolArn${accountId}${regionSuffix}`,
|
|
147
|
+
value: ipamPool.attrArn,
|
|
148
|
+
exportName: `IpamPoolArn${accountId}${regionSuffix}`
|
|
149
|
+
});
|
|
150
|
+
}
|
|
120
151
|
}
|
|
121
152
|
}
|
|
122
153
|
}
|
|
@@ -126,9 +157,9 @@ class IpamPoolStack extends aws_cdk_lib_1.Stack {
|
|
|
126
157
|
super(scope, id);
|
|
127
158
|
new IpamPool(this, "IpamPool", {
|
|
128
159
|
orgAccounts: props.orgAccounts,
|
|
129
|
-
|
|
160
|
+
regions: props.regions
|
|
130
161
|
});
|
|
131
162
|
}
|
|
132
163
|
}
|
|
133
164
|
exports.IpamPoolStack = IpamPoolStack;
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ipamPool.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/networking/ipamPool.ts"],"names":[],"mappings":"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","sourcesContent":["import { Fn, CfnOutput, StackProps, Stack } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport {\n  CfnIPAMPool as IpamPoolClass,\n  CfnIPAMPoolCidr\n} from \"aws-cdk-lib/aws-ec2\";\nimport { ResourceShare } from \"../utilities/resourceShare\";\nimport getAccountId from \"../../../utils/getAccountId\";\n\nexport interface IpamPoolProps extends StackProps {\n  orgAccounts: string[];\n  ipamScope?: string;\n  region: string;\n  /**\n   * The netmask length (/CIDR) each child IPAM pool should receive.\n   * Controls the size of CIDR blocks automatically allocated to VPCs from the pool.\n   * Accepted range: /16 (65,536 IPs) – /28 (16 IPs). Defaults to /20 (4,096 IPs).\n   */\n  allocationDefaultNetmaskLength?: number;\n  /**\n   * The netmask length (/CIDR) provisioned into each child IPAM pool on creation.\n   * Determines the total address space available for VPC allocations in that account.\n   * Accepted range: /13 (524,288 IPs) – /16 (65,536 IPs). Defaults to /14.\n   */\n  provisionedNetmaskLength?: number;\n}\n\ninterface IpamPoolStackProps extends StackProps {\n  orgAccounts: string[];\n  region: string;\n}\n\nexport class IpamPool extends Construct {\n  constructor(scope: Construct, id: string, props: IpamPoolProps) {\n    super(scope, id);\n\n    // Get the default IPAM scope ID from props, or CFN import\n    const IpamPrivateDefaultScopeId =\n      props.ipamScope || Fn.importValue(\"IpamPrivateDefaultScopeId\");\n    // Prioritise region from props, then from env\n    const region = props.region;\n\n    const organisationAccounts = props.orgAccounts.map((account) =>\n      account.toLowerCase()\n    );\n\n    // Determine the child-pool CIDR size (defaults to /20)\n    const defaultNetmaskLength = props.allocationDefaultNetmaskLength ?? 20;\n    const provisionedNetmaskLength = props.provisionedNetmaskLength ?? 14;\n\n    // Basic validation – /16 to /28 inclusive are considered safe for VPC allocations\n    if (defaultNetmaskLength < 16 || defaultNetmaskLength > 28) {\n      throw new Error(\n        `allocationDefaultNetmaskLength must be between 16 and 28 (inclusive). Received: ${defaultNetmaskLength}`\n      );\n    }\n\n    // Validate provisioned block size (/13 to /16)\n    if (provisionedNetmaskLength < 13 || provisionedNetmaskLength > 16) {\n      throw new Error(\n        `provisionedNetmaskLength must be between 13 and 16 (inclusive). Received: ${provisionedNetmaskLength}`\n      );\n    }\n\n    // Warn if user requests VPC allocations larger than the provisioned pool\n    if (defaultNetmaskLength < provisionedNetmaskLength) {\n      // eslint-disable-next-line no-console\n      console.warn(\n        `Warning: allocationDefaultNetmaskLength (/${defaultNetmaskLength}) is larger than provisionedNetmaskLength (/${provisionedNetmaskLength}). ` +\n          `VPC allocation may fail if the pool cannot satisfy the request.`\n      );\n    }\n\n    // Create the top-level pools\n    const rootPool = new IpamPoolClass(this, \"TopLevelIpamPool\", {\n      description: `Root IPAM pool`,\n      addressFamily: \"ipv4\",\n      ipamScopeId: IpamPrivateDefaultScopeId,\n      locale: region,\n      // Explicitly provision the /8 CIDR once at the top-level\n      provisionedCidrs: [\n        { cidr: \"10.0.0.0/8\" },\n        { cidr: \"172.16.0.0/12\" },\n        { cidr: \"192.168.0.0/16\" }\n      ],\n      autoImport: true,\n      tags: [\n        {\n          key: \"fjall:operations:pool\",\n          value: \"top-level\"\n        },\n        {\n          key: \"fjall:costAllocation:type\",\n          value: \"root\"\n        }\n      ]\n    });\n\n    // Create a child pool for each Organisation account\n    for (const account of organisationAccounts) {\n      const accountId = getAccountId(account);\n\n      const ipamPool = new IpamPoolClass(this, `${account}IpamPool`, {\n        description: `${account} - IPAM pool - ${region}`,\n        addressFamily: \"ipv4\",\n        ipamScopeId: IpamPrivateDefaultScopeId,\n        locale: region,\n        // Allocate from the root pool automatically\n        sourceIpamPoolId: rootPool.attrIpamPoolId,\n        allocationDefaultNetmaskLength: defaultNetmaskLength,\n        allocationResourceTags: [\n          {\n            key: \"fjall:operations:pool\",\n            value: `${accountId}`\n          }\n        ],\n        autoImport: true,\n        tags: [\n          {\n            key: \"fjall:operations:pool\",\n            value: `${accountId}`\n          },\n          {\n            key: \"fjall:costAllocation:accountName\",\n            value: `${account}`\n          }\n        ]\n      });\n\n      const cidrAllocation = new CfnIPAMPoolCidr(\n        this,\n        `${account}PoolCidr${provisionedNetmaskLength}`,\n        {\n          ipamPoolId: ipamPool.attrIpamPoolId,\n          netmaskLength: provisionedNetmaskLength\n        }\n      );\n\n      // Share the pool with the target account so that VPCs can allocate\n      const share = new ResourceShare(\n        this,\n        `${account}${region}IpamResourceShare`,\n        {\n          name: `${account}IpamResourceShare.${region}`,\n          allowExternalPrincipals: false,\n          principals: [accountId],\n          resourceArns: [ipamPool.attrArn],\n          tags: [\n            {\n              key: \"fjall:costAllocation:account\",\n              value: `${account}`\n            }\n          ]\n        }\n      );\n\n      // Ensure the share is created only after the CIDR is provisioned\n      share.node.addDependency(cidrAllocation);\n\n      // Create region-specific suffix for unique exports\n      const regionSuffix = region.replace(/-/g, \"\");\n\n      // Expose the pool ID for cross-stack usage (e.g. VPC allocations)\n      // Include region in export name to ensure uniqueness across regions\n      new CfnOutput(this, `IpamPoolId${accountId}${regionSuffix}`, {\n        key: `IpamPoolId${accountId}${regionSuffix}`,\n        value: ipamPool.attrIpamPoolId,\n        exportName: `IpamPoolId${accountId}${regionSuffix}`\n      });\n\n      new CfnOutput(this, `IpamPoolArn${accountId}${regionSuffix}`, {\n        key: `IpamPoolArn${accountId}${regionSuffix}`,\n        value: ipamPool.attrArn,\n        exportName: `IpamPoolArn${accountId}${regionSuffix}`\n      });\n    }\n  }\n}\n\nexport class IpamPoolStack extends Stack {\n  constructor(scope: Construct, id: string, props: IpamPoolStackProps) {\n    super(scope, id);\n\n    new IpamPool(this, \"IpamPool\", {\n      orgAccounts: props.orgAccounts,\n      region: props.region\n    });\n  }\n}\n"]}
|
|
165
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ipamPool.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/networking/ipamPool.ts"],"names":[],"mappings":"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","sourcesContent":["import { Fn, CfnOutput, StackProps, Stack } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport {\n  CfnIPAMPool as IpamPoolClass,\n  CfnIPAMPoolCidr\n} from \"aws-cdk-lib/aws-ec2\";\nimport { ResourceShare } from \"../utilities/resourceShare\";\nimport getAccountId from \"../../../utils/getAccountId\";\n\nexport interface IpamPoolProps extends StackProps {\n  orgAccounts: string[];\n  ipamScope?: string;\n  regions: string[];\n  /**\n   * The netmask length (/CIDR) each child IPAM pool should receive.\n   * Controls the size of CIDR blocks automatically allocated to VPCs from the pool.\n   * Accepted range: /16 (65,536 IPs) – /28 (16 IPs). Defaults to /20 (4,096 IPs).\n   */\n  allocationDefaultNetmaskLength?: number;\n  /**\n   * The netmask length (/CIDR) provisioned into each child IPAM pool on creation.\n   * Determines the total address space available for VPC allocations in that account.\n   * Accepted range: /13 (524,288 IPs) – /16 (65,536 IPs). Defaults to /14.\n   */\n  provisionedNetmaskLength?: number;\n}\n\ninterface IpamPoolStackProps extends StackProps {\n  orgAccounts: string[];\n  regions: string[];\n}\n\nexport class IpamPool extends Construct {\n  constructor(scope: Construct, id: string, props: IpamPoolProps) {\n    super(scope, id);\n\n    // Get the default IPAM scope ID from props, or CFN import\n    const IpamPrivateDefaultScopeId =\n      props.ipamScope || Fn.importValue(\"IpamPrivateDefaultScopeId\");\n\n    const regions = props.regions;\n    if (!regions || regions.length === 0) {\n      throw new Error(\"At least one region must be specified for IPAM pools\");\n    }\n\n    const organisationAccounts = props.orgAccounts.map((account) =>\n      account.toLowerCase()\n    );\n\n    // Determine the child-pool CIDR size (defaults to /20)\n    const defaultNetmaskLength = props.allocationDefaultNetmaskLength ?? 20;\n    const provisionedNetmaskLength = props.provisionedNetmaskLength ?? 14;\n\n    // Basic validation – /16 to /28 inclusive are considered safe for VPC allocations\n    if (defaultNetmaskLength < 16 || defaultNetmaskLength > 28) {\n      throw new Error(\n        `allocationDefaultNetmaskLength must be between 16 and 28 (inclusive). Received: ${defaultNetmaskLength}`\n      );\n    }\n\n    // Validate provisioned block size (/13 to /16)\n    if (provisionedNetmaskLength < 13 || provisionedNetmaskLength > 16) {\n      throw new Error(\n        `provisionedNetmaskLength must be between 13 and 16 (inclusive). Received: ${provisionedNetmaskLength}`\n      );\n    }\n\n    // Warn if user requests VPC allocations larger than the provisioned pool\n    if (defaultNetmaskLength < provisionedNetmaskLength) {\n      // eslint-disable-next-line no-console\n      console.warn(\n        `Warning: allocationDefaultNetmaskLength (/${defaultNetmaskLength}) is larger than provisionedNetmaskLength (/${provisionedNetmaskLength}). ` +\n          `VPC allocation may fail if the pool cannot satisfy the request.`\n      );\n    }\n\n    // Create ONE top-level pool (no locale) that contains all CIDRs\n    const rootPool = new IpamPoolClass(this, \"TopLevelIpamPool\", {\n      description: `Root IPAM pool (Global)`,\n      addressFamily: \"ipv4\",\n      ipamScopeId: IpamPrivateDefaultScopeId,\n      // No locale for the top-level pool - it's global\n      // Explicitly provision the main CIDR blocks at the top-level\n      provisionedCidrs: [\n        { cidr: \"10.0.0.0/8\" },\n        { cidr: \"172.16.0.0/12\" },\n        { cidr: \"192.168.0.0/16\" }\n      ],\n      autoImport: true,\n      tags: [\n        {\n          key: \"fjall:operations:pool\",\n          value: \"top-level\"\n        },\n        {\n          key: \"fjall:costAllocation:type\",\n          value: \"root\"\n        }\n      ]\n    });\n\n    // Create regional pools as children of the root pool\n    for (const region of regions) {\n      const regionSuffix = region.replace(/-/g, \"\");\n\n      // Create a regional pool for this specific region\n      const regionalPool = new IpamPoolClass(this, `RegionalPool${regionSuffix}`, {\n        description: `Regional IPAM pool - ${region}`,\n        addressFamily: \"ipv4\",\n        ipamScopeId: IpamPrivateDefaultScopeId,\n        locale: region, // Set the locale for this regional pool\n        sourceIpamPoolId: rootPool.attrIpamPoolId, // Allocate from root pool\n        autoImport: true,\n        tags: [\n          {\n            key: \"fjall:operations:pool\",\n            value: `regional-${region}`\n          },\n          {\n            key: \"fjall:costAllocation:type\",\n            value: \"regional\"\n          }\n        ]\n      });\n\n      // Provision a large CIDR block for this regional pool\n      // Allocate a /10 for each region from the parent pool\n      const regionalCidrAllocation = new CfnIPAMPoolCidr(\n        this,\n        `RegionalPoolCidr${regionSuffix}`,\n        {\n          ipamPoolId: regionalPool.attrIpamPoolId,\n          netmaskLength: 10 // Each region gets a /10 (4,194,304 IPs)\n        }\n      );\n\n      // Create account pools under each regional pool\n      for (const account of organisationAccounts) {\n        const accountId = getAccountId(account);\n\n        const ipamPool = new IpamPoolClass(this, `${account}IpamPool${regionSuffix}`, {\n          description: `${account} - IPAM pool - ${region}`,\n          addressFamily: \"ipv4\",\n          ipamScopeId: IpamPrivateDefaultScopeId,\n          locale: region,\n          // Allocate from the regional pool (not root pool)\n          sourceIpamPoolId: regionalPool.attrIpamPoolId,\n          allocationDefaultNetmaskLength: defaultNetmaskLength,\n          allocationResourceTags: [\n            {\n              key: \"fjall:operations:pool\",\n              value: `${accountId}`\n            }\n          ],\n          autoImport: true,\n          tags: [\n            {\n              key: \"fjall:operations:pool\",\n              value: `${accountId}`\n            },\n            {\n              key: \"fjall:costAllocation:accountName\",\n              value: `${account}`\n            }\n          ]\n        });\n\n        // Ensure the account pool is created after the regional CIDR allocation\n        ipamPool.node.addDependency(regionalCidrAllocation);\n\n        const cidrAllocation = new CfnIPAMPoolCidr(\n          this,\n          `${account}PoolCidr${provisionedNetmaskLength}${regionSuffix}`,\n          {\n            ipamPoolId: ipamPool.attrIpamPoolId,\n            netmaskLength: provisionedNetmaskLength\n          }\n        );\n\n        // Share the pool with the target account so that VPCs can allocate\n        const share = new ResourceShare(\n          this,\n          `${account}IpamResourceShare${regionSuffix}`,\n          {\n            name: `${account}IpamResourceShare.${region}`,\n            allowExternalPrincipals: false,\n            principals: [accountId],\n            resourceArns: [ipamPool.attrArn],\n            tags: [\n              {\n                key: \"fjall:costAllocation:account\",\n                value: `${account}`\n              }\n            ]\n          }\n        );\n\n        // Ensure the share is created only after the CIDR is provisioned\n        share.node.addDependency(cidrAllocation);\n\n        // Expose the pool ID for cross-stack usage (e.g. VPC allocations)\n        // Include region in export name to ensure uniqueness across regions\n        new CfnOutput(this, `IpamPoolId${accountId}${regionSuffix}`, {\n          key: `IpamPoolId${accountId}${regionSuffix}`,\n          value: ipamPool.attrIpamPoolId,\n          exportName: `IpamPoolId${accountId}${regionSuffix}`\n        });\n\n        new CfnOutput(this, `IpamPoolArn${accountId}${regionSuffix}`, {\n          key: `IpamPoolArn${accountId}${regionSuffix}`,\n          value: ipamPool.attrArn,\n          exportName: `IpamPoolArn${accountId}${regionSuffix}`\n        });\n      }\n    }\n  }\n}\n\nexport class IpamPoolStack extends Stack {\n  constructor(scope: Construct, id: string, props: IpamPoolStackProps) {\n    super(scope, id);\n\n    new IpamPool(this, \"IpamPool\", {\n      orgAccounts: props.orgAccounts,\n      regions: props.regions\n    });\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.69.
|
|
3
|
+
"version": "0.69.3",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@aws-sdk/client-organizations": "^3.716.0",
|
|
38
|
-
"@fjall/util": "^0.69.
|
|
38
|
+
"@fjall/util": "^0.69.3",
|
|
39
39
|
"@pepperize/cdk-organizations": "^0.7.135",
|
|
40
40
|
"cdk-time-sleep": "^1.0.0",
|
|
41
41
|
"constructs": "^10.0.0",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"overrides": {
|
|
45
45
|
"@smithy/core": "2.5.5"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "bbfeb265a90e42d5b6ca8c76412f86833878289b",
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"aws-cdk": "^2.206.0",
|
|
50
50
|
"aws-cdk-lib": "^2.206.0",
|