@fjall/components-infrastructure 0.55.1 → 0.57.0

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

@@ -0,0 +1,43 @@
+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;
+    vpc: VpcProps;
+    minCapcity?: number;
+    maxCapacity?: number;
+    instanceType: string;
+    machineImage?: IMachineImage;
+    userData?: UserData;
+    role?: Role;
+    enableSSH?: boolean;
+    tags: KeyValue;
+}
+export declare class Ec2Instance extends Construct implements IConnectable {
+    private launchTemplate;
+    vpc: IVpc;
+    asgSecurityGroup: SecurityGroup;
+    private autoScalingGroup;
+    private keyPair;
+    constructor(scope: Construct, id: string, props: Ec2InstanceProps);
+    connections: Connections;
+    addVpc(props: Ec2InstanceProps): void;
+    addKeyPair(props: Ec2InstanceProps): void;
+    addLaunchTemplate(props: Ec2InstanceProps): void;
+    addAutoScalingGroup(props: Ec2InstanceProps): void;
+    suspendAutoScaling(): void;
+}
+export {};

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

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Ec2Instance = void 0;
+const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
+const constructs_1 = require("constructs");
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const tagResource_1 = require("../../utils/tagResource");
+const aws_autoscaling_1 = require("aws-cdk-lib/aws-autoscaling");
+const awsCustomResource_1 = require("../../resources/aws/utilities/awsCustomResource");
+const custom_resources_1 = require("aws-cdk-lib/custom-resources");
+const vpc_1 = require("../../resources/aws/networking/vpc");
+class Ec2Instance extends constructs_1.Construct {
+    constructor(scope, id, props) {
+        super(scope, id);
+        this.addVpc(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 ("vpcId" in props.vpc) {
+            this.vpc = vpc_1.Vpc.fromLookup(this, `${props.serviceName}Vpc`, {
+                vpcId: props.vpc.vpcId
+            });
+        }
+        else {
+            this.vpc = new vpc_1.Vpc(this, `${props.serviceName}Vpc`, {
+                accountId: props.accountId,
+                tags: props.tags,
+                subnetConfiguration: [
+                    {
+                        name: `${props.serviceName}`,
+                        subnetType: props.vpc.subnetType || aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS
+                    }
+                ]
+            });
+        }
+    }
+    addKeyPair(props) {
+        // 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`, {
+            vpc: this.vpc,
+            description: `Security group for the ${props.serviceName} auto scaling group`
+        });
+        if (props.enableSSH) {
+            this.asgSecurityGroup.addIngressRule(aws_ec2_1.Peer.anyIpv4(), aws_ec2_1.Port.tcp(22), "Allow SSH");
+        }
+        this.launchTemplate = new aws_ec2_1.LaunchTemplate(this, "LaunchTemplate", {
+            launchTemplateName: `${props.serviceName}LaunchTemplate`,
+            instanceType: new aws_ec2_1.InstanceType(`${props.instanceType}`),
+            machineImage: props.machineImage || aws_ec2_1.MachineImage.latestAmazonLinux2(),
+            userData: props.userData,
+            role: props.role,
+            blockDevices: props?.blockDevices,
+            securityGroup: this.asgSecurityGroup,
+            detailedMonitoring: true,
+            requireImdsv2: true,
+            httpPutResponseHopLimit: 2,
+            httpTokens: aws_ec2_1.LaunchTemplateHttpTokens.REQUIRED,
+            instanceMetadataTags: true,
+            keyPair: this.keyPair
+        });
+    }
+    addAutoScalingGroup(props) {
+        // TODO: Support spot instances
+        // TODO: Handle terminating EC2 instances when updating, currently hangs.
+        this.autoScalingGroup = new aws_autoscaling_1.AutoScalingGroup(this, "AutoScalingGroup", {
+            vpc: this.vpc,
+            vpcSubnets: {
+                subnetType: props.enableSSH ? aws_ec2_1.SubnetType.PUBLIC : undefined
+            },
+            minCapacity: props.minCapcity,
+            maxCapacity: props.maxCapacity,
+            launchTemplate: this.launchTemplate,
+            cooldown: aws_cdk_lib_1.Duration.seconds(60),
+            groupMetrics: [aws_autoscaling_1.GroupMetrics.all()],
+            updatePolicy: aws_autoscaling_1.UpdatePolicy.replacingUpdate(),
+            newInstancesProtectedFromScaleIn: true,
+            // securityGroup: this.asgSecurityGroup,
+            terminationPolicies: [
+                aws_autoscaling_1.TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,
+                aws_autoscaling_1.TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR
+            ],
+            ssmSessionPermissions: true
+        });
+        (0, tagResource_1.default)(this.autoScalingGroup, props.tags);
+    }
+    suspendAutoScaling() {
+        new awsCustomResource_1.AwsCustomResource(this, "SuspendAutoscaling", {
+            functionName: "suspendAutoScaling",
+            onCreate: {
+                service: "AutoScaling",
+                action: "suspendProcesses",
+                parameters: {
+                    AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,
+                    ScalingProcesses: ["AZRebalance"]
+                },
+                physicalResourceId: custom_resources_1.PhysicalResourceId.of("suspendAutoScaling")
+            },
+            onUpdate: {
+                service: "AutoScaling",
+                action: "suspendProcesses",
+                parameters: {
+                    AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,
+                    ScalingProcesses: ["AZRebalance"]
+                },
+                physicalResourceId: custom_resources_1.PhysicalResourceId.of("suspendAutoScaling")
+            },
+            resourceType: "Custom::suspendAutoscaling"
+        });
+    }
+}
+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} 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/patterns/aws/hostedZone.js

