@fjall/components-infrastructure 0.1.45 → 0.1.46

package/dist/lib/patterns/aws/ec2.d.ts

@@ -1,15 +1,22 @@
-import { BlockDevice, IMachineImage, IVpc, UserData, SecurityGroup, IConnectable, Connections, SubnetConfiguration } from "aws-cdk-lib/aws-ec2";
+import { BlockDevice, IMachineImage, IVpc, SubnetType, UserData, SecurityGroup, IConnectable, Connections } from "aws-cdk-lib/aws-ec2";
 import { Construct } from "constructs";
 import { StackProps } from "aws-cdk-lib";
 import { Role } from "aws-cdk-lib/aws-iam";
 import { KeyValue } from "../../types";
+interface ExistingVpcConfig {
+    vpcId?: string;
+    subnetType?: SubnetType;
+}
+interface NewVpcConfig {
+    subnetType: SubnetType;
+}
+export type VpcProps = ExistingVpcConfig | NewVpcConfig;
 interface Ec2InstanceProps extends StackProps {
     spotCapacityPercentage?: number;
     blockDevices?: BlockDevice[];
     accountId?: string;
     serviceName: string;
-    vpcId?: string;
-    subnetConfiguration?: SubnetConfiguration[];
+    vpc: VpcProps;
     minCapcity?: number;
     maxCapacity?: number;
     instanceType: string;

package/dist/lib/patterns/aws/ec2.js

@@ -13,36 +13,38 @@ class Ec2Instance extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         this.addVpc(props);
-        this.addKeyPair(props);
+        if (props.enableSSH) {
+            this.addKeyPair(props);
+        }
         this.addLaunchTemplate(props);
         this.addAutoScalingGroup(props);
         this.suspendAutoScaling();
         //TODO: Add load balancer as boolean prop, then configure load balancer
     }
     addVpc(props) {
-        if (props.vpcId) {
+        if ("vpcId" in props.vpc) {
             this.vpc = vpc_1.Vpc.fromLookup(this, `${props.serviceName}Vpc`, {
-                vpcId: props.vpcId
+                vpcId: props.vpc.vpcId
             });
         }
         else {
             this.vpc = new vpc_1.Vpc(this, `${props.serviceName}Vpc`, {
                 accountId: props.accountId,
                 tags: props.tags,
-                subnetConfiguration: props.subnetConfiguration
+                subnetConfiguration: [
+                    {
+                        name: `${props.serviceName}`,
+                        subnetType: props.vpc.subnetType || aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS
+                    }
+                ]
             });
         }
     }
     addKeyPair(props) {
-        if (!props.enableSSH) {
-            this.keyPair = undefined;
-        }
-        else {
-            // TODO: Breakout into a seperate construct for use with better prop handling
-            this.keyPair = new aws_ec2_1.KeyPair(this, "KeyPair", {
-                keyPairName: `${props.serviceName}KeyPair`
-            });
-        }
+        // TODO: Breakout into a seperate construct for use with better prop handling
+        this.keyPair = new aws_ec2_1.KeyPair(this, "KeyPair", {
+            keyPairName: `${props.serviceName}KeyPair`
+        });
     }
     addLaunchTemplate(props) {
         this.asgSecurityGroup = new aws_ec2_1.SecurityGroup(this, `AsgSecurityGroup`, {
@@ -65,8 +67,7 @@ class Ec2Instance extends constructs_1.Construct {
             httpPutResponseHopLimit: 2,
             httpTokens: aws_ec2_1.LaunchTemplateHttpTokens.REQUIRED,
             instanceMetadataTags: true,
-            keyPair: this.keyPair,
-            associatePublicIpAddress: this.keyPair ? true : false
+            keyPair: this.keyPair
         });
     }
     addAutoScalingGroup(props) {
@@ -119,4 +120,4 @@ class Ec2Instance extends constructs_1.Construct {
     }
 }
 exports.Ec2Instance = Ec2Instance;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/ec2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  BlockDevice,\n  IMachineImage,\n  InstanceType,\n  IVpc,\n  LaunchTemplate,\n  SubnetType,\n  UserData,\n  MachineImage,\n  LaunchTemplateHttpTokens,\n  KeyPair,\n  IKeyPair,\n  SecurityGroup,\n  Peer,\n  Port,\n  IConnectable,\n  Connections,\n  SubnetConfiguration\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\nimport { Duration, StackProps } from \"aws-cdk-lib\";\nimport tagResource from \"../../utils/tagResource\";\nimport { Role } from \"aws-cdk-lib/aws-iam\";\nimport {\n  AutoScalingGroup,\n  GroupMetrics,\n  TerminationPolicy,\n  UpdatePolicy\n} from \"aws-cdk-lib/aws-autoscaling\";\nimport { KeyValue } from \"../../types\";\nimport { AwsCustomResource } from \"../../resources/aws/utilities/awsCustomResource\";\nimport { PhysicalResourceId } from \"aws-cdk-lib/custom-resources\";\nimport { Vpc } from \"../../resources/aws/networking/vpc\";\n\ninterface Ec2InstanceProps extends StackProps {\n  spotCapacityPercentage?: number;\n  blockDevices?: BlockDevice[];\n  accountId?: string;\n  serviceName: string;\n  vpcId?: string;\n  subnetConfiguration?: SubnetConfiguration[];\n  minCapcity?: number;\n  maxCapacity?: number;\n  instanceType: string;\n  machineImage?: IMachineImage;\n  userData?: UserData;\n  role?: Role;\n  enableSSH?: boolean;\n  tags: KeyValue;\n}\n\nexport class Ec2Instance extends Construct implements IConnectable {\n  private launchTemplate: LaunchTemplate;\n  public vpc: IVpc;\n  public asgSecurityGroup: SecurityGroup;\n  private autoScalingGroup: AutoScalingGroup;\n  private keyPair: IKeyPair | undefined;\n\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id);\n\n    this.addVpc(props);\n    this.addKeyPair(props);\n    this.addLaunchTemplate(props);\n    this.addAutoScalingGroup(props);\n    this.suspendAutoScaling();\n\n    //TODO: Add load balancer as boolean prop, then configure load balancer\n  }\n  connections: Connections;\n\n  addVpc(props: Ec2InstanceProps) {\n    if (props.vpcId) {\n      this.vpc = Vpc.fromLookup(this, `${props.serviceName}Vpc`, {\n        vpcId: props.vpcId\n      });\n    } else {\n      this.vpc = new Vpc(this, `${props.serviceName}Vpc`, {\n        accountId: props.accountId,\n        tags: props.tags,\n        subnetConfiguration: props.subnetConfiguration\n      });\n    }\n  }\n\n  addKeyPair(props: Ec2InstanceProps) {\n    if (!props.enableSSH) {\n      this.keyPair = undefined;\n    } else {\n      // TODO: Breakout into a seperate construct for use with better prop handling\n      this.keyPair = new KeyPair(this, \"KeyPair\", {\n        keyPairName: `${props.serviceName}KeyPair`\n      });\n    }\n  }\n\n  addLaunchTemplate(props: Ec2InstanceProps) {\n    this.asgSecurityGroup = new SecurityGroup(this, `AsgSecurityGroup`, {\n      vpc: this.vpc,\n      description: `Security group for the ${props.serviceName} auto scaling group`\n    });\n\n    if (props.enableSSH) {\n      this.asgSecurityGroup.addIngressRule(\n        Peer.anyIpv4(),\n        Port.tcp(22),\n        \"Allow SSH\"\n      );\n    }\n\n    this.launchTemplate = new LaunchTemplate(this, \"LaunchTemplate\", {\n      launchTemplateName: `${props.serviceName}LaunchTemplate`,\n      instanceType: new InstanceType(`${props.instanceType}`),\n      machineImage: props.machineImage || MachineImage.latestAmazonLinux2(),\n      userData: props.userData,\n      role: props.role,\n      blockDevices: props?.blockDevices,\n      securityGroup: this.asgSecurityGroup,\n      detailedMonitoring: true,\n      requireImdsv2: true,\n      httpPutResponseHopLimit: 2,\n      httpTokens: LaunchTemplateHttpTokens.REQUIRED,\n      instanceMetadataTags: true,\n      keyPair: this.keyPair,\n      associatePublicIpAddress: this.keyPair ? true : false\n    });\n  }\n\n  addAutoScalingGroup(props: Ec2InstanceProps) {\n    // TODO: Support spot instances\n    // TODO: Handle terminating EC2 instances when updating, currently hangs.\n    this.autoScalingGroup = new AutoScalingGroup(this, \"AutoScalingGroup\", {\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType: props.enableSSH ? SubnetType.PUBLIC : undefined\n      },\n      minCapacity: props.minCapcity,\n      maxCapacity: props.maxCapacity,\n      launchTemplate: this.launchTemplate,\n      cooldown: Duration.seconds(60),\n      groupMetrics: [GroupMetrics.all()],\n      updatePolicy: UpdatePolicy.replacingUpdate(),\n      newInstancesProtectedFromScaleIn: true,\n      // securityGroup: this.asgSecurityGroup,\n      terminationPolicies: [\n        TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,\n        TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR\n      ],\n      ssmSessionPermissions: true\n    });\n    tagResource(this.autoScalingGroup, props.tags);\n  }\n\n  suspendAutoScaling() {\n    new AwsCustomResource(this, \"SuspendAutoscaling\", {\n      functionName: \"suspendAutoScaling\",\n      onCreate: {\n        service: \"AutoScaling\",\n        action: \"suspendProcesses\",\n        parameters: {\n          AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n          ScalingProcesses: [\"AZRebalance\"]\n        },\n        physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n      },\n      onUpdate: {\n        service: \"AutoScaling\",\n        action: \"suspendProcesses\",\n        parameters: {\n          AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n          ScalingProcesses: [\"AZRebalance\"]\n        },\n        physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n      },\n      resourceType: \"Custom::suspendAutoscaling\"\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/ec2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  BlockDevice,\n  IMachineImage,\n  InstanceType,\n  IVpc,\n  LaunchTemplate,\n  SubnetType,\n  UserData,\n  MachineImage,\n  LaunchTemplateHttpTokens,\n  KeyPair,\n  IKeyPair,\n  SecurityGroup,\n  Peer,\n  Port,\n  IConnectable,\n  Connections\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\nimport { Duration, StackProps } from \"aws-cdk-lib\";\nimport tagResource from \"../../utils/tagResource\";\nimport { Role } from \"aws-cdk-lib/aws-iam\";\nimport {\n  AutoScalingGroup,\n  GroupMetrics,\n  TerminationPolicy,\n  UpdatePolicy\n} from \"aws-cdk-lib/aws-autoscaling\";\nimport { KeyValue } from \"../../types\";\nimport { AwsCustomResource } from \"../../resources/aws/utilities/awsCustomResource\";\nimport { PhysicalResourceId } from \"aws-cdk-lib/custom-resources\";\nimport { Vpc } from \"../../resources/aws/networking/vpc\";\n\ninterface ExistingVpcConfig {\n  vpcId?: string;\n  subnetType?: SubnetType;\n}\n\ninterface NewVpcConfig {\n  subnetType: SubnetType;\n}\n\nexport type VpcProps = ExistingVpcConfig | NewVpcConfig;\n\ninterface Ec2InstanceProps extends StackProps {\n  spotCapacityPercentage?: number;\n  blockDevices?: BlockDevice[];\n  accountId?: string;\n  serviceName: string;\n  vpc: VpcProps;\n  minCapcity?: number;\n  maxCapacity?: number;\n  instanceType: string;\n  machineImage?: IMachineImage;\n  userData?: UserData;\n  role?: Role;\n  enableSSH?: boolean;\n  tags: KeyValue;\n}\n\nexport class Ec2Instance extends Construct implements IConnectable {\n  private launchTemplate: LaunchTemplate;\n  public vpc: IVpc;\n  public asgSecurityGroup: SecurityGroup;\n  private autoScalingGroup: AutoScalingGroup;\n  private keyPair: IKeyPair;\n\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id);\n\n    this.addVpc(props);\n    if (props.enableSSH) {\n      this.addKeyPair(props);\n    }\n    this.addLaunchTemplate(props);\n    this.addAutoScalingGroup(props);\n    this.suspendAutoScaling();\n\n    //TODO: Add load balancer as boolean prop, then configure load balancer\n  }\n  connections: Connections;\n\n  addVpc(props: Ec2InstanceProps) {\n    if (\"vpcId\" in props.vpc) {\n      this.vpc = Vpc.fromLookup(this, `${props.serviceName}Vpc`, {\n        vpcId: props.vpc.vpcId\n      });\n    } else {\n      this.vpc = new Vpc(this, `${props.serviceName}Vpc`, {\n        accountId: props.accountId,\n        tags: props.tags,\n        subnetConfiguration: [\n          {\n            name: `${props.serviceName}`,\n            subnetType: props.vpc.subnetType || SubnetType.PRIVATE_WITH_EGRESS\n          }\n        ]\n      });\n    }\n  }\n\n  addKeyPair(props: Ec2InstanceProps) {\n    // TODO: Breakout into a seperate construct for use with better prop handling\n    this.keyPair = new KeyPair(this, \"KeyPair\", {\n      keyPairName: `${props.serviceName}KeyPair`\n    });\n  }\n\n  addLaunchTemplate(props: Ec2InstanceProps) {\n    this.asgSecurityGroup = new SecurityGroup(this, `AsgSecurityGroup`, {\n      vpc: this.vpc,\n      description: `Security group for the ${props.serviceName} auto scaling group`\n    });\n\n    if (props.enableSSH) {\n      this.asgSecurityGroup.addIngressRule(\n        Peer.anyIpv4(),\n        Port.tcp(22),\n        \"Allow SSH\"\n      );\n    }\n\n    this.launchTemplate = new LaunchTemplate(this, \"LaunchTemplate\", {\n      launchTemplateName: `${props.serviceName}LaunchTemplate`,\n      instanceType: new InstanceType(`${props.instanceType}`),\n      machineImage: props.machineImage || MachineImage.latestAmazonLinux2(),\n      userData: props.userData,\n      role: props.role,\n      blockDevices: props?.blockDevices,\n      securityGroup: this.asgSecurityGroup,\n      detailedMonitoring: true,\n      requireImdsv2: true,\n      httpPutResponseHopLimit: 2,\n      httpTokens: LaunchTemplateHttpTokens.REQUIRED,\n      instanceMetadataTags: true,\n      keyPair: this.keyPair\n    });\n  }\n\n  addAutoScalingGroup(props: Ec2InstanceProps) {\n    // TODO: Support spot instances\n    // TODO: Handle terminating EC2 instances when updating, currently hangs.\n    this.autoScalingGroup = new AutoScalingGroup(this, \"AutoScalingGroup\", {\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType: props.enableSSH ? SubnetType.PUBLIC : undefined\n      },\n      minCapacity: props.minCapcity,\n      maxCapacity: props.maxCapacity,\n      launchTemplate: this.launchTemplate,\n      cooldown: Duration.seconds(60),\n      groupMetrics: [GroupMetrics.all()],\n      updatePolicy: UpdatePolicy.replacingUpdate(),\n      newInstancesProtectedFromScaleIn: true,\n      // securityGroup: this.asgSecurityGroup,\n      terminationPolicies: [\n        TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,\n        TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR\n      ],\n      ssmSessionPermissions: true\n    });\n    tagResource(this.autoScalingGroup, props.tags);\n  }\n\n  suspendAutoScaling() {\n    new AwsCustomResource(this, \"SuspendAutoscaling\", {\n      functionName: \"suspendAutoScaling\",\n      onCreate: {\n        service: \"AutoScaling\",\n        action: \"suspendProcesses\",\n        parameters: {\n          AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n          ScalingProcesses: [\"AZRebalance\"]\n        },\n        physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n      },\n      onUpdate: {\n        service: \"AutoScaling\",\n        action: \"suspendProcesses\",\n        parameters: {\n          AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n          ScalingProcesses: [\"AZRebalance\"]\n        },\n        physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n      },\n      resourceType: \"Custom::suspendAutoscaling\"\n    });\n  }\n}\n"]}

