@fjall/components-infrastructure 0.89.4 → 0.89.6

package/dist/lib/resources/aws/networking/ipamPool.js

@@ -1,31 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IpamPoolStack = exports.IpamPool = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const constructs_1 = require("constructs");
-const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
-const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
-const aws_iam_1 = require("aws-cdk-lib/aws-iam");
-const resourceShare_1 = require("../utilities/resourceShare");
-const customResource_1 = require("../utilities/customResource");
-const getAccountId_1 = require("../../../utils/getAccountId");
-const validationLogger_1 = require("../../../utils/validationLogger");
-// IPAM enforces a low concurrent-mutation limit (not publicly documented).
-// Account pools are serialised WITHIN each region (they mutate the same regional
-// pool parent). Across regions, account pools run in parallel because they mutate
-// DIFFERENT regional pool parents — this keeps effective concurrency at 2 (one
-// per region), well within observed AWS limits (~2-3).
-const IPAM_POOL_BATCH_SIZE = 1;
+import { CfnOutput, Duration, Fn, Stack } from "aws-cdk-lib";
+import { Construct } from "constructs";
+import { CfnIPAMPool as IpamPoolClass, CfnIPAMPoolCidr } from "aws-cdk-lib/aws-ec2";
+import { Runtime } from "aws-cdk-lib/aws-lambda";
+import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { ResourceShare } from "../utilities/resourceShare.js";
+import { CustomResource } from "../utilities/customResource.js";
+import getAccountId from "../../../utils/getAccountId.js";
+import { FjallLogger } from "../../../utils/validationLogger.js";
 const IPAM_TAGS = {
     OPERATIONS_POOL: "fjall:operations:pool",
     COST_ALLOCATION_ENVIRONMENT: "fjall:costAllocation:environment",
     COST_ALLOCATION_ACCOUNT_NAME: "fjall:costAllocation:accountName"
 };