@@ -7,9 +7,13 @@ const iam_1 = require("../../resources/aws/iam");
 const tagResource_1 = require("../../utils/tagResource");
 const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 const aws_route53_1 = require("aws-cdk-lib/aws-route53");
+function getSafeZoneName(zoneName) {
+    return zoneName.split(".").join("");
+}
 class HostedZoneFactory {
     static import(stack, hostedZoneId, zoneName) {
-        return new HostedZone(stack.getStack(), "HostedZone", {
+        const safeZoneName = getSafeZoneName(zoneName);
+        return new HostedZone(stack.getStack(), `${safeZoneName}HostedZone`, {
             hostedZoneId: hostedZoneId,
             zoneName: zoneName
         });
@@ -36,7 +40,7 @@ class HostedZone extends constructs_1.Construct {
         return this.hostedZone || this.importedHostedZone;
     }
     safeZoneName() {
-        return this.zoneName.split(".").join("");
+        return getSafeZoneName(this.zoneName);
     }
     addHostedZone(zoneName) {
         this.hostedZone = new aws_route53_1.HostedZone(this, `${this.safeZoneName}HostedZone`, {
@@ -47,7 +51,10 @@ class HostedZone extends constructs_1.Construct {
     importHostedZone(zoneName) {
         this.importedHostedZone = aws_route53_1.HostedZone.fromHostedZoneAttributes(
         // HostedZone.fromHostedZoneAttributes explicitly must be passed a stack as parent scope
-        this.scope, "importedHostedZone", {
+        this.scope, 
+        // Use safeZoneName in the id so we can theoretically
+        //  import multiple hosted zones in a single app
+        `${this.safeZoneName()}ImportedHostedZone`, {
             hostedZoneId: this.hostedZoneId,
             zoneName: zoneName
         });
@@ -56,11 +63,11 @@ class HostedZone extends constructs_1.Construct {
             "fjall:costAllocation:service": "hostedZone",
             "fjall:costAllocation:domain": `${zoneName}`
         });
-        new aws_cdk_lib_1.CfnOutput(this, `${this.safeZoneName()}HostedZoneId`, {
-            key: "HostedZoneId",
-            value: this.hostedZoneId,
-            exportName: `${this.safeZoneName()}HostedZoneId`
-        });
+        // new CfnOutput(this, `${this.safeZoneName()}HostedZoneId`, {
+        //   key: `${this.safeZoneName()}HostedZoneId`,
+        //   value: this.hostedZoneId,
+        //   exportName: `${this.safeZoneName()}HostedZoneId`
+        // });
     }
     delegateHostedZone() {
         const domainName = this.hostedZone.zoneName.split(".", 1);
@@ -138,4 +145,4 @@ class HostedZone extends constructs_1.Construct {
     }
 }
 exports.HostedZone = HostedZone;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hostedZone.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/hostedZone.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { CfnOutput, Fn, Resource, Stack } from \"aws-cdk-lib\";\nimport { Role } from \"../../resources/aws/iam\";\nimport tagResource from \"../../utils/tagResource\";\nimport {\n  OrganizationPrincipal,\n  PolicyDocument,\n  PolicyStatement\n} from \"aws-cdk-lib/aws-iam\";\nimport {\n  ARecord,\n  ARecordProps,\n  CnameRecord,\n  CnameRecordProps,\n  HostedZone as AWSHostedZone,\n  IHostedZone,\n  MxRecord,\n  MxRecordProps,\n  NsRecord,\n  NsRecordProps,\n  TxtRecord,\n  TxtRecordProps\n} from \"aws-cdk-lib/aws-route53\";\n\nimport App from \"../../app\";\nimport { AwsStack } from \"../../resources\";\n\nexport interface HostedZoneProps {\n  zoneName: string;\n  hostedZoneId?: string;\n}\n\nexport class HostedZoneFactory {\n  static import(stack: AwsStack, hostedZoneId: string, zoneName: string) {\n    return new HostedZone(stack.getStack(), \"HostedZone\", {\n      hostedZoneId: hostedZoneId,\n      zoneName: zoneName\n    });\n  }\n}\n\nexport class HostedZone extends Construct {\n  private hostedZone: AWSHostedZone;\n  private hostedZoneId: string;\n  private importedHostedZone: IHostedZone;\n  private zoneName: string;\n\n  private scope: Construct;\n\n  constructor(scope: Construct, id: string, props: HostedZoneProps) {\n    super(scope, id);\n\n    this.scope = scope;\n    this.zoneName = props.zoneName;\n\n    // If a hostedZoneId is provided import it, unless create a new hosted zone\n    if (!props.hostedZoneId) {\n      this.addHostedZone(props.zoneName);\n      this.hostedZoneId = this.hostedZone.hostedZoneId;\n      this.delegateHostedZone();\n    } else {\n      this.hostedZoneId = props.hostedZoneId;\n      this.importHostedZone(props.zoneName);\n    }\n  }\n\n  getInternalHostedZone() {\n    return this.hostedZone || this.importedHostedZone;\n  }\n\n  safeZoneName() {\n    return this.zoneName.split(\".\").join(\"\");\n  }\n\n  addHostedZone(zoneName: string) {\n    this.hostedZone = new AWSHostedZone(\n      this,\n      `${this.safeZoneName}HostedZone`,\n      {\n        zoneName: zoneName,\n        comment: `Hosted Zone for ${zoneName}`\n      }\n    );\n\n  }\n\n  importHostedZone(zoneName: string) {\n    this.importedHostedZone = AWSHostedZone.fromHostedZoneAttributes(\n      // HostedZone.fromHostedZoneAttributes explicitly must be passed a stack as parent scope\n      this.scope,\n      \"importedHostedZone\",\n      {\n        hostedZoneId: this.hostedZoneId,\n        zoneName: zoneName\n      }\n    );\n\n    tagResource(this.importedHostedZone, {\n      \"fjall:costAllocation:environment\": \"management\",\n      \"fjall:costAllocation:service\": \"hostedZone\",\n      \"fjall:costAllocation:domain\": `${zoneName}`\n    });\n\n    new CfnOutput(this, `${this.safeZoneName()}HostedZoneId`, {\n      key: \"HostedZoneId\",\n      value: this.hostedZoneId,\n      exportName: `${this.safeZoneName()}HostedZoneId`\n    });\n  }\n\n  delegateHostedZone() {\n    const domainName = this.hostedZone.zoneName.split(\".\", 1);\n    const role = new Role(this, `${domainName}DelegateHostedZoneRole`, {\n      assumedBy: new OrganizationPrincipal(Fn.importValue(\"OrganisationId\")),\n      roleName: `${domainName}DelegateHostedZoneRole`,\n      inlinePolicies: {\n        [\"listHostedZones\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\"route53:ListHostedZonesByName\"],\n              resources: [\"*\"]\n            })\n          ]\n        }),\n        [\"changeResourceRecordSets\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\"route53:ChangeResourceRecordSets\"],\n              resources: [\n                `arn:aws:route53:::hostedzone/${this.hostedZone.hostedZoneId}`\n              ]\n            })\n          ]\n        })\n      }\n    });\n\n    this.hostedZone.grantDelegation(role);\n\n    new CfnOutput(this, \"DelegateHostedZoneRoleArn\", {\n      key: `${domainName}DelegateHostedZoneRoleArn`,\n      value: role.roleArn,\n      exportName: `${domainName}DelegateHostedZoneRoleArn`\n    });\n  }\n\n  public addARecord(props: Omit<ARecordProps, \"zone\">) {\n    new ARecord(this, \"ARecord\", {\n      zone: this.importedHostedZone,\n      recordName: props.recordName,\n      comment:\n        props.comment || `A Record for ${this.importedHostedZone.zoneName}`,\n      target: props.target,\n      ttl: props.ttl\n    });\n  }\n\n  public addCname(props: Omit<CnameRecordProps, \"zone\">) {\n    new CnameRecord(this, ``, {\n      domainName: props.domainName,\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `CNAME Record for ${this.importedHostedZone.zoneName}`,\n      ttl: props.ttl\n    });\n  }\n\n  public addMx(props: Omit<MxRecordProps, \"zone\">) {\n    new MxRecord(this, ``, {\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `MX Record for ${this.importedHostedZone.zoneName}`,\n      values: props.values,\n      ttl: props.ttl\n    });\n  }\n\n  public addNS(props: Omit<NsRecordProps, \"zone\">) {\n    new NsRecord(this, ``, {\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `NS Record for ${this.importedHostedZone.zoneName}`,\n      values: props.values,\n      ttl: props.ttl\n    });\n  }\n\n  public addTxt(props: Omit<TxtRecordProps, \"zone\">) {\n    new TxtRecord(this, ``, {\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `TXT Record for ${this.importedHostedZone.zoneName}`,\n      values: props.values,\n      ttl: props.ttl\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hostedZone.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/hostedZone.ts"],"names":[],"mappings":"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","sourcesContent":["import { Construct } from \"constructs\";\nimport { CfnOutput, Fn, Resource, Stack } from \"aws-cdk-lib\";\nimport { Role } from \"../../resources/aws/iam\";\nimport tagResource from \"../../utils/tagResource\";\nimport {\n  OrganizationPrincipal,\n  PolicyDocument,\n  PolicyStatement\n} from \"aws-cdk-lib/aws-iam\";\nimport {\n  ARecord,\n  ARecordProps,\n  CnameRecord,\n  CnameRecordProps,\n  HostedZone as AWSHostedZone,\n  IHostedZone,\n  MxRecord,\n  MxRecordProps,\n  NsRecord,\n  NsRecordProps,\n  TxtRecord,\n  TxtRecordProps\n} from \"aws-cdk-lib/aws-route53\";\n\nimport App from \"../../app\";\nimport { AwsStack } from \"../../resources\";\n\nfunction getSafeZoneName(zoneName: string) {\n  return zoneName.split(\".\").join(\"\");\n}\n\nexport interface HostedZoneProps {\n  zoneName: string;\n  hostedZoneId?: string;\n}\n\nexport class HostedZoneFactory {\n  static import(stack: AwsStack, hostedZoneId: string, zoneName: string) {\n    const safeZoneName = getSafeZoneName(zoneName);\n\n    return new HostedZone(stack.getStack(), `${safeZoneName}HostedZone`, {\n      hostedZoneId: hostedZoneId,\n      zoneName: zoneName\n    });\n  }\n}\n\nexport class HostedZone extends Construct {\n  private hostedZone: AWSHostedZone;\n  private hostedZoneId: string;\n  private importedHostedZone: IHostedZone;\n  private zoneName: string;\n\n  private scope: Construct;\n\n  constructor(scope: Construct, id: string, props: HostedZoneProps) {\n    super(scope, id);\n\n    this.scope = scope;\n    this.zoneName = props.zoneName;\n\n    // If a hostedZoneId is provided import it, unless create a new hosted zone\n    if (!props.hostedZoneId) {\n      this.addHostedZone(props.zoneName);\n      this.hostedZoneId = this.hostedZone.hostedZoneId;\n      this.delegateHostedZone();\n    } else {\n      this.hostedZoneId = props.hostedZoneId;\n      this.importHostedZone(props.zoneName);\n    }\n  }\n\n  getInternalHostedZone() {\n    return this.hostedZone || this.importedHostedZone;\n  }\n\n  safeZoneName() {\n    return getSafeZoneName(this.zoneName);\n  }\n\n  addHostedZone(zoneName: string) {\n    this.hostedZone = new AWSHostedZone(\n      this,\n      `${this.safeZoneName}HostedZone`,\n      {\n        zoneName: zoneName,\n        comment: `Hosted Zone for ${zoneName}`\n      }\n    );\n  }\n\n  importHostedZone(zoneName: string) {\n    this.importedHostedZone = AWSHostedZone.fromHostedZoneAttributes(\n      // HostedZone.fromHostedZoneAttributes explicitly must be passed a stack as parent scope\n      this.scope,\n\n      // Use safeZoneName in the id so we can theoretically\n      //  import multiple hosted zones in a single app\n      `${this.safeZoneName()}ImportedHostedZone`,\n      {\n        hostedZoneId: this.hostedZoneId,\n        zoneName: zoneName\n      }\n    );\n\n    tagResource(this.importedHostedZone, {\n      \"fjall:costAllocation:environment\": \"management\",\n      \"fjall:costAllocation:service\": \"hostedZone\",\n      \"fjall:costAllocation:domain\": `${zoneName}`\n    });\n\n    // new CfnOutput(this, `${this.safeZoneName()}HostedZoneId`, {\n    //   key: `${this.safeZoneName()}HostedZoneId`,\n    //   value: this.hostedZoneId,\n    //   exportName: `${this.safeZoneName()}HostedZoneId`\n    // });\n  }\n\n  delegateHostedZone() {\n    const domainName = this.hostedZone.zoneName.split(\".\", 1);\n    const role = new Role(this, `${domainName}DelegateHostedZoneRole`, {\n      assumedBy: new OrganizationPrincipal(Fn.importValue(\"OrganisationId\")),\n      roleName: `${domainName}DelegateHostedZoneRole`,\n      inlinePolicies: {\n        [\"listHostedZones\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\"route53:ListHostedZonesByName\"],\n              resources: [\"*\"]\n            })\n          ]\n        }),\n        [\"changeResourceRecordSets\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\"route53:ChangeResourceRecordSets\"],\n              resources: [\n                `arn:aws:route53:::hostedzone/${this.hostedZone.hostedZoneId}`\n              ]\n            })\n          ]\n        })\n      }\n    });\n\n    this.hostedZone.grantDelegation(role);\n\n    new CfnOutput(this, \"DelegateHostedZoneRoleArn\", {\n      key: `${domainName}DelegateHostedZoneRoleArn`,\n      value: role.roleArn,\n      exportName: `${domainName}DelegateHostedZoneRoleArn`\n    });\n  }\n\n  public addARecord(props: Omit<ARecordProps, \"zone\">) {\n    new ARecord(this, \"ARecord\", {\n      zone: this.importedHostedZone,\n      recordName: props.recordName,\n      comment:\n        props.comment || `A Record for ${this.importedHostedZone.zoneName}`,\n      target: props.target,\n      ttl: props.ttl\n    });\n  }\n\n  public addCname(props: Omit<CnameRecordProps, \"zone\">) {\n    new CnameRecord(this, ``, {\n      domainName: props.domainName,\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `CNAME Record for ${this.importedHostedZone.zoneName}`,\n      ttl: props.ttl\n    });\n  }\n\n  public addMx(props: Omit<MxRecordProps, \"zone\">) {\n    new MxRecord(this, ``, {\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `MX Record for ${this.importedHostedZone.zoneName}`,\n      values: props.values,\n      ttl: props.ttl\n    });\n  }\n\n  public addNS(props: Omit<NsRecordProps, \"zone\">) {\n    new NsRecord(this, ``, {\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `NS Record for ${this.importedHostedZone.zoneName}`,\n      values: props.values,\n      ttl: props.ttl\n    });\n  }\n\n  public addTxt(props: Omit<TxtRecordProps, \"zone\">) {\n    new TxtRecord(this, ``, {\n      zone: this.importedHostedZone,\n      comment:\n        props.comment || `TXT Record for ${this.importedHostedZone.zoneName}`,\n      values: props.values,\n      ttl: props.ttl\n    });\n  }\n}\n"]}

package/dist/lib/utils/getCidr.d.ts

@@ -0,0 +1,8 @@
+export default class CidrBlock {
+    private cidrBlock;
+    private configFile;
+    constructor();
+    writeState(): void;
+    getCidrBlock(): string;
+    updateState(cidrBlock: string, status: boolean): void;
+}

package/dist/lib/utils/getCidr.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+class CidrBlock {
+    constructor() {
+        this.configFile = "../cidr-config.json";
+        // Import config, or create it if it doesn't exist
+        if (fs.existsSync(this.configFile)) {
+            const configString = fs.readFileSync(this.configFile, "utf-8");
+            this.cidrBlock = JSON.parse(configString);
+        }
+        else {
+            this.cidrBlock = {};
+            for (let i = 1; i <= 255; i++) {
+                this.cidrBlock[`${i}.0.0.0/8`] = true;
+            }
+            const configString = JSON.stringify(this.cidrBlock, null, 2);
+            fs.writeFileSync(this.configFile, configString);
+        }
+    }
+    writeState() {
+        // JSON-ify config and write to file
+        const configString = JSON.stringify(this.cidrBlock, null, 2);
+        fs.writeFileSync(this.configFile, configString);
+    }
+    getCidrBlock() {
+        for (const key in this.cidrBlock) {
+            if (this.cidrBlock[key]) {
+                return key;
+            }
+        }
+        return "0.0.0.0/8";
+    }
+    updateState(cidrBlock, status) {
+        this.cidrBlock[cidrBlock] = status;
+        this.writeState();
+    }
+}
+exports.default = CidrBlock;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q2lkci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy9nZXRDaWRyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUJBQXlCO0FBTXpCLE1BQXFCLFNBQVM7SUFJNUI7UUFGUSxlQUFVLEdBQUcscUJBQXFCLENBQUM7UUFHekMsa0RBQWtEO1FBQ2xELElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUNuQyxNQUFNLFlBQVksR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDL0QsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzVDLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7WUFDcEIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUM5QixJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUM7WUFDeEMsQ0FBQztZQUNELE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDN0QsRUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ2xELENBQUM7SUFDSCxDQUFDO0lBRUQsVUFBVTtRQUNSLG9DQUFvQztRQUNwQyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQzdELEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsWUFBWTtRQUNWLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2pDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUN4QixPQUFPLEdBQUcsQ0FBQztZQUNiLENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxXQUFXLENBQUM7SUFDckIsQ0FBQztJQUVELFdBQVcsQ0FBQyxTQUFpQixFQUFFLE1BQWU7UUFDNUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsR0FBRyxNQUFNLENBQUM7UUFDbkMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO0lBQ3BCLENBQUM7Q0FDRjtBQXRDRCw0QkFzQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBmcyBmcm9tIFwiZnNcIjtcblxuaW50ZXJmYWNlIGNpZHJUYWJsZSB7XG4gIFtrZXk6IHN0cmluZ106IGJvb2xlYW47XG59XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENpZHJCbG9jayB7XG4gIHByaXZhdGUgY2lkckJsb2NrOiBjaWRyVGFibGU7XG4gIHByaXZhdGUgY29uZmlnRmlsZSA9IFwiLi4vY2lkci1jb25maWcuanNvblwiO1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIC8vIEltcG9ydCBjb25maWcsIG9yIGNyZWF0ZSBpdCBpZiBpdCBkb2Vzbid0IGV4aXN0XG4gICAgaWYgKGZzLmV4aXN0c1N5bmModGhpcy5jb25maWdGaWxlKSkge1xuICAgICAgY29uc3QgY29uZmlnU3RyaW5nID0gZnMucmVhZEZpbGVTeW5jKHRoaXMuY29uZmlnRmlsZSwgXCJ1dGYtOFwiKTtcbiAgICAgIHRoaXMuY2lkckJsb2NrID0gSlNPTi5wYXJzZShjb25maWdTdHJpbmcpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aGlzLmNpZHJCbG9jayA9IHt9O1xuICAgICAgZm9yIChsZXQgaSA9IDE7IGkgPD0gMjU1OyBpKyspIHtcbiAgICAgICAgdGhpcy5jaWRyQmxvY2tbYCR7aX0uMC4wLjAvOGBdID0gdHJ1ZTtcbiAgICAgIH1cbiAgICAgIGNvbnN0IGNvbmZpZ1N0cmluZyA9IEpTT04uc3RyaW5naWZ5KHRoaXMuY2lkckJsb2NrLCBudWxsLCAyKTtcbiAgICAgIGZzLndyaXRlRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBjb25maWdTdHJpbmcpO1xuICAgIH1cbiAgfVxuXG4gIHdyaXRlU3RhdGUoKSB7XG4gICAgLy8gSlNPTi1pZnkgY29uZmlnIGFuZCB3cml0ZSB0byBmaWxlXG4gICAgY29uc3QgY29uZmlnU3RyaW5nID0gSlNPTi5zdHJpbmdpZnkodGhpcy5jaWRyQmxvY2ssIG51bGwsIDIpO1xuICAgIGZzLndyaXRlRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBjb25maWdTdHJpbmcpO1xuICB9XG5cbiAgZ2V0Q2lkckJsb2NrKCkge1xuICAgIGZvciAoY29uc3Qga2V5IGluIHRoaXMuY2lkckJsb2NrKSB7XG4gICAgICBpZiAodGhpcy5jaWRyQmxvY2tba2V5XSkge1xuICAgICAgICByZXR1cm4ga2V5O1xuICAgICAgfVxuICAgIH1cbiAgICByZXR1cm4gXCIwLjAuMC4wLzhcIjtcbiAgfVxuXG4gIHVwZGF0ZVN0YXRlKGNpZHJCbG9jazogc3RyaW5nLCBzdGF0dXM6IGJvb2xlYW4pIHtcbiAgICB0aGlzLmNpZHJCbG9ja1tjaWRyQmxvY2tdID0gc3RhdHVzO1xuICAgIHRoaXMud3JpdGVTdGF0ZSgpO1xuICB9XG59XG4iXX0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "0.55.1",
+  "version": "0.57.0",
   "bin": {
     "infrastructure": "bin/infrastructure.js"
   },
@@ -35,7 +35,7 @@
   "dependencies": {
     "@aws-sdk/client-cost-explorer": "^3.717.0",
     "@aws-sdk/client-organizations": "^3.716.0",
-    "@fjall/util": "^0.55.1",
+    "@fjall/util": "^0.57.0",
     "@pepperize/cdk-organizations": "^0.7.135",
     "cdk-time-sleep": "^1.0.0",
     "constructs": "^10.0.0",
@@ -45,7 +45,7 @@
   "overrides": {
     "@smithy/core": "2.5.5"
   },
-  "gitHead": "9e512dc3a9239025e5a384994f8edd64cd96b486",
+  "gitHead": "da72bca35a3e4bba2164e6dd52f7c912ef379902",
   "peerDependencies": {
     "aws-cdk": "^2.206.0",
     "aws-cdk-lib": "^2.206.0",