package/dist/lib/utils/getConfig.js

@@ -28,7 +28,7 @@ function getConfig(accountName) {
         }
     }
     // If we still don't have an account name - try to retrieve accountId from context
-    if (!accountName) {
+    if (!config.accountName) {
         const accountId = app.node.tryGetContext("accountId");
         // If we find an accountId - retrieve the associated account from config
         if (accountId) {
@@ -43,4 +43,4 @@ function getConfig(accountName) {
     return config;
 }
 exports.default = getConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL2dldENvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWFBLDhCQTRDQztBQXZERCxnQ0FBeUI7QUFDekIsc0NBQW9EO0FBVXBELFNBQWdCLFNBQVMsQ0FBQyxXQUFvQjtJQUM1QyxNQUFNLEdBQUcsR0FBRyxhQUFHLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFOUIsTUFBTSxNQUFNLEdBQVc7UUFDckIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFJLFdBQVc7UUFDN0MsV0FBVyxFQUFFLGFBQWE7UUFDMUIsZ0JBQWdCLEVBQUUsRUFBRTtLQUNyQixDQUFDO0lBRUYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVTtRQUN6QixPQUFPLENBQUMsSUFBSSxDQUFDLGdEQUFnRCxDQUFDLENBQUM7SUFFakUsMkNBQTJDO0lBQzNDLE1BQU0sV0FBVyxHQUFHLGFBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUM3QyxNQUFNLENBQUMsZ0JBQWdCLEdBQUcsV0FBVyxDQUFDLG1CQUFtQixFQUFFLENBQUM7SUFFNUQsNkRBQTZEO0lBQzdELElBQUksQ0FBQyxXQUFXO1FBQUUsV0FBVyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3RFLG9FQUFvRTtJQUNwRSxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLE1BQU0sZUFBZSxHQUFHLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMsQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN0QixNQUFNLENBQUMsU0FBUyxHQUFHLGVBQWUsQ0FBQyxFQUFFLENBQUM7WUFDdEMsTUFBTSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDO1lBQzFDLE1BQU0sQ0FBQyxXQUFXLEdBQUcsZUFBZSxDQUFDLFdBQVcsQ0FBQztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztJQUVELGtGQUFrRjtJQUNsRixJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDakIsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDdEQsd0VBQXdFO1FBQ3hFLElBQUksU0FBUyxFQUFFLENBQUM7WUFDZCxNQUFNLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztZQUU3QixNQUFNLGVBQWUsR0FBRyxXQUFXLENBQUMsc0JBQXNCLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdEUsSUFBSSxDQUFDLENBQUMsZUFBZSxFQUFFLENBQUM7Z0JBQ3RCLE1BQU0sQ0FBQyxXQUFXLEdBQUcsZUFBZSxDQUFDLElBQUksQ0FBQztnQkFDMUMsTUFBTSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUMsV0FBVyxDQUFDO1lBQ25ELENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUM7QUFFRCxrQkFBZSxTQUFTLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBY2NvdW50IH0gZnJvbSBcIkBhd3Mtc2RrL2NsaWVudC1vcmdhbml6YXRpb25zXCI7XG5cbmltcG9ydCBBcHAgZnJvbSBcIi4uL2FwcFwiO1xuaW1wb3J0IHsgQ29uZmlnIGFzIEZqYWxsQ29uZmlnIH0gZnJvbSBcIkBmamFsbC91dGlsXCI7XG5cbmludGVyZmFjZSBDb25maWcge1xuICByZWdpb246IHN0cmluZztcbiAgZW52aXJvbm1lbnQ6IHN0cmluZztcbiAgZXhpc3RpbmdBY2NvdW50czogQWNjb3VudFtdO1xuICBhY2NvdW50SWQ/OiBzdHJpbmc7XG4gIGFjY291bnROYW1lPzogc3RyaW5nO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0Q29uZmlnKGFjY291bnROYW1lPzogc3RyaW5nKTogQ29uZmlnIHtcbiAgY29uc3QgYXBwID0gQXBwLmdldEluc3RhbmNlKCk7XG5cbiAgY29uc3QgY29uZmlnOiBDb25maWcgPSB7XG4gICAgcmVnaW9uOiBwcm9jZXNzLmVudi5BV1NfUkVHSU9OIHx8IFwidXMtZWFzdC0xXCIsXG4gICAgZW52aXJvbm1lbnQ6IFwiZGV2ZWxvcG1lbnRcIixcbiAgICBleGlzdGluZ0FjY291bnRzOiBbXVxuICB9O1xuXG4gIGlmICghcHJvY2Vzcy5lbnYuQVdTX1JFR0lPTilcbiAgICBjb25zb2xlLndhcm4oXCJBV1NfUkVHSU9OIGlzIG5vdCBzZXQsIGRlZmF1bHRpbmcgdG8gdXMtZWFzdC0xXCIpO1xuXG4gIC8vIFJldHJpZXZlIGFueSBwcmUtZXhpc3RpbmcgYWNjb3VudCBjb25maWdcbiAgY29uc3QgZmphbGxDb25maWcgPSBGamFsbENvbmZpZy5sb2FkQ29uZmlnKCk7XG4gIGNvbmZpZy5leGlzdGluZ0FjY291bnRzID0gZmphbGxDb25maWcuZ2V0RXhpc3RpbmdBY2NvdW50cygpO1xuXG4gIC8vIElmIHVuc3BlY2lmaWVkIGFjY291bnQgbmFtZSAtIHRyeSB0byByZXRyaWV2ZSBmcm9tIGNvbnRleHRcbiAgaWYgKCFhY2NvdW50TmFtZSkgYWNjb3VudE5hbWUgPSBhcHAubm9kZS50cnlHZXRDb250ZXh0KFwiYWNjb3VudE5hbWVcIik7XG4gIC8vIElmIHdlIGhhdmUgYW4gYWNjb3VudCBuYW1lIC0gbG9vayBmb3IgYXNzb2NpYXRlZCBwcm92aWRlciBhY2NvdW50XG4gIGlmIChhY2NvdW50TmFtZSkge1xuICAgIGNvbnN0IHByb3ZpZGVyQWNjb3VudCA9IGZqYWxsQ29uZmlnLmdldFByb3ZpZGVyQWNjb3VudChhY2NvdW50TmFtZSk7XG4gICAgaWYgKCEhcHJvdmlkZXJBY2NvdW50KSB7XG4gICAgICBjb25maWcuYWNjb3VudElkID0gcHJvdmlkZXJBY2NvdW50LmlkO1xuICAgICAgY29uZmlnLmFjY291bnROYW1lID0gcHJvdmlkZXJBY2NvdW50Lm5hbWU7XG4gICAgICBjb25maWcuZW52aXJvbm1lbnQgPSBwcm92aWRlckFjY291bnQuZW52aXJvbm1lbnQ7XG4gICAgfVxuICB9XG5cbiAgLy8gSWYgd2Ugc3RpbGwgZG9uJ3QgaGF2ZSBhbiBhY2NvdW50IG5hbWUgLSB0cnkgdG8gcmV0cmlldmUgYWNjb3VudElkIGZyb20gY29udGV4dFxuICBpZiAoIWFjY291bnROYW1lKSB7XG4gICAgY29uc3QgYWNjb3VudElkID0gYXBwLm5vZGUudHJ5R2V0Q29udGV4dChcImFjY291bnRJZFwiKTtcbiAgICAvLyBJZiB3ZSBmaW5kIGFuIGFjY291bnRJZCAtIHJldHJpZXZlIHRoZSBhc3NvY2lhdGVkIGFjY291bnQgZnJvbSBjb25maWdcbiAgICBpZiAoYWNjb3VudElkKSB7XG4gICAgICBjb25maWcuYWNjb3VudElkID0gYWNjb3VudElkO1xuXG4gICAgICBjb25zdCBwcm92aWRlckFjY291bnQgPSBmamFsbENvbmZpZy5nZXRQcm92aWRlckFjY291bnRCeUlkKGFjY291bnRJZCk7XG4gICAgICBpZiAoISFwcm92aWRlckFjY291bnQpIHtcbiAgICAgICAgY29uZmlnLmFjY291bnROYW1lID0gcHJvdmlkZXJBY2NvdW50Lm5hbWU7XG4gICAgICAgIGNvbmZpZy5lbnZpcm9ubWVudCA9IHByb3ZpZGVyQWNjb3VudC5lbnZpcm9ubWVudDtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gY29uZmlnO1xufVxuXG5leHBvcnQgZGVmYXVsdCBnZXRDb25maWc7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL2dldENvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWFBLDhCQTRDQztBQXZERCxnQ0FBeUI7QUFDekIsc0NBQW9EO0FBVXBELFNBQWdCLFNBQVMsQ0FBQyxXQUFvQjtJQUM1QyxNQUFNLEdBQUcsR0FBRyxhQUFHLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFOUIsTUFBTSxNQUFNLEdBQVc7UUFDckIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFJLFdBQVc7UUFDN0MsV0FBVyxFQUFFLGFBQWE7UUFDMUIsZ0JBQWdCLEVBQUUsRUFBRTtLQUNyQixDQUFDO0lBRUYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVTtRQUN6QixPQUFPLENBQUMsSUFBSSxDQUFDLGdEQUFnRCxDQUFDLENBQUM7SUFFakUsMkNBQTJDO0lBQzNDLE1BQU0sV0FBVyxHQUFHLGFBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUM3QyxNQUFNLENBQUMsZ0JBQWdCLEdBQUcsV0FBVyxDQUFDLG1CQUFtQixFQUFFLENBQUM7SUFFNUQsNkRBQTZEO0lBQzdELElBQUksQ0FBQyxXQUFXO1FBQUUsV0FBVyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3RFLG9FQUFvRTtJQUNwRSxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLE1BQU0sZUFBZSxHQUFHLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMsQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUN0QixNQUFNLENBQUMsU0FBUyxHQUFHLGVBQWUsQ0FBQyxFQUFFLENBQUM7WUFDdEMsTUFBTSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDO1lBQzFDLE1BQU0sQ0FBQyxXQUFXLEdBQUcsZUFBZSxDQUFDLFdBQVcsQ0FBQztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztJQUVELGtGQUFrRjtJQUNsRixJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ3hCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3RELHdFQUF3RTtRQUN4RSxJQUFJLFNBQVMsRUFBRSxDQUFDO1lBQ2QsTUFBTSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7WUFFN0IsTUFBTSxlQUFlLEdBQUcsV0FBVyxDQUFDLHNCQUFzQixDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQ3RFLElBQUksQ0FBQyxDQUFDLGVBQWUsRUFBRSxDQUFDO2dCQUN0QixNQUFNLENBQUMsV0FBVyxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUM7Z0JBQzFDLE1BQU0sQ0FBQyxXQUFXLEdBQUcsZUFBZSxDQUFDLFdBQVcsQ0FBQztZQUNuRCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsa0JBQWUsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQWNjb3VudCB9IGZyb20gXCJAYXdzLXNkay9jbGllbnQtb3JnYW5pemF0aW9uc1wiO1xuXG5pbXBvcnQgQXBwIGZyb20gXCIuLi9hcHBcIjtcbmltcG9ydCB7IENvbmZpZyBhcyBGamFsbENvbmZpZyB9IGZyb20gXCJAZmphbGwvdXRpbFwiO1xuXG5pbnRlcmZhY2UgQ29uZmlnIHtcbiAgcmVnaW9uOiBzdHJpbmc7XG4gIGVudmlyb25tZW50OiBzdHJpbmc7XG4gIGV4aXN0aW5nQWNjb3VudHM6IEFjY291bnRbXTtcbiAgYWNjb3VudElkPzogc3RyaW5nO1xuICBhY2NvdW50TmFtZT86IHN0cmluZztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdldENvbmZpZyhhY2NvdW50TmFtZT86IHN0cmluZyk6IENvbmZpZyB7XG4gIGNvbnN0IGFwcCA9IEFwcC5nZXRJbnN0YW5jZSgpO1xuXG4gIGNvbnN0IGNvbmZpZzogQ29uZmlnID0ge1xuICAgIHJlZ2lvbjogcHJvY2Vzcy5lbnYuQVdTX1JFR0lPTiB8fCBcInVzLWVhc3QtMVwiLFxuICAgIGVudmlyb25tZW50OiBcImRldmVsb3BtZW50XCIsXG4gICAgZXhpc3RpbmdBY2NvdW50czogW11cbiAgfTtcblxuICBpZiAoIXByb2Nlc3MuZW52LkFXU19SRUdJT04pXG4gICAgY29uc29sZS53YXJuKFwiQVdTX1JFR0lPTiBpcyBub3Qgc2V0LCBkZWZhdWx0aW5nIHRvIHVzLWVhc3QtMVwiKTtcblxuICAvLyBSZXRyaWV2ZSBhbnkgcHJlLWV4aXN0aW5nIGFjY291bnQgY29uZmlnXG4gIGNvbnN0IGZqYWxsQ29uZmlnID0gRmphbGxDb25maWcubG9hZENvbmZpZygpO1xuICBjb25maWcuZXhpc3RpbmdBY2NvdW50cyA9IGZqYWxsQ29uZmlnLmdldEV4aXN0aW5nQWNjb3VudHMoKTtcblxuICAvLyBJZiB1bnNwZWNpZmllZCBhY2NvdW50IG5hbWUgLSB0cnkgdG8gcmV0cmlldmUgZnJvbSBjb250ZXh0XG4gIGlmICghYWNjb3VudE5hbWUpIGFjY291bnROYW1lID0gYXBwLm5vZGUudHJ5R2V0Q29udGV4dChcImFjY291bnROYW1lXCIpO1xuICAvLyBJZiB3ZSBoYXZlIGFuIGFjY291bnQgbmFtZSAtIGxvb2sgZm9yIGFzc29jaWF0ZWQgcHJvdmlkZXIgYWNjb3VudFxuICBpZiAoYWNjb3VudE5hbWUpIHtcbiAgICBjb25zdCBwcm92aWRlckFjY291bnQgPSBmamFsbENvbmZpZy5nZXRQcm92aWRlckFjY291bnQoYWNjb3VudE5hbWUpO1xuICAgIGlmICghIXByb3ZpZGVyQWNjb3VudCkge1xuICAgICAgY29uZmlnLmFjY291bnRJZCA9IHByb3ZpZGVyQWNjb3VudC5pZDtcbiAgICAgIGNvbmZpZy5hY2NvdW50TmFtZSA9IHByb3ZpZGVyQWNjb3VudC5uYW1lO1xuICAgICAgY29uZmlnLmVudmlyb25tZW50ID0gcHJvdmlkZXJBY2NvdW50LmVudmlyb25tZW50O1xuICAgIH1cbiAgfVxuXG4gIC8vIElmIHdlIHN0aWxsIGRvbid0IGhhdmUgYW4gYWNjb3VudCBuYW1lIC0gdHJ5IHRvIHJldHJpZXZlIGFjY291bnRJZCBmcm9tIGNvbnRleHRcbiAgaWYgKCFjb25maWcuYWNjb3VudE5hbWUpIHtcbiAgICBjb25zdCBhY2NvdW50SWQgPSBhcHAubm9kZS50cnlHZXRDb250ZXh0KFwiYWNjb3VudElkXCIpO1xuICAgIC8vIElmIHdlIGZpbmQgYW4gYWNjb3VudElkIC0gcmV0cmlldmUgdGhlIGFzc29jaWF0ZWQgYWNjb3VudCBmcm9tIGNvbmZpZ1xuICAgIGlmIChhY2NvdW50SWQpIHtcbiAgICAgIGNvbmZpZy5hY2NvdW50SWQgPSBhY2NvdW50SWQ7XG5cbiAgICAgIGNvbnN0IHByb3ZpZGVyQWNjb3VudCA9IGZqYWxsQ29uZmlnLmdldFByb3ZpZGVyQWNjb3VudEJ5SWQoYWNjb3VudElkKTtcbiAgICAgIGlmICghIXByb3ZpZGVyQWNjb3VudCkge1xuICAgICAgICBjb25maWcuYWNjb3VudE5hbWUgPSBwcm92aWRlckFjY291bnQubmFtZTtcbiAgICAgICAgY29uZmlnLmVudmlyb25tZW50ID0gcHJvdmlkZXJBY2NvdW50LmVudmlyb25tZW50O1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIHJldHVybiBjb25maWc7XG59XG5cbmV4cG9ydCBkZWZhdWx0IGdldENvbmZpZztcbiJdfQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "bin": {
     "infrastructure": "bin/infrastructure.js"
   },
@@ -56,7 +56,7 @@
   "dependencies": {
     "@aws-sdk/client-cost-explorer": "^3.717.0",
     "@aws-sdk/client-organizations": "^3.716.0",
-    "@fjall/util": "^0.1.45",
+    "@fjall/util": "^0.1.46",
     "@pepperize/cdk-organizations": "^0.7.135",
     "aws-cdk": "^2.146.0",
     "aws-cdk-lib": "^2.146.0",
@@ -68,5 +68,5 @@
   "overrides": {
     "@smithy/core": "2.5.5"
   },
-  "gitHead": "cd903620cbd83ded6050cacdfb7d6926efbddcd9"
+  "gitHead": "b15a621be61eb2749d9b1a22179cc06df4610dc9"
 }