-class IpamPool extends constructs_1.Construct {
+export class IpamPool extends Construct {
     constructor(scope, id, props) {
         super(scope, id);
         // Get the default IPAM scope ID from props, or CFN import
-        const IpamPrivateDefaultScopeId = props.ipamScope || aws_cdk_lib_1.Fn.importValue("IpamPrivateDefaultScopeId");
+        const ipamScopeId = props.ipamScope || Fn.importValue("ipamPrivateDefaultScopeId");
         const regions = props.regions;
         if (!regions || regions.length === 0) {
             throw new Error("At least one region must be specified for IPAM pools");
@@ -44,14 +35,14 @@ class IpamPool extends constructs_1.Construct {
         }
         // Warn if user requests VPC allocations larger than the provisioned pool
         if (defaultNetmaskLength < provisionedNetmaskLength) {
-            validationLogger_1.FjallLogger.warn(`'allocationDefaultNetmaskLength' (/${defaultNetmaskLength}) is larger than 'provisionedNetmaskLength' (/${provisionedNetmaskLength}). ` +
+            FjallLogger.warn(`'allocationDefaultNetmaskLength' (/${defaultNetmaskLength}) is larger than 'provisionedNetmaskLength' (/${provisionedNetmaskLength}). ` +
                 `VPC allocation may fail if the pool cannot satisfy the request.`);
         }
         // Top Level Pool
-        const rootPool = new aws_ec2_1.CfnIPAMPool(this, "TopLevelIpamPool", {
+        const rootPool = new IpamPoolClass(this, "TopLevelIpamPool", {
             description: `Root IPAM pool (Global)`,
             addressFamily: "ipv4",
-            ipamScopeId: IpamPrivateDefaultScopeId,
+            ipamScopeId,
             provisionedCidrs: [
                 { cidr: "10.0.0.0/8" },
                 { cidr: "172.16.0.0/12" },
@@ -77,10 +68,10 @@ class IpamPool extends constructs_1.Construct {
         for (const region of regions) {
             const regionSuffix = region.replace(/-/g, "");
             // Create a regional pool for this specific region
-            const regionalPool = new aws_ec2_1.CfnIPAMPool(this, `RegionalPool${regionSuffix}`, {
+            const regionalPool = new IpamPoolClass(this, `RegionalPool${regionSuffix}`, {
                 description: `Regional IPAM pool - ${region}`,
                 addressFamily: "ipv4",
-                ipamScopeId: IpamPrivateDefaultScopeId,
+                ipamScopeId,
                 locale: region,
                 sourceIpamPoolId: rootPool.attrIpamPoolId,
                 autoImport: true,
@@ -101,7 +92,7 @@ class IpamPool extends constructs_1.Construct {
             if (previousRegionalCidr) {
                 regionalPool.addDependency(previousRegionalCidr);
             }
-            const regionalCidrAllocation = new aws_ec2_1.CfnIPAMPoolCidr(this, `RegionalPoolCidr${regionSuffix}`, {
+            const regionalCidrAllocation = new CfnIPAMPoolCidr(this, `RegionalPoolCidr${regionSuffix}`, {
                 ipamPoolId: regionalPool.attrIpamPoolId,
                 netmaskLength: 10 // Each region gets a /10 (4,194,304 IPs)
             });
@@ -113,14 +104,13 @@ class IpamPool extends constructs_1.Construct {
             //
             // Uses CfnResource.addDependency() (not node.addDependency) for
             // guaranteed CloudFormation DependsOn generation between L1 constructs.
-            let previousWaveAnchorCidr;
-            for (let i = 0; i < organisationAccounts.length; i++) {
-                const account = organisationAccounts[i];
-                const accountId = (0, getAccountId_1.default)(account);
-                const ipamPool = new aws_ec2_1.CfnIPAMPool(this, `${account}IpamPool${regionSuffix}`, {
+            let previousAccountCidr;
+            for (const account of organisationAccounts) {
+                const accountId = getAccountId(account);
+                const ipamPool = new IpamPoolClass(this, `${account}IpamPool${regionSuffix}`, {
                     description: `${account} - IPAM pool - ${region}`,
                     addressFamily: "ipv4",
-                    ipamScopeId: IpamPrivateDefaultScopeId,
+                    ipamScopeId,
                     locale: region,
                     sourceIpamPoolId: regionalPool.attrIpamPoolId,
                     allocationDefaultNetmaskLength: defaultNetmaskLength,
@@ -144,33 +134,28 @@ class IpamPool extends constructs_1.Construct {
                 });
                 // Ensure the account pool is created after the regional CIDR allocation
                 ipamPool.addDependency(regionalCidrAllocation);
-                // Wave boundary: pools in wave N+1 depend on the last CIDR from wave N
-                if (previousWaveAnchorCidr) {
-                    ipamPool.addDependency(previousWaveAnchorCidr);
+                // Each account pool depends on the previous account's CIDR completing
+                if (previousAccountCidr) {
+                    ipamPool.addDependency(previousAccountCidr);
                 }
-                const cidrAllocation = new aws_ec2_1.CfnIPAMPoolCidr(this, `${account}PoolCidr${provisionedNetmaskLength}${regionSuffix}`, {
+                const cidrAllocation = new CfnIPAMPoolCidr(this, `${account}PoolCidr${provisionedNetmaskLength}${regionSuffix}`, {
                     ipamPoolId: ipamPool.attrIpamPoolId,
                     netmaskLength: provisionedNetmaskLength
                 });
-                // The last pool in each wave anchors the next wave's dependency
-                const isLastInWave = (i + 1) % IPAM_POOL_BATCH_SIZE === 0 ||
-                    i === organisationAccounts.length - 1;
-                if (isLastInWave) {
-                    previousWaveAnchorCidr = cidrAllocation;
-                }
+                previousAccountCidr = cidrAllocation;
                 // On stack deletion, VPC allocations (not managed by CloudFormation)
                 // block CIDR deprovisioning. This custom resource releases them first.
-                const allocationCleanup = new customResource_1.CustomResource(this, `${account}IpamCleanup${regionSuffix}`, {
-                    runtime: aws_lambda_1.Runtime.NODEJS_22_X,
-                    timeout: aws_cdk_lib_1.Duration.minutes(5),
+                const allocationCleanup = new CustomResource(this, `${account}IpamCleanup${regionSuffix}`, {
+                    runtime: Runtime.NODEJS_22_X,
+                    timeout: Duration.minutes(5),
                     lambdaDescription: `${account} IPAM pool allocation cleanup - ${region}`,
                     properties: {
                         IpamPoolId: ipamPool.attrIpamPoolId,
                         PoolRegion: region
                     },
                     inlinePolicy: [
-                        new aws_iam_1.PolicyStatement({
-                            effect: aws_iam_1.Effect.ALLOW,
+                        new PolicyStatement({
+                            effect: Effect.ALLOW,
                             actions: [
                                 "ec2:GetIpamPoolAllocations",
                                 "ec2:ReleaseIpamPoolAllocation"
@@ -178,6 +163,8 @@ class IpamPool extends constructs_1.Construct {
                             resources: ["*"]
                         })
                     ],
+                    // Inline because CDK CustomResource requires a string for inlineCode —
+                    // extracting to a separate file would require switching to NodejsFunction + Provider
                     inlineCode: `
 const { EC2Client, GetIpamPoolAllocationsCommand, ReleaseIpamPoolAllocationCommand } = require('@aws-sdk/client-ec2');
 
@@ -202,7 +189,13 @@ exports.handler = async (event) => {
           Cidr: alloc.Cidr,
           IpamPoolAllocationId: alloc.IpamPoolAllocationId
         }));
-      } catch (e) { console.log('Release failed (may already be released):', e.message); }
+      } catch (e) {
+          if (e && typeof e === 'object' && (e.name === 'InvalidParameterValue' || (e.message && e.message.includes('already been released')))) {
+            // Already released — safe to skip
+          } else {
+            throw e;
+          }
+        }
     }
     nextToken = res.NextToken;
   } while (nextToken);
@@ -211,7 +204,7 @@ exports.handler = async (event) => {
                 });
                 allocationCleanup.node.addDependency(cidrAllocation);
                 // Share the pool with the target account so that VPCs can allocate
-                const share = new resourceShare_1.ResourceShare(this, `${account}IpamResourceShare${regionSuffix}`, {
+                const share = new ResourceShare(this, `${account}IpamResourceShare${regionSuffix}`, {
                     name: `${account}IpamResourceShare.${region}`,
                     allowExternalPrincipals: false,
                     principals: [accountId],
@@ -226,12 +219,12 @@ exports.handler = async (event) => {
                 // Delete order: share → cleanup (releases VPC allocations) → cidrAllocation → pool
                 share.node.addDependency(allocationCleanup.resource);
                 // Expose the pool ID for cross-stack usage (e.g. VPC allocations)
-                new aws_cdk_lib_1.CfnOutput(this, `IpamPoolId${accountId}${regionSuffix}`, {
+                new CfnOutput(this, `IpamPoolId${accountId}${regionSuffix}`, {
                     key: `IpamPoolId${accountId}${regionSuffix}`,
                     value: ipamPool.attrIpamPoolId,
                     exportName: `IpamPoolId${accountId}${regionSuffix}`
                 });
-                new aws_cdk_lib_1.CfnOutput(this, `IpamPoolArn${accountId}${regionSuffix}`, {
+                new CfnOutput(this, `IpamPoolArn${accountId}${regionSuffix}`, {
                     key: `IpamPoolArn${accountId}${regionSuffix}`,
                     value: ipamPool.attrArn,
                     exportName: `IpamPoolArn${accountId}${regionSuffix}`
@@ -242,8 +235,7 @@ exports.handler = async (event) => {
         }
     }
 }
-exports.IpamPool = IpamPool;
-class IpamPoolStack extends aws_cdk_lib_1.Stack {
+export class IpamPoolStack extends Stack {
     constructor(scope, id, props) {
         super(scope, id);
         new IpamPool(this, "IpamPool", {
@@ -252,5 +244,3 @@ class IpamPoolStack extends aws_cdk_lib_1.Stack {
         });
     }
 }
-exports.IpamPoolStack = IpamPoolStack;
-//# 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 { CfnOutput, Duration, Fn, type 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 { Runtime } from \"aws-cdk-lib/aws-lambda\";\nimport { Effect, PolicyStatement } from \"aws-cdk-lib/aws-iam\";\nimport { ResourceShare } from \"../utilities/resourceShare\";\nimport { CustomResource } from \"../utilities/customResource\";\nimport getAccountId from \"../../../utils/getAccountId\";\nimport { FjallLogger } from \"../../../utils/validationLogger\";\n\n// IPAM enforces a low concurrent-mutation limit (not publicly documented).\n// Account pools are serialised WITHIN each region (they mutate the same regional\n// pool parent). Across regions, account pools run in parallel because they mutate\n// DIFFERENT regional pool parents — this keeps effective concurrency at 2 (one\n// per region), well within observed AWS limits (~2-3).\nconst IPAM_POOL_BATCH_SIZE = 1;\n\nconst IPAM_TAGS = {\n  OPERATIONS_POOL: \"fjall:operations:pool\",\n  COST_ALLOCATION_ENVIRONMENT: \"fjall:costAllocation:environment\",\n  COST_ALLOCATION_ACCOUNT_NAME: \"fjall:costAllocation:accountName\"\n} as const;\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      FjallLogger.warn(\n        `'allocationDefaultNetmaskLength' (/${defaultNetmaskLength}) is larger than 'provisionedNetmaskLength' (/${provisionedNetmaskLength}). ` +\n          `VPC allocation may fail if the pool cannot satisfy the request.`\n      );\n    }\n\n    // Top Level Pool\n    const rootPool = new IpamPoolClass(this, \"TopLevelIpamPool\", {\n      description: `Root IPAM pool (Global)`,\n      addressFamily: \"ipv4\",\n      ipamScopeId: IpamPrivateDefaultScopeId,\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: IPAM_TAGS.OPERATIONS_POOL,\n          value: \"top-level\"\n        },\n        {\n          key: IPAM_TAGS.COST_ALLOCATION_ENVIRONMENT,\n          value: \"management\"\n        }\n      ]\n    });\n\n    // Create regional pools as children of the root pool.\n    // Serialised to avoid EC2 IPAM \"too many concurrent mutations\" errors —\n    // each regional pool + CIDR mutates the parent root pool resource, and\n    // IPAM rejects parallel mutations on the same parent.\n    let previousRegionalCidr: CfnIPAMPoolCidr | undefined;\n\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(\n        this,\n        `RegionalPool${regionSuffix}`,\n        {\n          description: `Regional IPAM pool - ${region}`,\n          addressFamily: \"ipv4\",\n          ipamScopeId: IpamPrivateDefaultScopeId,\n          locale: region,\n          sourceIpamPoolId: rootPool.attrIpamPoolId,\n          autoImport: true,\n          tags: [\n            {\n              key: IPAM_TAGS.OPERATIONS_POOL,\n              value: `regional-${region}`\n            },\n            {\n              key: IPAM_TAGS.COST_ALLOCATION_ENVIRONMENT,\n              value: \"management\"\n            }\n          ]\n        }\n      );\n\n      // Chain: each regional pool waits for the previous region's CIDR to complete.\n      // This serialises regional pool creation, preventing concurrent mutations\n      // on the root pool resource.\n      if (previousRegionalCidr) {\n        regionalPool.addDependency(previousRegionalCidr);\n      }\n\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      previousRegionalCidr = regionalCidrAllocation;\n\n      // Serialised account pool creation within each region.\n      // Account pools within a region all mutate the same regional pool parent,\n      // so they must be serialised. Account pools in DIFFERENT regions mutate\n      // different regional pool parents, so they can safely run in parallel.\n      //\n      // Uses CfnResource.addDependency() (not node.addDependency) for\n      // guaranteed CloudFormation DependsOn generation between L1 constructs.\n      let previousWaveAnchorCidr: CfnIPAMPoolCidr | undefined;\n\n      for (let i = 0; i < organisationAccounts.length; i++) {\n        const account = organisationAccounts[i];\n        const accountId = getAccountId(account);\n\n        const ipamPool = new IpamPoolClass(\n          this,\n          `${account}IpamPool${regionSuffix}`,\n          {\n            description: `${account} - IPAM pool - ${region}`,\n            addressFamily: \"ipv4\",\n            ipamScopeId: IpamPrivateDefaultScopeId,\n            locale: region,\n            sourceIpamPoolId: regionalPool.attrIpamPoolId,\n            allocationDefaultNetmaskLength: defaultNetmaskLength,\n            allocationResourceTags: [\n              {\n                key: IPAM_TAGS.OPERATIONS_POOL,\n                value: `${accountId}-${region}`\n              }\n            ],\n            autoImport: true,\n            tags: [\n              {\n                key: IPAM_TAGS.OPERATIONS_POOL,\n                value: `${accountId}-${region}`\n              },\n              {\n                key: IPAM_TAGS.COST_ALLOCATION_ACCOUNT_NAME,\n                value: account\n              }\n            ]\n          }\n        );\n\n        // Ensure the account pool is created after the regional CIDR allocation\n        ipamPool.addDependency(regionalCidrAllocation);\n\n        // Wave boundary: pools in wave N+1 depend on the last CIDR from wave N\n        if (previousWaveAnchorCidr) {\n          ipamPool.addDependency(previousWaveAnchorCidr);\n        }\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        // The last pool in each wave anchors the next wave's dependency\n        const isLastInWave =\n          (i + 1) % IPAM_POOL_BATCH_SIZE === 0 ||\n          i === organisationAccounts.length - 1;\n\n        if (isLastInWave) {\n          previousWaveAnchorCidr = cidrAllocation;\n        }\n\n        // On stack deletion, VPC allocations (not managed by CloudFormation)\n        // block CIDR deprovisioning. This custom resource releases them first.\n        const allocationCleanup = new CustomResource(\n          this,\n          `${account}IpamCleanup${regionSuffix}`,\n          {\n            runtime: Runtime.NODEJS_22_X,\n            timeout: Duration.minutes(5),\n            lambdaDescription: `${account} IPAM pool allocation cleanup - ${region}`,\n            properties: {\n              IpamPoolId: ipamPool.attrIpamPoolId,\n              PoolRegion: region\n            },\n            inlinePolicy: [\n              new PolicyStatement({\n                effect: Effect.ALLOW,\n                actions: [\n                  \"ec2:GetIpamPoolAllocations\",\n                  \"ec2:ReleaseIpamPoolAllocation\"\n                ],\n                resources: [\"*\"]\n              })\n            ],\n            inlineCode: `\nconst { EC2Client, GetIpamPoolAllocationsCommand, ReleaseIpamPoolAllocationCommand } = require('@aws-sdk/client-ec2');\n\nexports.handler = async (event) => {\n  const physicalResourceId = event.PhysicalResourceId || event.LogicalResourceId || 'ipam-pool-cleanup';\n  if (event.RequestType !== 'Delete') {\n    return { PhysicalResourceId: physicalResourceId };\n  }\n  const poolId = event.ResourceProperties.IpamPoolId;\n  const poolRegion = event.ResourceProperties.PoolRegion;\n  const ec2 = new EC2Client({ region: poolRegion });\n  let nextToken;\n  do {\n    const res = await ec2.send(new GetIpamPoolAllocationsCommand({\n      IpamPoolId: poolId, ...(nextToken && { NextToken: nextToken })\n    }));\n    for (const alloc of (res.IpamPoolAllocations || [])) {\n      if (alloc.ResourceType === 'ipam-pool') continue;\n      try {\n        await ec2.send(new ReleaseIpamPoolAllocationCommand({\n          IpamPoolId: poolId,\n          Cidr: alloc.Cidr,\n          IpamPoolAllocationId: alloc.IpamPoolAllocationId\n        }));\n      } catch (e) { console.log('Release failed (may already be released):', e.message); }\n    }\n    nextToken = res.NextToken;\n  } while (nextToken);\n  return { PhysicalResourceId: physicalResourceId };\n};`\n          }\n        );\n        allocationCleanup.node.addDependency(cidrAllocation);\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: IPAM_TAGS.COST_ALLOCATION_ENVIRONMENT,\n                value: \"management\"\n              }\n            ]\n          }\n        );\n\n        // Delete order: share → cleanup (releases VPC allocations) → cidrAllocation → pool\n        share.node.addDependency(allocationCleanup.resource);\n\n        // Expose the pool ID for cross-stack usage (e.g. VPC allocations)\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      // No cross-region chaining needed: account pools in different regions\n      // mutate different parent resources and can safely run in parallel.\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/dist/lib/resources/aws/networking/securityGroup.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SecurityGroup = void 0;
-const ec2 = require("aws-cdk-lib/aws-ec2");
-class SecurityGroup extends ec2.SecurityGroup {
+import * as ec2 from "aws-cdk-lib/aws-ec2";
+export class SecurityGroup extends ec2.SecurityGroup {
     constructor(scope, id, props) {
         super(scope, id, {
             ...props,
@@ -10,5 +7,3 @@ class SecurityGroup extends ec2.SecurityGroup {
         });
     }
 }
-exports.SecurityGroup = SecurityGroup;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjdXJpdHlHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYi9yZXNvdXJjZXMvYXdzL25ldHdvcmtpbmcvc2VjdXJpdHlHcm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBMkM7QUFHM0MsTUFBYSxhQUFjLFNBQVEsR0FBRyxDQUFDLGFBQWE7SUFDbEQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUE2QjtRQUNyRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLEdBQUcsS0FBSztZQUNSLFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVyxJQUFJLEdBQUcsRUFBRSxpQkFBaUI7U0FDekQsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBUEQsc0NBT0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBlYzIgZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcbmltcG9ydCB7IHR5cGUgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuZXhwb3J0IGNsYXNzIFNlY3VyaXR5R3JvdXAgZXh0ZW5kcyBlYzIuU2VjdXJpdHlHcm91cCB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBlYzIuU2VjdXJpdHlHcm91cFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICAuLi5wcm9wcyxcbiAgICAgIGRlc2NyaXB0aW9uOiBwcm9wcy5kZXNjcmlwdGlvbiB8fCBgJHtpZH0gU2VjdXJpdHkgR3JvdXBgXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==

package/dist/lib/resources/aws/networking/vpc.d.ts

@@ -1,6 +1,6 @@
 import { type Construct } from "constructs";
 import * as ec2 from "aws-cdk-lib/aws-ec2";
-import { type StackBuilder } from "../base/awsStack";
+import { type StackBuilder } from "../base/awsStack.js";
 export interface VpcFlowLogConfig {
     destination?: "cloudwatch" | "s3";
     retentionDays?: number;

package/dist/lib/resources/aws/networking/vpc.js

@@ -1,12 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Vpc = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const ec2 = require("aws-cdk-lib/aws-ec2");
-const s3 = require("aws-cdk-lib/aws-s3");
-const logGroup_1 = require("../logging/logGroup");
-const storage_1 = require("../storage");
-class Vpc extends ec2.Vpc {
+import { Duration, RemovalPolicy, Stack } from "aws-cdk-lib";
+import * as ec2 from "aws-cdk-lib/aws-ec2";
+import * as s3 from "aws-cdk-lib/aws-s3";
+import { LogGroup } from "../logging/logGroup.js";
+import { S3Bucket } from "../storage/index.js";
+export class Vpc extends ec2.Vpc {
+    gatewayEndpoints = [];
+    interfaceEndpoints = [];
+    hasNatGateways;
     constructor(scope, id, props) {
         const { maxAzs: maxAzsFromProps, vpcName: explicitName, ...restProps } = props ?? {};
         const maxAzs = maxAzsFromProps ?? 3;
@@ -21,8 +21,6 @@ class Vpc extends ec2.Vpc {
             ipAddresses: Vpc.ipAddresses(scope, id, props),
             gatewayEndpoints: Vpc.gatewayEndpoints(props)
         });
-        this.gatewayEndpoints = [];
-        this.interfaceEndpoints = [];
         this.hasNatGateways = natGateways !== 0;
         this.addInterfaceEndpoints(id, props, this.hasNatGateways);
     }
@@ -143,7 +141,7 @@ class Vpc extends ec2.Vpc {
         return natConfig.count ?? 1;
     }
     static availabilityZones(scope, maxAzs = 3) {
-        return aws_cdk_lib_1.Stack.of(scope).availabilityZones.slice(0, maxAzs);
+        return Stack.of(scope).availabilityZones.slice(0, maxAzs);
     }
     static flowLogs(scope, id, props) {
         if (props?.flowLogConfig === false) {
@@ -155,9 +153,9 @@ class Vpc extends ec2.Vpc {
             }
             return {
                 [`${id}VpcFlowLogs`]: {
-                    destination: ec2.FlowLogDestination.toCloudWatchLogs(new logGroup_1.LogGroup(scope, `${id}FlowLogGroup`, {
+                    destination: ec2.FlowLogDestination.toCloudWatchLogs(new LogGroup(scope, `${id}FlowLogGroup`, {
                         logGroupName: `/vpc/flowlogs/vpc-${id}/`,
-                        removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY
+                        removalPolicy: RemovalPolicy.DESTROY
                     }))
                 }
             };
@@ -165,11 +163,11 @@ class Vpc extends ec2.Vpc {
         const config = props.flowLogConfig;
         const trafficType = Vpc.resolveTrafficType(config.trafficType);
         if (config.destination === "s3") {
-            const bucket = new storage_1.S3Bucket(scope, `${id}FlowLogBucket`, {
-                bucketName: `vpc-flowlogs-${id.toLowerCase()}-${aws_cdk_lib_1.Stack.of(scope).account}`,
+            const bucket = new S3Bucket(scope, `${id}FlowLogBucket`, {
+                bucketName: `vpc-flowlogs-${id.toLowerCase()}-${Stack.of(scope).account}`,
                 encryption: s3.BucketEncryption.S3_MANAGED,
                 lifecycleRules: config.retentionDays
-                    ? [{ expiration: aws_cdk_lib_1.Duration.days(config.retentionDays), enabled: true }]
+                    ? [{ expiration: Duration.days(config.retentionDays), enabled: true }]
                     : undefined
             });
             return {
@@ -182,9 +180,9 @@ class Vpc extends ec2.Vpc {
         const retentionDays = config.retentionDays ?? 14;
         return {
             [`${id}VpcFlowLogs`]: {
-                destination: ec2.FlowLogDestination.toCloudWatchLogs(new logGroup_1.LogGroup(scope, `${id}FlowLogGroup`, {
+                destination: ec2.FlowLogDestination.toCloudWatchLogs(new LogGroup(scope, `${id}FlowLogGroup`, {
                     logGroupName: `/vpc/flowlogs/vpc-${id}/`,
-                    removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
+                    removalPolicy: RemovalPolicy.DESTROY,
                     retention: Vpc.daysToRetention(retentionDays)
                 })),
                 trafficType
@@ -234,5 +232,3 @@ class Vpc extends ec2.Vpc {
         };
     }
 }
-exports.Vpc = Vpc;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vpc.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/networking/vpc.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Construct } from \"constructs\";\nimport { Duration, RemovalPolicy, Stack } from \"aws-cdk-lib\";\nimport * as ec2 from \"aws-cdk-lib/aws-ec2\";\nimport * as s3 from \"aws-cdk-lib/aws-s3\";\nimport { type StackBuilder } from \"../base/awsStack\";\nimport { LogGroup } from \"../logging/logGroup\";\nimport { S3Bucket } from \"../storage\";\n\nexport interface VpcFlowLogConfig {\n  destination?: \"cloudwatch\" | \"s3\";\n  retentionDays?: number;\n  trafficType?: \"ALL\" | \"ACCEPT\" | \"REJECT\";\n}\n\nexport interface VpcNatConfig {\n  count?: number;\n}\n\ninterface GatewayEndpoints {\n  s3?: boolean;\n  dynamodb?: boolean;\n}\n\ninterface InterfaceEndpoints {\n  ecr?: boolean;\n  secretsManager?: boolean;\n  kms?: boolean;\n  cloudwatchLogs?: boolean;\n  ssm?: boolean;\n  sts?: boolean;\n}\n\ninterface EndpointsConfig {\n  gateway?: GatewayEndpoints | false;\n  interface?: InterfaceEndpoints | false;\n}\n\nexport interface VpcProps extends ec2.VpcProps {\n  region?: string;\n  accountId?: string;\n  availabilityZones?: string[];\n  ipv4IpamPoolId?: string;\n  maxAzs?: number;\n  natGatewayConfig?: VpcNatConfig | false;\n  flowLogConfig?: VpcFlowLogConfig | false;\n  endpointsConfig?: EndpointsConfig | false;\n  vpcCidrMask?: number;\n  subnetCidrMask?: number;\n  vpcName?: string;\n}\n\nexport class Vpc extends ec2.Vpc {\n  public readonly gatewayEndpoints: ec2.GatewayVpcEndpoint[] = [];\n  public readonly interfaceEndpoints: ec2.InterfaceVpcEndpoint[] = [];\n  public readonly hasNatGateways: boolean;\n\n  constructor(scope: Construct, id: string, props?: VpcProps) {\n    const {\n      maxAzs: maxAzsFromProps,\n      vpcName: explicitName,\n      ...restProps\n    } = props ?? {};\n    const maxAzs = maxAzsFromProps ?? 3;\n    const natGateways = Vpc.resolveNatGateways(props);\n    const vpcName = explicitName ?? id;\n\n    super(scope, `vpc-${id}`, {\n      ...restProps,\n      vpcName,\n      natGateways,\n      availabilityZones: Vpc.availabilityZones(scope, maxAzs),\n      flowLogs: Vpc.flowLogs(scope, id, props),\n      ipAddresses: Vpc.ipAddresses(scope, id, props),\n      gatewayEndpoints: Vpc.gatewayEndpoints(props)\n    });\n\n    this.hasNatGateways = natGateways !== 0;\n    this.addInterfaceEndpoints(id, props, this.hasNatGateways);\n  }\n\n  private static gatewayEndpoints(\n    props?: VpcProps\n  ): Record<string, ec2.GatewayVpcEndpointOptions> | undefined {\n    if (props?.endpointsConfig === false) {\n      return undefined;\n    }\n\n    const gatewayConfig = props?.endpointsConfig?.gateway;\n    if (gatewayConfig === false) {\n      return undefined;\n    }\n\n    const enableS3 = gatewayConfig?.s3 ?? true;\n    const enableDynamodb = gatewayConfig?.dynamodb ?? true;\n\n    if (!enableS3 && !enableDynamodb) {\n      return undefined;\n    }\n\n    const endpoints: Record<string, ec2.GatewayVpcEndpointOptions> = {};\n\n    if (enableS3) {\n      endpoints.S3 = { service: ec2.GatewayVpcEndpointAwsService.S3 };\n    }\n    if (enableDynamodb) {\n      endpoints.DynamoDB = {\n        service: ec2.GatewayVpcEndpointAwsService.DYNAMODB\n      };\n    }\n\n    return endpoints;\n  }\n\n  private addInterfaceEndpoints(\n    id: string,\n    props: VpcProps | undefined,\n    hasNatGateways: boolean\n  ) {\n    if (props?.endpointsConfig === false) {\n      return;\n    }\n\n    const interfaceConfig = props?.endpointsConfig?.interface;\n    if (interfaceConfig === false || interfaceConfig === undefined) {\n      return;\n    }\n\n    // VPC endpoints must be in the same subnet type as the resources using them:\n    // - With NAT: PRIVATE_WITH_EGRESS (Lambda uses these when NAT is available)\n    // - Without NAT: PRIVATE_ISOLATED (Lambda falls back to these when no NAT exists)\n    const subnetType = hasNatGateways\n      ? ec2.SubnetType.PRIVATE_WITH_EGRESS\n      : ec2.SubnetType.PRIVATE_ISOLATED;\n    const subnetSelection = { subnetType };\n\n    if (interfaceConfig.ecr) {\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}EcrDocker`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.ECR_DOCKER,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}EcrApi`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.ECR,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n    }\n\n    if (interfaceConfig.secretsManager) {\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}SecretsManager`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.SECRETS_MANAGER,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n    }\n\n    if (interfaceConfig.kms) {\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}Kms`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.KMS,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n    }\n\n    if (interfaceConfig.cloudwatchLogs) {\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}CloudWatchLogs`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.CLOUDWATCH_LOGS,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n    }\n\n    if (interfaceConfig.ssm) {\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}Ssm`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.SSM,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}SsmMessages`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.SSM_MESSAGES,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}Ec2Messages`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.EC2_MESSAGES,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n    }\n\n    if (interfaceConfig.sts) {\n      this.interfaceEndpoints.push(\n        new ec2.InterfaceVpcEndpoint(this, `${id}Sts`, {\n          vpc: this,\n          service: ec2.InterfaceVpcEndpointAwsService.STS,\n          privateDnsEnabled: true,\n          subnets: subnetSelection\n        })\n      );\n    }\n  }\n\n  static resolveNatGateways(props?: VpcProps): number | undefined {\n    const natConfig = props?.natGatewayConfig;\n\n    if (natConfig === undefined) {\n      return undefined;\n    }\n\n    if (natConfig === false) {\n      return 0;\n    }\n\n    return natConfig.count ?? 1;\n  }\n\n  static availabilityZones(scope: Construct, maxAzs = 3) {\n    return Stack.of(scope).availabilityZones.slice(0, maxAzs);\n  }\n\n  static flowLogs(\n    scope: Construct,\n    id: string,\n    props?: VpcProps\n  ): Record<string, ec2.FlowLogOptions> | undefined {\n    if (props?.flowLogConfig === false) {\n      return undefined;\n    }\n\n    if (props?.flowLogConfig === undefined) {\n      if (!props?.accountId) {\n        return undefined;\n      }\n      return {\n        [`${id}VpcFlowLogs`]: {\n          destination: ec2.FlowLogDestination.toCloudWatchLogs(\n            new LogGroup(scope, `${id}FlowLogGroup`, {\n              logGroupName: `/vpc/flowlogs/vpc-${id}/`,\n              removalPolicy: RemovalPolicy.DESTROY\n            })\n          )\n        }\n      };\n    }\n\n    const config = props.flowLogConfig;\n    const trafficType = Vpc.resolveTrafficType(config.trafficType);\n\n    if (config.destination === \"s3\") {\n      const bucket = new S3Bucket(scope, `${id}FlowLogBucket`, {\n        bucketName: `vpc-flowlogs-${id.toLowerCase()}-${Stack.of(scope).account}`,\n        encryption: s3.BucketEncryption.S3_MANAGED,\n        lifecycleRules: config.retentionDays\n          ? [{ expiration: Duration.days(config.retentionDays), enabled: true }]\n          : undefined\n      });\n\n      return {\n        [`${id}VpcFlowLogs`]: {\n          destination: ec2.FlowLogDestination.toS3(bucket),\n          trafficType\n        }\n      };\n    }\n\n    const retentionDays = config.retentionDays ?? 14;\n    return {\n      [`${id}VpcFlowLogs`]: {\n        destination: ec2.FlowLogDestination.toCloudWatchLogs(\n          new LogGroup(scope, `${id}FlowLogGroup`, {\n            logGroupName: `/vpc/flowlogs/vpc-${id}/`,\n            removalPolicy: RemovalPolicy.DESTROY,\n            retention: Vpc.daysToRetention(retentionDays)\n          })\n        ),\n        trafficType\n      }\n    };\n  }\n\n  private static daysToRetention(days: number): number {\n    const validRetentions = [\n      1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1096, 1827,\n      2192, 2557, 2922, 3288, 3653\n    ];\n    return validRetentions.find((r) => r >= days) ?? 3653;\n  }\n\n  private static resolveTrafficType(\n    trafficType?: \"ALL\" | \"ACCEPT\" | \"REJECT\"\n  ): ec2.FlowLogTrafficType {\n    switch (trafficType) {\n      case \"ACCEPT\":\n        return ec2.FlowLogTrafficType.ACCEPT;\n      case \"REJECT\":\n        return ec2.FlowLogTrafficType.REJECT;\n      case \"ALL\":\n      default:\n        return ec2.FlowLogTrafficType.ALL;\n    }\n  }\n\n  static ipAddresses(scope: Construct, id: string, props?: VpcProps) {\n    if (!props?.accountId || !props?.ipv4IpamPoolId) {\n      return undefined;\n    }\n\n    const vpcCidrMask = props.vpcCidrMask ?? 20;\n    const subnetCidrMask = props.subnetCidrMask ?? 23;\n\n    return ec2.IpAddresses.awsIpamAllocation({\n      ipv4IpamPoolId: props.ipv4IpamPoolId,\n      ipv4NetmaskLength: vpcCidrMask,\n      defaultSubnetIpv4NetmaskLength: subnetCidrMask\n    });\n  }\n\n  static build(id: string, props?: VpcProps): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      return new this(sb.getStack(), id, props);\n    };\n  }\n\n  static import(\n    id: string,\n    vpcStackName: string\n  ): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      return ec2.Vpc.fromLookup(sb.getStack(), id, {\n        vpcName: `${vpcStackName}/${id}`\n      });\n    };\n  }\n}\n"]}

package/dist/lib/resources/aws/organisation/costAllocationTagActivator.d.ts

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import { LambdaFunction } from "../compute/lambda";
+import { LambdaFunction } from "../compute/lambda.js";
 export interface CostAllocationTagActivatorProps {
     /** EventBridge schedule expression. Default: "rate(24 hours)" */
     scheduleExpression?: string;

package/dist/lib/resources/aws/organisation/costAllocationTagActivator.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CostAllocationTagActivator = void 0;
-const constructs_1 = require("constructs");
-const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
-const aws_iam_1 = require("aws-cdk-lib/aws-iam");
-const lambda_1 = require("../compute/lambda");
+import { Construct } from "constructs";
+import { Code, Runtime } from "aws-cdk-lib/aws-lambda";
+import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
+import { LambdaFunction } from "../compute/lambda.js";
 /**
  * Deploys a Lambda that auto-discovers and activates cost allocation tags.
  *
@@ -12,21 +9,22 @@ const lambda_1 = require("../compute/lambda");
  * (via app.addTags() or CDK aspects) is automatically activated in Cost
  * Explorer within 24 hours — no manual intervention required.
  */
-class CostAllocationTagActivator extends constructs_1.Construct {
+export class CostAllocationTagActivator extends Construct {
+    lambda;
     constructor(scope, id, props) {
         super(scope, id);
         const schedule = props?.scheduleExpression ?? "rate(24 hours)";
-        this.lambda = new lambda_1.LambdaFunction(this, "TagActivatorFunction", {
-            runtime: aws_lambda_1.Runtime.NODEJS_22_X,
+        this.lambda = new LambdaFunction(this, "TagActivatorFunction", {
+            runtime: Runtime.NODEJS_22_X,
             handler: "index.handler",
-            code: aws_lambda_1.Code.fromInline(HANDLER_CODE),
+            code: Code.fromInline(HANDLER_CODE),
             lambdaDescription: "Auto-discovers and activates cost allocation tags in Cost Explorer",
             memorySize: 128,
             timeout: 60,
             scheduleExpression: schedule,
             inlinePolicy: [
-                new aws_iam_1.PolicyStatement({
-                    effect: aws_iam_1.Effect.ALLOW,
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
                     actions: [
                         "ce:ListCostAllocationTags",
                         "ce:UpdateCostAllocationTagsStatus"
@@ -37,7 +35,6 @@ class CostAllocationTagActivator extends constructs_1.Construct {
         });
     }
 }
-exports.CostAllocationTagActivator = CostAllocationTagActivator;
 const HANDLER_CODE = `
 const { CostExplorerClient, ListCostAllocationTagsCommand, UpdateCostAllocationTagsStatusCommand } = require("@aws-sdk/client-cost-explorer");
 
@@ -63,4 +60,3 @@ exports.handler = async () => {
   return { activated: inactive.length, tags: inactive.map((t) => t.TagKey) };
 };
 `.trim();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29zdEFsbG9jYXRpb25UYWdBY3RpdmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9vcmdhbmlzYXRpb24vY29zdEFsbG9jYXRpb25UYWdBY3RpdmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBQ3ZDLHVEQUF1RDtBQUN2RCxpREFBOEQ7QUFFOUQsOENBQW1EO0FBT25EOzs7Ozs7R0FNRztBQUNILE1BQWEsMEJBQTJCLFNBQVEsc0JBQVM7SUFHdkQsWUFDRSxLQUFnQixFQUNoQixFQUFVLEVBQ1YsS0FBdUM7UUFFdkMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsa0JBQWtCLElBQUksZ0JBQWdCLENBQUM7UUFFL0QsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLHVCQUFjLENBQUMsSUFBSSxFQUFFLHNCQUFzQixFQUFFO1lBQzdELE9BQU8sRUFBRSxvQkFBTyxDQUFDLFdBQVc7WUFDNUIsT0FBTyxFQUFFLGVBQWU7WUFDeEIsSUFBSSxFQUFFLGlCQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQztZQUNuQyxpQkFBaUIsRUFDZixvRUFBb0U7WUFDdEUsVUFBVSxFQUFFLEdBQUc7WUFDZixPQUFPLEVBQUUsRUFBRTtZQUNYLGtCQUFrQixFQUFFLFFBQVE7WUFDNUIsWUFBWSxFQUFFO2dCQUNaLElBQUkseUJBQWUsQ0FBQztvQkFDbEIsTUFBTSxFQUFFLGdCQUFNLENBQUMsS0FBSztvQkFDcEIsT0FBTyxFQUFFO3dCQUNQLDJCQUEyQjt3QkFDM0IsbUNBQW1DO3FCQUNwQztvQkFDRCxTQUFTLEVBQUUsQ0FBQyxHQUFHLENBQUM7aUJBQ2pCLENBQUM7YUFDSDtTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQWpDRCxnRUFpQ0M7QUFFRCxNQUFNLFlBQVksR0FBRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBd0JwQixDQUFDLElBQUksRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IENvZGUsIFJ1bnRpbWUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWxhbWJkYVwiO1xuaW1wb3J0IHsgUG9saWN5U3RhdGVtZW50LCBFZmZlY3QgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWlhbVwiO1xuXG5pbXBvcnQgeyBMYW1iZGFGdW5jdGlvbiB9IGZyb20gXCIuLi9jb21wdXRlL2xhbWJkYVwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIENvc3RBbGxvY2F0aW9uVGFnQWN0aXZhdG9yUHJvcHMge1xuICAvKiogRXZlbnRCcmlkZ2Ugc2NoZWR1bGUgZXhwcmVzc2lvbi4gRGVmYXVsdDogXCJyYXRlKDI0IGhvdXJzKVwiICovXG4gIHNjaGVkdWxlRXhwcmVzc2lvbj86IHN0cmluZztcbn1cblxuLyoqXG4gKiBEZXBsb3lzIGEgTGFtYmRhIHRoYXQgYXV0by1kaXNjb3ZlcnMgYW5kIGFjdGl2YXRlcyBjb3N0IGFsbG9jYXRpb24gdGFncy5cbiAqXG4gKiBSdW5zIGRhaWx5IGluIHRoZSBtYW5hZ2VtZW50IGFjY291bnQuIEFueSBub24tQVdTIHRhZyBhcHBsaWVkIHRvIHJlc291cmNlc1xuICogKHZpYSBhcHAuYWRkVGFncygpIG9yIENESyBhc3BlY3RzKSBpcyBhdXRvbWF0aWNhbGx5IGFjdGl2YXRlZCBpbiBDb3N0XG4gKiBFeHBsb3JlciB3aXRoaW4gMjQgaG91cnMg4oCUIG5vIG1hbnVhbCBpbnRlcnZlbnRpb24gcmVxdWlyZWQuXG4gKi9cbmV4cG9ydCBjbGFzcyBDb3N0QWxsb2NhdGlvblRhZ0FjdGl2YXRvciBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyByZWFkb25seSBsYW1iZGE6IExhbWJkYUZ1bmN0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHNjb3BlOiBDb25zdHJ1Y3QsXG4gICAgaWQ6IHN0cmluZyxcbiAgICBwcm9wcz86IENvc3RBbGxvY2F0aW9uVGFnQWN0aXZhdG9yUHJvcHNcbiAgKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIGNvbnN0IHNjaGVkdWxlID0gcHJvcHM/LnNjaGVkdWxlRXhwcmVzc2lvbiA/PyBcInJhdGUoMjQgaG91cnMpXCI7XG5cbiAgICB0aGlzLmxhbWJkYSA9IG5ldyBMYW1iZGFGdW5jdGlvbih0aGlzLCBcIlRhZ0FjdGl2YXRvckZ1bmN0aW9uXCIsIHtcbiAgICAgIHJ1bnRpbWU6IFJ1bnRpbWUuTk9ERUpTXzIyX1gsXG4gICAgICBoYW5kbGVyOiBcImluZGV4LmhhbmRsZXJcIixcbiAgICAgIGNvZGU6IENvZGUuZnJvbUlubGluZShIQU5ETEVSX0NPREUpLFxuICAgICAgbGFtYmRhRGVzY3JpcHRpb246XG4gICAgICAgIFwiQXV0by1kaXNjb3ZlcnMgYW5kIGFjdGl2YXRlcyBjb3N0IGFsbG9jYXRpb24gdGFncyBpbiBDb3N0IEV4cGxvcmVyXCIsXG4gICAgICBtZW1vcnlTaXplOiAxMjgsXG4gICAgICB0aW1lb3V0OiA2MCxcbiAgICAgIHNjaGVkdWxlRXhwcmVzc2lvbjogc2NoZWR1bGUsXG4gICAgICBpbmxpbmVQb2xpY3k6IFtcbiAgICAgICAgbmV3IFBvbGljeVN0YXRlbWVudCh7XG4gICAgICAgICAgZWZmZWN0OiBFZmZlY3QuQUxMT1csXG4gICAgICAgICAgYWN0aW9uczogW1xuICAgICAgICAgICAgXCJjZTpMaXN0Q29zdEFsbG9jYXRpb25UYWdzXCIsXG4gICAgICAgICAgICBcImNlOlVwZGF0ZUNvc3RBbGxvY2F0aW9uVGFnc1N0YXR1c1wiXG4gICAgICAgICAgXSxcbiAgICAgICAgICByZXNvdXJjZXM6IFtcIipcIl1cbiAgICAgICAgfSlcbiAgICAgIF1cbiAgICB9KTtcbiAgfVxufVxuXG5jb25zdCBIQU5ETEVSX0NPREUgPSBgXG5jb25zdCB7IENvc3RFeHBsb3JlckNsaWVudCwgTGlzdENvc3RBbGxvY2F0aW9uVGFnc0NvbW1hbmQsIFVwZGF0ZUNvc3RBbGxvY2F0aW9uVGFnc1N0YXR1c0NvbW1hbmQgfSA9IHJlcXVpcmUoXCJAYXdzLXNkay9jbGllbnQtY29zdC1leHBsb3JlclwiKTtcblxuZXhwb3J0cy5oYW5kbGVyID0gYXN5bmMgKCkgPT4ge1xuICBjb25zdCBjbGllbnQgPSBuZXcgQ29zdEV4cGxvcmVyQ2xpZW50KHt9KTtcbiAgY29uc3QgeyBDb3N0QWxsb2NhdGlvblRhZ3MgPSBbXSB9ID0gYXdhaXQgY2xpZW50LnNlbmQobmV3IExpc3RDb3N0QWxsb2NhdGlvblRhZ3NDb21tYW5kKHsgTWF4UmVzdWx0czogMTAwMCB9KSk7XG5cbiAgY29uc3QgaW5hY3RpdmUgPSBDb3N0QWxsb2NhdGlvblRhZ3MuZmlsdGVyKFxuICAgICh0KSA9PiB0LlRhZ0tleSAmJiB0LlN0YXR1cyA9PT0gXCJJbmFjdGl2ZVwiICYmICF0LlRhZ0tleS5zdGFydHNXaXRoKFwiYXdzOlwiKVxuICApO1xuXG4gIGlmIChpbmFjdGl2ZS5sZW5ndGggPT09IDApIHJldHVybiB7IGFjdGl2YXRlZDogMCB9O1xuXG4gIC8vIEFQSSBsaW1pdDogbWF4IDIwIHRhZ3MgcGVyIFVwZGF0ZUNvc3RBbGxvY2F0aW9uVGFnc1N0YXR1cyBjYWxsXG4gIGNvbnN0IEJBVENIX1NJWkUgPSAyMDtcbiAgZm9yIChsZXQgaSA9IDA7IGkgPCBpbmFjdGl2ZS5sZW5ndGg7IGkgKz0gQkFUQ0hfU0laRSkge1xuICAgIGNvbnN0IGJhdGNoID0gaW5hY3RpdmUuc2xpY2UoaSwgaSArIEJBVENIX1NJWkUpO1xuICAgIGF3YWl0IGNsaWVudC5zZW5kKG5ldyBVcGRhdGVDb3N0QWxsb2NhdGlvblRhZ3NTdGF0dXNDb21tYW5kKHtcbiAgICAgIENvc3RBbGxvY2F0aW9uVGFnc1N0YXR1czogYmF0Y2gubWFwKCh0KSA9PiAoeyBUYWdLZXk6IHQuVGFnS2V5LCBTdGF0dXM6IFwiQWN0aXZlXCIgfSkpXG4gICAgfSkpO1xuICB9XG5cbiAgcmV0dXJuIHsgYWN0aXZhdGVkOiBpbmFjdGl2ZS5sZW5ndGgsIHRhZ3M6IGluYWN0aXZlLm1hcCgodCkgPT4gdC5UYWdLZXkpIH07XG59O1xuYC50cmltKCk7XG4iXX0=

package/dist/lib/resources/aws/organisation/index.d.ts

@@ -1,5 +1,5 @@
-export { Organisation as OrganisationResource, type OrganisationProps as OrganisationResourceProps } from "./organisation";
-export { type OrganisationalUnitProps } from "./organisationalUnit";
-export { OrganisationAccount, type OrganisationAccountProps } from "./organisationAccount";
-export { OrganisationPolicy, type OrganisationPolicyProps, type OrganisationPolicyType } from "./organisationPolicy";
-export { CostAllocationTagActivator, type CostAllocationTagActivatorProps } from "./costAllocationTagActivator";
+export { Organisation as OrganisationResource, type OrganisationProps as OrganisationResourceProps } from "./organisation.js";
+export { type OrganisationalUnitProps } from "./organisationalUnit.js";
+export { OrganisationAccount, type OrganisationAccountProps } from "./organisationAccount.js";
+export { OrganisationPolicy, type OrganisationPolicyProps, type OrganisationPolicyType } from "./organisationPolicy.js";
+export { CostAllocationTagActivator, type CostAllocationTagActivatorProps } from "./costAllocationTagActivator.js";

package/dist/lib/resources/aws/organisation/index.js

@@ -1,12 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CostAllocationTagActivator = exports.OrganisationPolicy = exports.OrganisationAccount = exports.OrganisationResource = void 0;
-var organisation_1 = require("./organisation");
-Object.defineProperty(exports, "OrganisationResource", { enumerable: true, get: function () { return organisation_1.Organisation; } });
-var organisationAccount_1 = require("./organisationAccount");
-Object.defineProperty(exports, "OrganisationAccount", { enumerable: true, get: function () { return organisationAccount_1.OrganisationAccount; } });
-var organisationPolicy_1 = require("./organisationPolicy");
-Object.defineProperty(exports, "OrganisationPolicy", { enumerable: true, get: function () { return organisationPolicy_1.OrganisationPolicy; } });
-var costAllocationTagActivator_1 = require("./costAllocationTagActivator");
-Object.defineProperty(exports, "CostAllocationTagActivator", { enumerable: true, get: function () { return costAllocationTagActivator_1.CostAllocationTagActivator; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9vcmdhbmlzYXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0NBR3dCO0FBRnRCLG9IQUFBLFlBQVksT0FBd0I7QUFJdEMsNkRBRytCO0FBRjdCLDBIQUFBLG1CQUFtQixPQUFBO0FBR3JCLDJEQUk4QjtBQUg1Qix3SEFBQSxrQkFBa0IsT0FBQTtBQUlwQiwyRUFHc0M7QUFGcEMsd0lBQUEsMEJBQTBCLE9BQUEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQge1xuICBPcmdhbmlzYXRpb24gYXMgT3JnYW5pc2F0aW9uUmVzb3VyY2UsXG4gIHR5cGUgT3JnYW5pc2F0aW9uUHJvcHMgYXMgT3JnYW5pc2F0aW9uUmVzb3VyY2VQcm9wc1xufSBmcm9tIFwiLi9vcmdhbmlzYXRpb25cIjtcbmV4cG9ydCB7IHR5cGUgT3JnYW5pc2F0aW9uYWxVbml0UHJvcHMgfSBmcm9tIFwiLi9vcmdhbmlzYXRpb25hbFVuaXRcIjtcbmV4cG9ydCB7XG4gIE9yZ2FuaXNhdGlvbkFjY291bnQsXG4gIHR5cGUgT3JnYW5pc2F0aW9uQWNjb3VudFByb3BzXG59IGZyb20gXCIuL29yZ2FuaXNhdGlvbkFjY291bnRcIjtcbmV4cG9ydCB7XG4gIE9yZ2FuaXNhdGlvblBvbGljeSxcbiAgdHlwZSBPcmdhbmlzYXRpb25Qb2xpY3lQcm9wcyxcbiAgdHlwZSBPcmdhbmlzYXRpb25Qb2xpY3lUeXBlXG59IGZyb20gXCIuL29yZ2FuaXNhdGlvblBvbGljeVwiO1xuZXhwb3J0IHtcbiAgQ29zdEFsbG9jYXRpb25UYWdBY3RpdmF0b3IsXG4gIHR5cGUgQ29zdEFsbG9jYXRpb25UYWdBY3RpdmF0b3JQcm9wc1xufSBmcm9tIFwiLi9jb3N0QWxsb2NhdGlvblRhZ0FjdGl2YXRvclwiO1xuIl19
+export { Organisation as OrganisationResource } from "./organisation.js";
+export { OrganisationAccount } from "./organisationAccount.js";
+export { OrganisationPolicy } from "./organisationPolicy.js";
+export { CostAllocationTagActivator } from "./costAllocationTagActivator.js";

package/dist/lib/resources/aws/organisation/organisation.js

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Organisation = void 0;
-const constructs_1 = require("constructs");
-class Organisation extends constructs_1.Construct {
+import { Construct } from "constructs";
+export class Organisation extends Construct {
+    orgId;
+    rootId;
+    managementAccountId;
     constructor(scope, id, props) {
         super(scope, id);
         this.orgId = props.orgId;
@@ -10,5 +10,3 @@ class Organisation extends constructs_1.Construct {
         this.managementAccountId = props.managementAccountId;
     }
 }
-exports.Organisation = Organisation;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3Mvb3JnYW5pc2F0aW9uL29yZ2FuaXNhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBdUM7QUFRdkMsTUFBYSxZQUFhLFNBQVEsc0JBQVM7SUFLekMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF3QjtRQUNoRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQztRQUN6QixJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUM7UUFDM0IsSUFBSSxDQUFDLG1CQUFtQixHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQztJQUN2RCxDQUFDO0NBQ0Y7QUFYRCxvQ0FXQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgT3JnYW5pc2F0aW9uUHJvcHMge1xuICBvcmdJZDogc3RyaW5nO1xuICByb290SWQ6IHN0cmluZztcbiAgbWFuYWdlbWVudEFjY291bnRJZDogc3RyaW5nO1xufVxuXG5leHBvcnQgY2xhc3MgT3JnYW5pc2F0aW9uIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IG9yZ0lkOiBzdHJpbmc7XG4gIHB1YmxpYyByZWFkb25seSByb290SWQ6IHN0cmluZztcbiAgcHVibGljIHJlYWRvbmx5IG1hbmFnZW1lbnRBY2NvdW50SWQ6IHN0cmluZztcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogT3JnYW5pc2F0aW9uUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIHRoaXMub3JnSWQgPSBwcm9wcy5vcmdJZDtcbiAgICB0aGlzLnJvb3RJZCA9IHByb3BzLnJvb3RJZDtcbiAgICB0aGlzLm1hbmFnZW1lbnRBY2NvdW50SWQgPSBwcm9wcy5tYW5hZ2VtZW50QWNjb3VudElkO1xuICB9XG59XG4iXX0=

package/dist/lib/resources/aws/organisation/organisationAccount.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrganisationAccount = void 0;
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const constructs_1 = require("constructs");
+import { CfnOutput } from "aws-cdk-lib";
+import { Construct } from "constructs";
 /**
  * CDK construct that exports account ID and ARN as CloudFormation outputs.
  *
@@ -10,22 +7,22 @@ const constructs_1 = require("constructs");
  * (AwsAccountService.ensureMissingAccountsCreated / placeAccountsInOUs).
  * This construct only produces the CfnOutputs needed for cross-stack references.
  */
-class OrganisationAccount extends constructs_1.Construct {
+export class OrganisationAccount extends Construct {
+    accountId;
+    accountArn;
     constructor(scope, id, props) {
         super(scope, id);
         this.accountId = props.accountId;
         this.accountArn = `arn:aws:organizations::${props.managementAccountId}:account/${props.orgId}/${props.accountId}`;
-        new aws_cdk_lib_1.CfnOutput(this, `${id}Id`, {
+        new CfnOutput(this, `${id}Id`, {
             key: `${id}Id`,
             value: this.accountId,
             exportName: `${id}Id`
         });
-        new aws_cdk_lib_1.CfnOutput(this, `${id}Arn`, {
+        new CfnOutput(this, `${id}Arn`, {
             key: `${id}Arn`,
             value: this.accountArn,
             exportName: `${id}Arn`
         });
     }
 }
-exports.OrganisationAccount = OrganisationAccount;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uQWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYi9yZXNvdXJjZXMvYXdzL29yZ2FuaXNhdGlvbi9vcmdhbmlzYXRpb25BY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUF3QztBQUN4QywyQ0FBdUM7QUFRdkM7Ozs7OztHQU1HO0FBQ0gsTUFBYSxtQkFBb0IsU0FBUSxzQkFBUztJQUloRCxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQStCO1FBQ3ZFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLFNBQVMsR0FBRyxLQUFLLENBQUMsU0FBUyxDQUFDO1FBQ2pDLElBQUksQ0FBQyxVQUFVLEdBQUcsMEJBQTBCLEtBQUssQ0FBQyxtQkFBbUIsWUFBWSxLQUFLLENBQUMsS0FBSyxJQUFJLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUVsSCxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUU7WUFDN0IsR0FBRyxFQUFFLEdBQUcsRUFBRSxJQUFJO1lBQ2QsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTO1lBQ3JCLFVBQVUsRUFBRSxHQUFHLEVBQUUsSUFBSTtTQUN0QixDQUFDLENBQUM7UUFFSCxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUU7WUFDOUIsR0FBRyxFQUFFLEdBQUcsRUFBRSxLQUFLO1lBQ2YsS0FBSyxFQUFFLElBQUksQ0FBQyxVQUFVO1lBQ3RCLFVBQVUsRUFBRSxHQUFHLEVBQUUsS0FBSztTQUN2QixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUF0QkQsa0RBc0JDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2ZuT3V0cHV0IH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG5leHBvcnQgaW50ZXJmYWNlIE9yZ2FuaXNhdGlvbkFjY291bnRQcm9wcyB7XG4gIGFjY291bnRJZDogc3RyaW5nO1xuICBtYW5hZ2VtZW50QWNjb3VudElkOiBzdHJpbmc7XG4gIG9yZ0lkOiBzdHJpbmc7XG59XG5cbi8qKlxuICogQ0RLIGNvbnN0cnVjdCB0aGF0IGV4cG9ydHMgYWNjb3VudCBJRCBhbmQgQVJOIGFzIENsb3VkRm9ybWF0aW9uIG91dHB1dHMuXG4gKlxuICogQWNjb3VudCBjcmVhdGlvbiBhbmQgT1UgcGxhY2VtZW50IGFyZSBoYW5kbGVkIGJ5IHRoZSBDTEkgcHJlLWRlcGxveSBzdGVwc1xuICogKEF3c0FjY291bnRTZXJ2aWNlLmVuc3VyZU1pc3NpbmdBY2NvdW50c0NyZWF0ZWQgLyBwbGFjZUFjY291bnRzSW5PVXMpLlxuICogVGhpcyBjb25zdHJ1Y3Qgb25seSBwcm9kdWNlcyB0aGUgQ2ZuT3V0cHV0cyBuZWVkZWQgZm9yIGNyb3NzLXN0YWNrIHJlZmVyZW5jZXMuXG4gKi9cbmV4cG9ydCBjbGFzcyBPcmdhbmlzYXRpb25BY2NvdW50IGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IGFjY291bnRJZDogc3RyaW5nO1xuICBwdWJsaWMgcmVhZG9ubHkgYWNjb3VudEFybjogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBPcmdhbmlzYXRpb25BY2NvdW50UHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgdGhpcy5hY2NvdW50SWQgPSBwcm9wcy5hY2NvdW50SWQ7XG4gICAgdGhpcy5hY2NvdW50QXJuID0gYGFybjphd3M6b3JnYW5pemF0aW9uczo6JHtwcm9wcy5tYW5hZ2VtZW50QWNjb3VudElkfTphY2NvdW50LyR7cHJvcHMub3JnSWR9LyR7cHJvcHMuYWNjb3VudElkfWA7XG5cbiAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIGAke2lkfUlkYCwge1xuICAgICAga2V5OiBgJHtpZH1JZGAsXG4gICAgICB2YWx1ZTogdGhpcy5hY2NvdW50SWQsXG4gICAgICBleHBvcnROYW1lOiBgJHtpZH1JZGBcbiAgICB9KTtcblxuICAgIG5ldyBDZm5PdXRwdXQodGhpcywgYCR7aWR9QXJuYCwge1xuICAgICAga2V5OiBgJHtpZH1Bcm5gLFxuICAgICAgdmFsdWU6IHRoaXMuYWNjb3VudEFybixcbiAgICAgIGV4cG9ydE5hbWU6IGAke2lkfUFybmBcbiAgICB9KTtcbiAgfVxufVxuIl19