@fjall/components-infrastructure 0.19.1 → 0.20.0

package/dist/lib/app.d.ts

@@ -1,7 +1,7 @@
 import { App as CdkApp } from "aws-cdk-lib";
 import { Construct } from "constructs";
+import { IVpc } from "aws-cdk-lib/aws-ec2";
 import { AwsStack } from "./resources";
-import { Vpc } from "./resources/aws/networking/vpc";
 import { Ecr } from "./resources/aws/storage/ecr";
 import { Storage } from "./patterns/aws/storage";
 /**
@@ -15,6 +15,7 @@ export declare class App extends CdkApp {
     private stacks;
     private defaultVpc;
     private defaultEcr;
+    private existingVpcId?;
     private constructor();
     /**
      * Get/Create a basic Fjall Application
@@ -52,7 +53,12 @@ export declare class App extends CdkApp {
      * Retrieve default vpc. If the VPC does not exist it will be created.
      * @returns {Vpc}
      */
-    getDefaultVpc(): Vpc;
+    getDefaultVpc(): IVpc;
+    /**
+     * Reuse an existing VPC.
+     * Accepts either a Vpc object or a plain VPC ID string for convenience.
+     */
+    useExistingVpc(vpcId: string): void;
     /**
      * Retreive the default application container registry. If the registry does not exist
      *  it will be created.

package/dist/lib/app.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.App = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const resources_1 = require("./resources");
 const vpc_1 = require("./resources/aws/networking/vpc");
+const resources_1 = require("./resources");
 const ecr_1 = require("./resources/aws/storage/ecr");
 /**
  * The basic corner-stone of all Fjall-hosted applications.
@@ -81,12 +81,40 @@ class App extends aws_cdk_lib_1.App {
     getDefaultVpc() {
         var networkStack = this.getDefaultNetworkStack();
         if (!this.defaultVpc) {
-            this.defaultVpc = vpc_1.VpcFactory.build(`${this.name}DefaultVpc`, {
-                tags: {}
-            })(this, networkStack.getStack());
+            // Use an existing imported VPC if one was supplied
+            if (this.existingVpcId) {
+                this.defaultVpc = vpc_1.Vpc.fromLookup(networkStack.getStack(), `${this.name}ImportedVpc`, { vpcId: this.existingVpcId });
+            }
+            else {
+                // Attempt to automatically derive the account and region from the
+                // environment the CDK is running in. When an account ID is available,
+                // use it to import the corresponding IPAM pool so CIDRs are allocated
+                // from a central pool instead of using the default 10.0.0.0/16 block.
+                const accountId = process.env.CDK_DEFAULT_ACCOUNT;
+                const region = process.env.CDK_DEFAULT_REGION;
+                const ipv4IpamPoolId = accountId
+                    ? aws_cdk_lib_1.Fn.importValue(`IpamPoolId${accountId}`)
+                    : undefined;
+                this.defaultVpc = vpc_1.VpcFactory.build(`${this.name}DefaultVpc`, {
+                    accountId,
+                    region,
+                    ipv4IpamPoolId,
+                    tags: {}
+                })(this, networkStack.getStack());
+            }
         }
         return this.defaultVpc;
     }
+    /**
+     * Reuse an existing VPC.
+     * Accepts either a Vpc object or a plain VPC ID string for convenience.
+     */
+    useExistingVpc(vpcId) {
+        if (this.defaultVpc) {
+            throw new Error("useExistingVpc must be called before the default VPC has been created");
+        }
+        this.existingVpcId = vpcId;
+    }
     /**
      * Retreive the default application container registry. If the registry does not exist
      *  it will be created.
@@ -132,4 +160,4 @@ class App extends aws_cdk_lib_1.App {
 exports.App = App;
 App.instance = null;
 exports.default = App;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"app.js","sourceRoot":"","sources":["../../lib/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { App as CdkApp } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\nimport { AwsStack } from \"./resources\";\nimport { Vpc, VpcFactory } from \"./resources/aws/networking/vpc\";\nimport { Ecr, EcrFactory } from \"./resources/aws/storage/ecr\";\n\nimport { Storage } from \"./patterns/aws/storage\";\n\n/**\n * The basic corner-stone of all Fjall-hosted applications.\n *  This class is a singleton and should be used to create and manage\n *   all resources in a Fjall application.\n */\nexport class App extends CdkApp {\n  private static instance: App | null = null;\n\n  private name: string;\n  private stacks: { [key: string]: AwsStack } = {};\n\n  private defaultVpc: Vpc;\n  private defaultEcr: Ecr;\n\n  private constructor(name?: string) {\n    super();\n\n    if (name) this.name = name;\n    else this.name = \"FjallApp\";\n  }\n\n  /**\n   * Get/Create a basic Fjall Application\n   * @param name\n   * @returns {App}\n   */\n  public static getApp(name?: string): App {\n    return App.getInstance(name);\n  }\n\n  /**\n   * Get/Create the singleton instance of the App\n   * @param name\n   * @returns {App}\n   */\n  public static getInstance(name?: string): App {\n    // Despite supporting multiple stacks you can still only ever\n    // have a single Application per CDK deployment\n    if (!App.instance) {\n      App.instance = new App(name);\n    }\n\n    return App.instance;\n  }\n\n  /**\n   * Retrieve a stack by key. If the stack does not exist, it will be created.\n   *  Dependencies are only applied the first time a stack is created.\n   *\n   * @param key - The key of the stack\n   * @param dependencies - The stack(s) that this stack depends on\n   * @returns {AwsStack}\n   */\n  public getStack(key: string, dependencies?: AwsStack | AwsStack[]): AwsStack {\n    if (!this.stacks[key]) {\n      this.stacks[key] = new AwsStack(key, dependencies);\n    }\n\n    return this.stacks[key];\n  }\n\n  /**\n   * Retrieve default compute stack - named as `${this.name}Compute`\n   * @returns {AwsStack}\n   */\n  public getDefaultComputeStack(): AwsStack {\n    return this.getStack(`${this.name}Compute`, [\n      this.getDefaultNetworkStack(),\n      this.getDefaultStorageStack()\n    ]);\n  }\n\n  /**\n   * Retrieve default network stack - named as `${this.name}Network`\n   * @returns {AwsStack}\n   */\n  public getDefaultNetworkStack(): AwsStack {\n    return this.getStack(`${this.name}Network`);\n  }\n\n  public getDefaultStorageStack(): AwsStack {\n    return this.getStack(`${this.name}Storage`, this.getDefaultNetworkStack());\n  }\n\n  /**\n   * Retrieve default vpc. If the VPC does not exist it will be created.\n   * @returns {Vpc}\n   */\n  public getDefaultVpc(): Vpc {\n    var networkStack = this.getDefaultNetworkStack();\n\n    if (!this.defaultVpc) {\n      this.defaultVpc = VpcFactory.build(`${this.name}DefaultVpc`, {\n        tags: {}\n      })(this, networkStack.getStack());\n    }\n\n    return this.defaultVpc;\n  }\n\n  /**\n   * Retreive the default application container registry. If the registry does not exist\n   *  it will be created.\n   */\n  public getDefaultContainerRegistry(): Ecr {\n    if (!this.defaultEcr) {\n      var networkStack = this.getDefaultNetworkStack();\n\n      this.defaultEcr = EcrFactory.build(`${this.name}Ecr`)(\n        this,\n        networkStack.getStack()\n      );\n    }\n\n    return this.defaultEcr;\n  }\n\n  /**\n   * Add a compute resource to the default compute stack using the factory pattern.\n   */\n  public addCompute(fn: (app: App, scope: Construct) => Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(fn(this, computeStack.getStack()));\n  }\n\n  /**\n   * Manually add a resource to the default compute stack.\n   */\n  public addComputeResource(resource: Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(resource);\n  }\n\n  /**\n   *  Add a storage resource to the default storage stack using the factory pattern.\n   */\n  public addStorage(fn: (app: App, scope: Construct) => Construct): Storage {\n    const storageStack = this.getDefaultStorageStack();\n    const storageConstruct = fn(this, storageStack.getStack());\n    storageStack.addConstruct(storageConstruct);\n\n    return storageConstruct as unknown as Storage;\n  }\n\n  /**\n   * Manually add a resource to the default storage stack.\n   */\n  public addStorageResource(resource: Construct): void {\n    const storageStack = this.getDefaultStorageStack();\n    storageStack.addConstruct(resource);\n  }\n}\n\nexport default App;\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"app.js","sourceRoot":"","sources":["../../lib/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { App as CdkApp, Fn } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { Vpc, VpcFactory } from \"./resources/aws/networking/vpc\";\nimport { IVpc } from \"aws-cdk-lib/aws-ec2\";\n\nimport { AwsStack } from \"./resources\";\nimport { Ecr, EcrFactory } from \"./resources/aws/storage/ecr\";\n\nimport { Storage } from \"./patterns/aws/storage\";\n\n/**\n * The basic corner-stone of all Fjall-hosted applications.\n *  This class is a singleton and should be used to create and manage\n *   all resources in a Fjall application.\n */\nexport class App extends CdkApp {\n  private static instance: App | null = null;\n\n  private name: string;\n  private stacks: { [key: string]: AwsStack } = {};\n\n  private defaultVpc: IVpc;\n  private defaultEcr: Ecr;\n  private existingVpcId?: string;\n\n  private constructor(name?: string) {\n    super();\n\n    if (name) this.name = name;\n    else this.name = \"FjallApp\";\n  }\n\n  /**\n   * Get/Create a basic Fjall Application\n   * @param name\n   * @returns {App}\n   */\n  public static getApp(name?: string): App {\n    return App.getInstance(name);\n  }\n\n  /**\n   * Get/Create the singleton instance of the App\n   * @param name\n   * @returns {App}\n   */\n  public static getInstance(name?: string): App {\n    // Despite supporting multiple stacks you can still only ever\n    // have a single Application per CDK deployment\n    if (!App.instance) {\n      App.instance = new App(name);\n    }\n\n    return App.instance;\n  }\n\n  /**\n   * Retrieve a stack by key. If the stack does not exist, it will be created.\n   *  Dependencies are only applied the first time a stack is created.\n   *\n   * @param key - The key of the stack\n   * @param dependencies - The stack(s) that this stack depends on\n   * @returns {AwsStack}\n   */\n  public getStack(key: string, dependencies?: AwsStack | AwsStack[]): AwsStack {\n    if (!this.stacks[key]) {\n      this.stacks[key] = new AwsStack(key, dependencies);\n    }\n\n    return this.stacks[key];\n  }\n\n  /**\n   * Retrieve default compute stack - named as `${this.name}Compute`\n   * @returns {AwsStack}\n   */\n  public getDefaultComputeStack(): AwsStack {\n    return this.getStack(`${this.name}Compute`, [\n      this.getDefaultNetworkStack(),\n      this.getDefaultStorageStack()\n    ]);\n  }\n\n  /**\n   * Retrieve default network stack - named as `${this.name}Network`\n   * @returns {AwsStack}\n   */\n  public getDefaultNetworkStack(): AwsStack {\n    return this.getStack(`${this.name}Network`);\n  }\n\n  public getDefaultStorageStack(): AwsStack {\n    return this.getStack(`${this.name}Storage`, this.getDefaultNetworkStack());\n  }\n\n  /**\n   * Retrieve default vpc. If the VPC does not exist it will be created.\n   * @returns {Vpc}\n   */\n  public getDefaultVpc(): IVpc {\n    var networkStack = this.getDefaultNetworkStack();\n\n    if (!this.defaultVpc) {\n      // Use an existing imported VPC if one was supplied\n      if (this.existingVpcId) {\n        this.defaultVpc = Vpc.fromLookup(\n          networkStack.getStack(),\n          `${this.name}ImportedVpc`,\n          { vpcId: this.existingVpcId }\n        );\n      } else {\n        // Attempt to automatically derive the account and region from the\n        // environment the CDK is running in. When an account ID is available,\n        // use it to import the corresponding IPAM pool so CIDRs are allocated\n        // from a central pool instead of using the default 10.0.0.0/16 block.\n\n        const accountId = process.env.CDK_DEFAULT_ACCOUNT;\n        const region = process.env.CDK_DEFAULT_REGION;\n\n        const ipv4IpamPoolId = accountId\n          ? Fn.importValue(`IpamPoolId${accountId}`)\n          : undefined;\n\n        this.defaultVpc = VpcFactory.build(`${this.name}DefaultVpc`, {\n          accountId,\n          region,\n          ipv4IpamPoolId,\n          tags: {}\n        })(this, networkStack.getStack());\n      }\n    }\n\n    return this.defaultVpc;\n  }\n\n  /**\n   * Reuse an existing VPC.\n   * Accepts either a Vpc object or a plain VPC ID string for convenience.\n   */\n  public useExistingVpc(vpcId: string): void {\n    if (this.defaultVpc) {\n      throw new Error(\n        \"useExistingVpc must be called before the default VPC has been created\"\n      );\n    }\n\n    this.existingVpcId = vpcId;\n  }\n\n  /**\n   * Retreive the default application container registry. If the registry does not exist\n   *  it will be created.\n   */\n  public getDefaultContainerRegistry(): Ecr {\n    if (!this.defaultEcr) {\n      var networkStack = this.getDefaultNetworkStack();\n\n      this.defaultEcr = EcrFactory.build(`${this.name}Ecr`)(\n        this,\n        networkStack.getStack()\n      );\n    }\n\n    return this.defaultEcr;\n  }\n\n  /**\n   * Add a compute resource to the default compute stack using the factory pattern.\n   */\n  public addCompute(fn: (app: App, scope: Construct) => Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(fn(this, computeStack.getStack()));\n  }\n\n  /**\n   * Manually add a resource to the default compute stack.\n   */\n  public addComputeResource(resource: Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(resource);\n  }\n\n  /**\n   *  Add a storage resource to the default storage stack using the factory pattern.\n   */\n  public addStorage(fn: (app: App, scope: Construct) => Construct): Storage {\n    const storageStack = this.getDefaultStorageStack();\n    const storageConstruct = fn(this, storageStack.getStack());\n    storageStack.addConstruct(storageConstruct);\n\n    return storageConstruct as unknown as Storage;\n  }\n\n  /**\n   * Manually add a resource to the default storage stack.\n   */\n  public addStorageResource(resource: Construct): void {\n    const storageStack = this.getDefaultStorageStack();\n    storageStack.addConstruct(resource);\n  }\n}\n\nexport default App;\n"]}

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

@@ -1,13 +1,15 @@
 import { RepositoryImage } from "aws-cdk-lib/aws-ecs";
 import { Repository } from "aws-cdk-lib/aws-ecr";
-import { Connections, IConnectable, IVpc } from "aws-cdk-lib/aws-ec2";
+import { Connections, IConnectable, IVpc, UserData, IMachineImage } from "aws-cdk-lib/aws-ec2";
 import { Construct } from "constructs";
 import App from "../../app";
 import { DomainConfig } from "../../resources/aws/compute/ecs";
+import { KeyValue } from "../../types";
 import { SecretImport } from "../../resources/aws/secrets";
 interface IComputeProps {
     vpc?: IVpc;
     ecrRepository?: Repository | RepositoryImage;
+    type?: "ecs" | "ec2";
     parentDomain?: string;
     domainConfig?: DomainConfig;
     /**
@@ -27,6 +29,13 @@ interface IComputeProps {
     containerSecretsImport?: {
         [key: string]: SecretImport;
     };
+    instanceType?: string;
+    enableSSH?: boolean;
+    userData?: UserData;
+    machineImage?: IMachineImage;
+    minCapacity?: number;
+    maxCapacity?: number;
+    tags?: KeyValue;
     connections?: IConnectable[];
 }
 export declare class ComputeFactory {
@@ -40,5 +49,7 @@ export declare class Compute extends Construct implements IConnectable {
     private compute;
     constructor(scope: Construct, id: string, props: IComputeProps);
     addCompute(props: IComputeProps): void;
+    private addEc2Compute;
+    private addEcsCompute;
 }
 export {};

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

@@ -4,6 +4,7 @@ exports.Compute = exports.ComputeFactory = void 0;
 const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
 const constructs_1 = require("constructs");
 const ecs_1 = require("../../resources/aws/compute/ecs");
+const ec2_1 = require("../../resources/aws/compute/ec2");
 class ComputeFactory {
     static build(id, props) {
         return (app, scope) => {
@@ -27,10 +28,39 @@ class Compute extends constructs_1.Construct {
         this.addCompute(props);
     }
     addCompute(props) {
+        const computeType = props.type || "ecs";
+        if (computeType === "ec2") {
+            this.addEc2Compute(props);
+        }
+        else {
+            this.addEcsCompute(props);
+        }
+    }
+    addEc2Compute(props) {
+        const ec2Props = {
+            serviceName: `${this.id}Service`,
+            instanceType: props.instanceType || "t3.micro",
+            enableSSH: props.enableSSH || false,
+            userData: props.userData,
+            machineImage: props.machineImage,
+            minCapcity: props.minCapacity || 1,
+            maxCapacity: props.maxCapacity || 1,
+            vpc: props.vpc,
+            tags: props.tags || {}
+        };
+        this.compute = new ec2_1.Ec2Instance(this.scope, `${this.id}Ec2`, ec2Props);
+        this.connections = this.compute.connections;
+        if (props.connections) {
+            for (var conn of props.connections) {
+                this.compute.connections.allowTo(conn, aws_ec2_1.Port.allTcp());
+            }
+        }
+    }
+    addEcsCompute(props) {
         const fargateProps = {
             ...props,
             ...{
-                tags: {}
+                tags: props.tags || {}
             },
             ...{
                 scalingType: ecs_1.ScalingType.CPU,
@@ -50,4 +80,4 @@ class Compute extends constructs_1.Construct {
     }
 }
 exports.Compute = Compute;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3MvY29tcHV0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxpREFNNkI7QUFFN0IsMkNBQXVDO0FBSXZDLHlEQU15QztBQW9DekMsTUFBYSxjQUFjO0lBQ3pCLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBVSxFQUFFLEtBQW9CO1FBQzNDLE9BQU8sQ0FBQyxHQUFRLEVBQUUsS0FBZ0IsRUFBRSxFQUFFO1lBQ3BDLE1BQU0sWUFBWSxHQUFHO2dCQUNuQixHQUFHO29CQUNELEdBQUcsRUFBRSxHQUFHLENBQUMsYUFBYSxFQUFFO29CQUN4QixhQUFhLEVBQUUsR0FBRyxDQUFDLDJCQUEyQixFQUFFO2lCQUNqRDtnQkFDRCxHQUFHLEtBQUs7YUFDVCxDQUFDO1lBRUYsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQzlDLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQWRELHdDQWNDO0FBRUQsTUFBYSxPQUFRLFNBQVEsc0JBQVM7SUFTcEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFFbkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN6QixDQUFDO0lBRUQsVUFBVSxDQUFDLEtBQW9CO1FBQzdCLE1BQU0sWUFBWSxHQUFHO1lBQ25CLEdBQUcsS0FBSztZQUNSLEdBQUc7Z0JBQ0QsSUFBSSxFQUFFLEVBQUU7YUFDVDtZQUNELEdBQUc7Z0JBQ0QsV0FBVyxFQUFFLGlCQUFXLENBQUMsR0FBRztnQkFDNUIsUUFBUSxFQUFFLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLGNBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLGNBQVEsQ0FBQyxJQUFJO2dCQUM3RCxhQUFhLEVBQUUsS0FBSyxDQUFDLGFBQWEsSUFBSSxFQUFFO2dCQUN4QyxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxTQUFTO2dCQUNoQyxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxTQUFTO2FBQ2pDO1NBQ3FCLENBQUM7UUFFekIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLGFBQWMsQ0FDL0IsSUFBSSxDQUFDLEtBQUssRUFDVixHQUFHLElBQUksQ0FBQyxFQUFFLFNBQVMsRUFDbkIsWUFBWSxDQUNiLENBQUM7UUFFRixJQUFJLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN0QixLQUFLLElBQUksSUFBSSxJQUFJLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDbkMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxjQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUN4RCxDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUM7SUFDOUMsQ0FBQztDQUNGO0FBOUNELDBCQThDQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlcG9zaXRvcnlJbWFnZSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWNzXCI7XG5pbXBvcnQgeyBSZXBvc2l0b3J5IH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1lY3JcIjtcbmltcG9ydCB7XG4gIENvbm5lY3Rpb25zLFxuICBJQ29ubmVjdGFibGUsXG4gIElWcGMsXG4gIFBvcnQsXG4gIFN1Ym5ldFR5cGVcbn0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcblxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuaW1wb3J0IEFwcCBmcm9tIFwiLi4vLi4vYXBwXCI7XG5cbmltcG9ydCBGYXJnYXRlQ2x1c3Rlciwge1xuICBDb250YWluZXJTZWNyZXQsXG4gIEZhcmdhdGVDbHVzdGVyUHJvcHMsXG4gIFByb3RvY29sLFxuICBTY2FsaW5nVHlwZSxcbiAgRG9tYWluQ29uZmlnXG59IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL2NvbXB1dGUvZWNzXCI7XG5pbXBvcnQgeyBLZXlWYWx1ZSB9IGZyb20gXCIuLi8uLi90eXBlc1wiO1xuaW1wb3J0IHsgU2VjcmV0SW1wb3J0IH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3Mvc2VjcmV0c1wiO1xuXG5pbnRlcmZhY2UgSUNvbXB1dGVQcm9wcyB7XG4gIHZwYz86IElWcGM7XG4gIGVjclJlcG9zaXRvcnk/OiBSZXBvc2l0b3J5IHwgUmVwb3NpdG9yeUltYWdlO1xuXG4gIC8vIE92ZXJyaWRhYmxlIHByb3BlcnRpZXMgdG8gY29uZmlndXJlIHRoZSBjcmVhdGVkIGNvbXB1dGUgcmVzb3VyY2VcbiAgcGFyZW50RG9tYWluPzogc3RyaW5nO1xuXG4gIGRvbWFpbkNvbmZpZz86IERvbWFpbkNvbmZpZztcblxuICAvKipcbiAgICogUG9ydCB0aGUgY29udGFpbmVyIGxpc3RlbnMgb24gKGRlZmF1bHQ6IDgwKVxuICAgKi9cbiAgY29udGFpbmVyUG9ydD86IG51bWJlcjtcblxuICAvKipcbiAgICogRW52aXJvbm1uZXQgdmFyaWFibGVzIHRvIHBhc3MgdG8gdGhlIGNvbnRhaW5lclxuICAgKi9cbiAgY29udGFpbmVyRW52aXJvbm1lbnQ/OiB7XG4gICAgW2tleTogc3RyaW5nXTogc3RyaW5nO1xuICB9O1xuXG4gIC8qKlxuICAgKiBTYWZlbHkgaW1wb3J0IHNlY3JldHMgZnJvbSBhbm90aGVyIHJlc291cmNlLFxuICAgKiAgb2JqZWN0IGtleSBpcyB1c2VkIGFzIG5hbWUgd2hlbiBwYXNzaW5nIHRvIGNvbnRhaW5lclxuICAgKi9cbiAgY29udGFpbmVyU2VjcmV0c0ltcG9ydD86IHtcbiAgICBba2V5OiBzdHJpbmddOiBTZWNyZXRJbXBvcnQ7XG4gIH07XG5cbiAgY29ubmVjdGlvbnM/OiBJQ29ubmVjdGFibGVbXTtcbn1cblxuZXhwb3J0IGNsYXNzIENvbXB1dGVGYWN0b3J5IHtcbiAgc3RhdGljIGJ1aWxkKGlkOiBzdHJpbmcsIHByb3BzOiBJQ29tcHV0ZVByb3BzKSB7XG4gICAgcmV0dXJuIChhcHA6IEFwcCwgc2NvcGU6IENvbnN0cnVjdCkgPT4ge1xuICAgICAgY29uc3QgY29tcHV0ZVByb3BzID0ge1xuICAgICAgICAuLi57XG4gICAgICAgICAgdnBjOiBhcHAuZ2V0RGVmYXVsdFZwYygpLFxuICAgICAgICAgIGVjclJlcG9zaXRvcnk6IGFwcC5nZXREZWZhdWx0Q29udGFpbmVyUmVnaXN0cnkoKVxuICAgICAgICB9LFxuICAgICAgICAuLi5wcm9wc1xuICAgICAgfTtcblxuICAgICAgcmV0dXJuIG5ldyBDb21wdXRlKHNjb3BlLCBpZCwgY29tcHV0ZVByb3BzKTtcbiAgICB9O1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBDb21wdXRlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSUNvbm5lY3RhYmxlIHtcbiAgcHVibGljIGlkOiBzdHJpbmc7XG4gIHB1YmxpYyBzY29wZTogQ29uc3RydWN0O1xuICBwdWJsaWMgdnBjOiBJVnBjO1xuXG4gIHB1YmxpYyBjb25uZWN0aW9uczogQ29ubmVjdGlvbnM7XG5cbiAgcHJpdmF0ZSBjb21wdXRlOiBGYXJnYXRlQ2x1c3RlcjtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSUNvbXB1dGVQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgdGhpcy5pZCA9IGlkO1xuICAgIHRoaXMuc2NvcGUgPSBzY29wZTtcblxuICAgIHRoaXMuYWRkQ29tcHV0ZShwcm9wcyk7XG4gIH1cblxuICBhZGRDb21wdXRlKHByb3BzOiBJQ29tcHV0ZVByb3BzKSB7XG4gICAgY29uc3QgZmFyZ2F0ZVByb3BzID0ge1xuICAgICAgLi4ucHJvcHMsXG4gICAgICAuLi57XG4gICAgICAgIHRhZ3M6IHt9XG4gICAgICB9LFxuICAgICAgLi4ue1xuICAgICAgICBzY2FsaW5nVHlwZTogU2NhbGluZ1R5cGUuQ1BVLFxuICAgICAgICBwcm90b2NvbDogcHJvcHMuZG9tYWluQ29uZmlnID8gUHJvdG9jb2wuSFRUUFMgOiBQcm90b2NvbC5IVFRQLFxuICAgICAgICBjb250YWluZXJQb3J0OiBwcm9wcy5jb250YWluZXJQb3J0IHx8IDgwLFxuICAgICAgICBzZXJ2aWNlTmFtZTogYCR7dGhpcy5pZH1TZXJ2aWNlYCxcbiAgICAgICAgY2x1c3Rlck5hbWU6IGAke3RoaXMuaWR9Q2x1c3RlcmBcbiAgICAgIH1cbiAgICB9IGFzIEZhcmdhdGVDbHVzdGVyUHJvcHM7XG5cbiAgICB0aGlzLmNvbXB1dGUgPSBuZXcgRmFyZ2F0ZUNsdXN0ZXIoXG4gICAgICB0aGlzLnNjb3BlLFxuICAgICAgYCR7dGhpcy5pZH1GYXJnYXRlYCxcbiAgICAgIGZhcmdhdGVQcm9wc1xuICAgICk7XG5cbiAgICBpZiAocHJvcHMuY29ubmVjdGlvbnMpIHtcbiAgICAgIGZvciAodmFyIGNvbm4gb2YgcHJvcHMuY29ubmVjdGlvbnMpIHtcbiAgICAgICAgdGhpcy5jb21wdXRlLmNvbm5lY3Rpb25zLmFsbG93VG8oY29ubiwgUG9ydC5hbGxUY3AoKSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgdGhpcy5jb25uZWN0aW9ucyA9IHRoaXMuY29tcHV0ZS5jb25uZWN0aW9ucztcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compute.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/compute.ts"],"names":[],"mappings":"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","sourcesContent":["import { RepositoryImage } from \"aws-cdk-lib/aws-ecs\";\nimport { Repository } from \"aws-cdk-lib/aws-ecr\";\nimport {\n  Connections,\n  IConnectable,\n  IVpc,\n  Port,\n  SubnetType,\n  UserData,\n  IMachineImage\n} from \"aws-cdk-lib/aws-ec2\";\n\nimport { Construct } from \"constructs\";\n\nimport App from \"../../app\";\n\nimport FargateCluster, {\n  ContainerSecret,\n  FargateClusterProps,\n  Protocol,\n  ScalingType,\n  DomainConfig\n} from \"../../resources/aws/compute/ecs\";\nimport { Ec2Instance } from \"../../resources/aws/compute/ec2\";\nimport { KeyValue } from \"../../types\";\nimport { SecretImport } from \"../../resources/aws/secrets\";\n\ninterface IComputeProps {\n  vpc?: IVpc;\n  ecrRepository?: Repository | RepositoryImage;\n\n  // Compute type selection\n  type?: \"ecs\" | \"ec2\";\n\n  // ECS-specific properties\n  parentDomain?: string;\n  domainConfig?: DomainConfig;\n\n  /**\n   * Port the container listens on (default: 80)\n   */\n  containerPort?: number;\n\n  /**\n   * Environmnet variables to pass to the container\n   */\n  containerEnvironment?: {\n    [key: string]: string;\n  };\n\n  /**\n   * Safely import secrets from another resource,\n   *  object key is used as name when passing to container\n   */\n  containerSecretsImport?: {\n    [key: string]: SecretImport;\n  };\n\n  // EC2-specific properties\n  instanceType?: string;\n  enableSSH?: boolean;\n  userData?: UserData;\n  machineImage?: IMachineImage;\n  minCapacity?: number;\n  maxCapacity?: number;\n  tags?: KeyValue;\n\n  connections?: IConnectable[];\n}\n\nexport class ComputeFactory {\n  static build(id: string, props: IComputeProps) {\n    return (app: App, scope: Construct) => {\n      const computeProps = {\n        ...{\n          vpc: app.getDefaultVpc(),\n          ecrRepository: app.getDefaultContainerRegistry()\n        },\n        ...props\n      };\n\n      return new Compute(scope, id, computeProps);\n    };\n  }\n}\n\nexport class Compute extends Construct implements IConnectable {\n  public id: string;\n  public scope: Construct;\n  public vpc: IVpc;\n\n  public connections: Connections;\n\n  private compute: FargateCluster | Ec2Instance;\n\n  constructor(scope: Construct, id: string, props: IComputeProps) {\n    super(scope, id);\n    this.id = id;\n    this.scope = scope;\n\n    this.addCompute(props);\n  }\n\n  addCompute(props: IComputeProps) {\n    const computeType = props.type || \"ecs\";\n\n    if (computeType === \"ec2\") {\n      this.addEc2Compute(props);\n    } else {\n      this.addEcsCompute(props);\n    }\n  }\n\n  private addEc2Compute(props: IComputeProps) {\n    const ec2Props = {\n      serviceName: `${this.id}Service`,\n      instanceType: props.instanceType || \"t3.micro\",\n      enableSSH: props.enableSSH || false,\n      userData: props.userData,\n      machineImage: props.machineImage,\n      minCapcity: props.minCapacity || 1,\n      maxCapacity: props.maxCapacity || 1,\n      vpc: props.vpc,\n      tags: props.tags || {}\n    };\n\n    this.compute = new Ec2Instance(this.scope, `${this.id}Ec2`, ec2Props);\n    this.connections = this.compute.connections;\n\n    if (props.connections) {\n      for (var conn of props.connections) {\n        this.compute.connections.allowTo(conn, Port.allTcp());\n      }\n    }\n  }\n\n  private addEcsCompute(props: IComputeProps) {\n    const fargateProps = {\n      ...props,\n      ...{\n        tags: props.tags || {}\n      },\n      ...{\n        scalingType: ScalingType.CPU,\n        protocol: props.domainConfig ? Protocol.HTTPS : Protocol.HTTP,\n        containerPort: props.containerPort || 80,\n        serviceName: `${this.id}Service`,\n        clusterName: `${this.id}Cluster`\n      }\n    } as FargateClusterProps;\n\n    this.compute = new FargateCluster(\n      this.scope,\n      `${this.id}Fargate`,\n      fargateProps\n    );\n\n    if (props.connections) {\n      for (var conn of props.connections) {\n        this.compute.connections.allowTo(conn, Port.allTcp());\n      }\n    }\n\n    this.connections = this.compute.connections;\n  }\n}\n"]}

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

@@ -2,9 +2,10 @@ import { Stack, StackProps } from "aws-cdk-lib";
 import { Construct } from "constructs";
 import { KeyValue } from "../../types";
 import { Connections } from "aws-cdk-lib/aws-ec2";
+import { IVpc } from "aws-cdk-lib/aws-ec2";
 interface ProxyAgentProps extends StackProps {
     accountId?: string;
-    vpcId?: string;
+    vpc?: IVpc;
     publicKey: string;
     enableSSH?: boolean;
     instanceType: string;

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

@@ -12,7 +12,7 @@ class FivetranProxy extends aws_cdk_lib_1.Stack {
         new ec2_1.Ec2Instance(this, "FivetranProxy", {
             accountId: props.accountId,
             serviceName: "fivetranProxy",
-            vpcId: props.vpcId,
+            vpc: props.vpc,
             instanceType: props.instanceType || "t2.micro",
             enableSSH: props.enableSSH || true,
             env: {
@@ -30,4 +30,4 @@ class FivetranProxy extends aws_cdk_lib_1.Stack {
     }
 }
 exports.FivetranProxy = FivetranProxy;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml2ZXRyYW5Qcm94eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3MvZml2ZXRyYW5Qcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBZ0Q7QUFDaEQseURBQThEO0FBRzlELGlEQUE0RDtBQVk1RCxNQUFhLGFBQWMsU0FBUSxtQkFBSztJQUN0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXNCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXhCLE1BQU0sUUFBUSxHQUFHLGtCQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFFckMsUUFBUSxDQUFDLFdBQVcsQ0FDbEIsbUJBQW1CLEVBQ25CLGlDQUFpQyxFQUNqQyw4QkFBOEIsRUFDOUIsNkNBQTZDLEVBQzdDLCtCQUErQixFQUMvQixTQUFTLEtBQUssQ0FBQyxTQUFTLHlDQUF5QyxFQUNqRSw2REFBNkQsRUFDN0QsK0NBQStDLENBQ2hELENBQUM7UUFFRixJQUFJLGlCQUFXLENBQUMsSUFBSSxFQUFFLGVBQWUsRUFBRTtZQUNyQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVM7WUFDMUIsV0FBVyxFQUFFLGVBQWU7WUFDNUIsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLO1lBQ2xCLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWSxJQUFJLFVBQVU7WUFDOUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxTQUFTLElBQUksSUFBSTtZQUNsQyxHQUFHLEVBQUU7Z0JBQ0gsT0FBTyxFQUFFLEtBQUssQ0FBQyxHQUFHLEVBQUUsT0FBTztnQkFDM0IsTUFBTSxFQUFFLEtBQUssQ0FBQyxHQUFHLEVBQUUsTUFBTTthQUMxQjtZQUNELFFBQVEsRUFBRSxRQUFRO1lBQ2xCLElBQUksRUFBRTtnQkFDSixHQUFHLEtBQUssQ0FBQyxJQUFJO2dCQUNiLGtDQUFrQyxFQUFFLFlBQVk7Z0JBQ2hELDhCQUE4QixFQUFFLFVBQVU7Z0JBQzFDLDRCQUE0QixFQUFFLE1BQU07YUFDckM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFwQ0Qsc0NBb0NDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3RhY2ssIFN0YWNrUHJvcHMgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IEVjMkluc3RhbmNlIH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvY29tcHV0ZS9lYzJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBLZXlWYWx1ZSB9IGZyb20gXCIuLi8uLi90eXBlc1wiO1xuaW1wb3J0IHsgQ29ubmVjdGlvbnMsIFVzZXJEYXRhIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcblxuaW50ZXJmYWNlIFByb3h5QWdlbnRQcm9wcyBleHRlbmRzIFN0YWNrUHJvcHMge1xuICBhY2NvdW50SWQ/OiBzdHJpbmc7XG4gIHZwY0lkPzogc3RyaW5nO1xuICBwdWJsaWNLZXk6IHN0cmluZztcbiAgZW5hYmxlU1NIPzogYm9vbGVhbjtcbiAgaW5zdGFuY2VUeXBlOiBzdHJpbmc7XG4gIGRhdGFiYXNlQ29ubmVjdGlvbj86IENvbm5lY3Rpb25zO1xuICB0YWdzPzogS2V5VmFsdWU7XG59XG5cbmV4cG9ydCBjbGFzcyBGaXZldHJhblByb3h5IGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogUHJveHlBZ2VudFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCBwcm9wcyk7XG5cbiAgICBjb25zdCB1c2VyRGF0YSA9IFVzZXJEYXRhLmZvckxpbnV4KCk7XG5cbiAgICB1c2VyRGF0YS5hZGRDb21tYW5kcyhcbiAgICAgIFwiZ3JvdXBhZGQgZml2ZXRyYW5cIixcbiAgICAgIFwidXNlcmFkZCAtbSAtZyBmaXZldHJhbiBmaXZldHJhblwiLFxuICAgICAgXCJta2RpciAtcCAvaG9tZS9maXZldHJhbi8uc3NoXCIsXG4gICAgICBcImNob3duIGZpdmV0cmFuOmZpdmV0cmFuIC9ob21lL2ZpdmV0cmFuLy5zc2hcIixcbiAgICAgIFwiY2htb2QgNzAwIC9ob21lL2ZpdmV0cmFuLy5zc2hcIixcbiAgICAgIGBlY2hvIFwiJHtwcm9wcy5wdWJsaWNLZXl9XCIgPiAvaG9tZS9maXZldHJhbi8uc3NoL2F1dGhvcml6ZWRfa2V5c2AsXG4gICAgICBcImNob3duIGZpdmV0cmFuOmZpdmV0cmFuIC9ob21lL2ZpdmV0cmFuLy5zc2gvYXV0aG9yaXplZF9rZXlzXCIsXG4gICAgICBcImNobW9kIDYwMCAvaG9tZS9maXZldHJhbi8uc3NoL2F1dGhvcml6ZWRfa2V5c1wiXG4gICAgKTtcblxuICAgIG5ldyBFYzJJbnN0YW5jZSh0aGlzLCBcIkZpdmV0cmFuUHJveHlcIiwge1xuICAgICAgYWNjb3VudElkOiBwcm9wcy5hY2NvdW50SWQsXG4gICAgICBzZXJ2aWNlTmFtZTogXCJmaXZldHJhblByb3h5XCIsXG4gICAgICB2cGNJZDogcHJvcHMudnBjSWQsXG4gICAgICBpbnN0YW5jZVR5cGU6IHByb3BzLmluc3RhbmNlVHlwZSB8fCBcInQyLm1pY3JvXCIsXG4gICAgICBlbmFibGVTU0g6IHByb3BzLmVuYWJsZVNTSCB8fCB0cnVlLFxuICAgICAgZW52OiB7XG4gICAgICAgIGFjY291bnQ6IHByb3BzLmVudj8uYWNjb3VudCxcbiAgICAgICAgcmVnaW9uOiBwcm9wcy5lbnY/LnJlZ2lvblxuICAgICAgfSxcbiAgICAgIHVzZXJEYXRhOiB1c2VyRGF0YSxcbiAgICAgIHRhZ3M6IHtcbiAgICAgICAgLi4ucHJvcHMudGFncyxcbiAgICAgICAgXCJmamFsbDpjb3N0QWxsb2NhdGlvbjplbnZpcm9ubWVudFwiOiBcInByb2R1Y3Rpb25cIixcbiAgICAgICAgXCJmamFsbDpjb3N0QWxsb2NhdGlvbjpzZXJ2aWNlXCI6IFwiZml2ZXRyYW5cIixcbiAgICAgICAgXCJmamFsbDpjb3N0QWxsb2NhdGlvbjpvd25lclwiOiBcImRhdGFcIlxuICAgICAgfVxuICAgIH0pO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml2ZXRyYW5Qcm94eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3MvZml2ZXRyYW5Qcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBZ0Q7QUFDaEQseURBQThEO0FBRzlELGlEQUE0RDtBQWE1RCxNQUFhLGFBQWMsU0FBUSxtQkFBSztJQUN0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXNCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXhCLE1BQU0sUUFBUSxHQUFHLGtCQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFFckMsUUFBUSxDQUFDLFdBQVcsQ0FDbEIsbUJBQW1CLEVBQ25CLGlDQUFpQyxFQUNqQyw4QkFBOEIsRUFDOUIsNkNBQTZDLEVBQzdDLCtCQUErQixFQUMvQixTQUFTLEtBQUssQ0FBQyxTQUFTLHlDQUF5QyxFQUNqRSw2REFBNkQsRUFDN0QsK0NBQStDLENBQ2hELENBQUM7UUFFRixJQUFJLGlCQUFXLENBQUMsSUFBSSxFQUFFLGVBQWUsRUFBRTtZQUNyQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVM7WUFDMUIsV0FBVyxFQUFFLGVBQWU7WUFDNUIsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO1lBQ2QsWUFBWSxFQUFFLEtBQUssQ0FBQyxZQUFZLElBQUksVUFBVTtZQUM5QyxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVMsSUFBSSxJQUFJO1lBQ2xDLEdBQUcsRUFBRTtnQkFDSCxPQUFPLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxPQUFPO2dCQUMzQixNQUFNLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxNQUFNO2FBQzFCO1lBQ0QsUUFBUSxFQUFFLFFBQVE7WUFDbEIsSUFBSSxFQUFFO2dCQUNKLEdBQUcsS0FBSyxDQUFDLElBQUk7Z0JBQ2Isa0NBQWtDLEVBQUUsWUFBWTtnQkFDaEQsOEJBQThCLEVBQUUsVUFBVTtnQkFDMUMsNEJBQTRCLEVBQUUsTUFBTTthQUNyQztTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXBDRCxzQ0FvQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdGFjaywgU3RhY2tQcm9wcyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgRWMySW5zdGFuY2UgfSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy9jb21wdXRlL2VjMlwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uL3R5cGVzXCI7XG5pbXBvcnQgeyBDb25uZWN0aW9ucywgVXNlckRhdGEgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjMlwiO1xuaW1wb3J0IHsgSVZwYyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5cbmludGVyZmFjZSBQcm94eUFnZW50UHJvcHMgZXh0ZW5kcyBTdGFja1Byb3BzIHtcbiAgYWNjb3VudElkPzogc3RyaW5nO1xuICB2cGM/OiBJVnBjO1xuICBwdWJsaWNLZXk6IHN0cmluZztcbiAgZW5hYmxlU1NIPzogYm9vbGVhbjtcbiAgaW5zdGFuY2VUeXBlOiBzdHJpbmc7XG4gIGRhdGFiYXNlQ29ubmVjdGlvbj86IENvbm5lY3Rpb25zO1xuICB0YWdzPzogS2V5VmFsdWU7XG59XG5cbmV4cG9ydCBjbGFzcyBGaXZldHJhblByb3h5IGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogUHJveHlBZ2VudFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCBwcm9wcyk7XG5cbiAgICBjb25zdCB1c2VyRGF0YSA9IFVzZXJEYXRhLmZvckxpbnV4KCk7XG5cbiAgICB1c2VyRGF0YS5hZGRDb21tYW5kcyhcbiAgICAgIFwiZ3JvdXBhZGQgZml2ZXRyYW5cIixcbiAgICAgIFwidXNlcmFkZCAtbSAtZyBmaXZldHJhbiBmaXZldHJhblwiLFxuICAgICAgXCJta2RpciAtcCAvaG9tZS9maXZldHJhbi8uc3NoXCIsXG4gICAgICBcImNob3duIGZpdmV0cmFuOmZpdmV0cmFuIC9ob21lL2ZpdmV0cmFuLy5zc2hcIixcbiAgICAgIFwiY2htb2QgNzAwIC9ob21lL2ZpdmV0cmFuLy5zc2hcIixcbiAgICAgIGBlY2hvIFwiJHtwcm9wcy5wdWJsaWNLZXl9XCIgPiAvaG9tZS9maXZldHJhbi8uc3NoL2F1dGhvcml6ZWRfa2V5c2AsXG4gICAgICBcImNob3duIGZpdmV0cmFuOmZpdmV0cmFuIC9ob21lL2ZpdmV0cmFuLy5zc2gvYXV0aG9yaXplZF9rZXlzXCIsXG4gICAgICBcImNobW9kIDYwMCAvaG9tZS9maXZldHJhbi8uc3NoL2F1dGhvcml6ZWRfa2V5c1wiXG4gICAgKTtcblxuICAgIG5ldyBFYzJJbnN0YW5jZSh0aGlzLCBcIkZpdmV0cmFuUHJveHlcIiwge1xuICAgICAgYWNjb3VudElkOiBwcm9wcy5hY2NvdW50SWQsXG4gICAgICBzZXJ2aWNlTmFtZTogXCJmaXZldHJhblByb3h5XCIsXG4gICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgIGluc3RhbmNlVHlwZTogcHJvcHMuaW5zdGFuY2VUeXBlIHx8IFwidDIubWljcm9cIixcbiAgICAgIGVuYWJsZVNTSDogcHJvcHMuZW5hYmxlU1NIIHx8IHRydWUsXG4gICAgICBlbnY6IHtcbiAgICAgICAgYWNjb3VudDogcHJvcHMuZW52Py5hY2NvdW50LFxuICAgICAgICByZWdpb246IHByb3BzLmVudj8ucmVnaW9uXG4gICAgICB9LFxuICAgICAgdXNlckRhdGE6IHVzZXJEYXRhLFxuICAgICAgdGFnczoge1xuICAgICAgICAuLi5wcm9wcy50YWdzLFxuICAgICAgICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOmVudmlyb25tZW50XCI6IFwicHJvZHVjdGlvblwiLFxuICAgICAgICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOnNlcnZpY2VcIjogXCJmaXZldHJhblwiLFxuICAgICAgICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOm93bmVyXCI6IFwiZGF0YVwiXG4gICAgICB9XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==

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

@@ -1,13 +1,12 @@
 import { Construct } from "constructs";
 import App from "../../app";
 import { Secret } from "../../resources/aws/secrets";
-import { Vpc } from "../../resources/aws/networking/vpc";
 import { Connections, IConnectable, IVpc } from "aws-cdk-lib/aws-ec2";
 type StorageType = "Aurora" | "Instance" | "FreeTier";
 export interface IStorageProps {
     type: StorageType;
     databaseName: string;
-    vpc?: Vpc;
+    vpc?: IVpc;
     tags?: {
         [key: string]: string;
     };

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

@@ -69,4 +69,4 @@ class Storage extends constructs_1.Construct {
     }
 }
 exports.Storage = Storage;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3Mvc3RvcmFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBdUM7QUFHdkMsMkRBSXNDO0FBZXRDLE1BQWEsY0FBYztJQUN6QixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFvQjtRQUMzQyxPQUFPLENBQUMsR0FBUSxFQUFFLEtBQWdCLEVBQUUsRUFBRTtZQUNwQyxNQUFNLFlBQVksR0FBRztnQkFDbkIsR0FBRztvQkFDRCxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsYUFBYSxFQUFFO2lCQUN0QztnQkFDRCxHQUFHLEtBQUs7YUFDVCxDQUFDO1lBQ0YsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQzlDLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQVpELHdDQVlDO0FBRUQsTUFBYSxPQUFRLFNBQVEsc0JBQVM7SUFVcEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFFbkIsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELFVBQVUsQ0FBQyxLQUFvQjtRQUM3QixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDNUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQztnQkFDZixNQUFNLElBQUksS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7WUFDekQsQ0FBQztZQUNELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxvQkFBUyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDOUQsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDaEUsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDaEUsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztRQUMzQyxDQUFDO1FBRUQsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQztJQUMvQyxDQUFDO0lBRUQsY0FBYztRQUNaLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQztJQUMzQixDQUFDO0NBQ0Y7QUEvREQsMEJBK0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmltcG9ydCBBcHAgZnJvbSBcIi4uLy4uL2FwcFwiO1xuaW1wb3J0IHtcbiAgUmRzQXVyb3JhLFxuICBSZHNGcmVlVGllcixcbiAgUmRzSW5zdGFuY2Vcbn0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvZGF0YWJhc2VcIjtcbmltcG9ydCB7IFNlY3JldCB9IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL3NlY3JldHNcIjtcblxuaW1wb3J0IHsgVnBjIH0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvbmV0d29ya2luZy92cGNcIjtcbmltcG9ydCB7IENvbm5lY3Rpb25zLCBJQ29ubmVjdGFibGUsIElWcGMgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjMlwiO1xuXG50eXBlIFN0b3JhZ2VUeXBlID0gXCJBdXJvcmFcIiB8IFwiSW5zdGFuY2VcIiB8IFwiRnJlZVRpZXJcIjtcblxuZXhwb3J0IGludGVyZmFjZSBJU3RvcmFnZVByb3BzIHtcbiAgdHlwZTogU3RvcmFnZVR5cGU7XG4gIGRhdGFiYXNlTmFtZTogc3RyaW5nO1xuICB2cGM/OiBWcGM7XG4gIHRhZ3M/OiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xufVxuXG5leHBvcnQgY2xhc3MgU3RvcmFnZUZhY3Rvcnkge1xuICBzdGF0aWMgYnVpbGQoaWQ6IHN0cmluZywgcHJvcHM6IElTdG9yYWdlUHJvcHMpIHtcbiAgICByZXR1cm4gKGFwcDogQXBwLCBzY29wZTogQ29uc3RydWN0KSA9PiB7XG4gICAgICBjb25zdCBzdG9yYWdlUHJvcHMgPSB7XG4gICAgICAgIC4uLntcbiAgICAgICAgICB2cGM6IHByb3BzLnZwYyB8fCBhcHAuZ2V0RGVmYXVsdFZwYygpXG4gICAgICAgIH0sXG4gICAgICAgIC4uLnByb3BzXG4gICAgICB9O1xuICAgICAgcmV0dXJuIG5ldyBTdG9yYWdlKHNjb3BlLCBpZCwgc3RvcmFnZVByb3BzKTtcbiAgICB9O1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBTdG9yYWdlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSUNvbm5lY3RhYmxlIHtcbiAgcHVibGljIGlkOiBzdHJpbmc7XG4gIHB1YmxpYyBzY29wZTogQ29uc3RydWN0O1xuICBwdWJsaWMgdnBjOiBJVnBjO1xuXG4gIHB1YmxpYyBjb25uZWN0aW9uczogQ29ubmVjdGlvbnM7XG5cbiAgcHJpdmF0ZSBkYXRhYmFzZU5hbWU6IHN0cmluZztcbiAgcHJpdmF0ZSBkYXRhYmFzZTogUmRzQXVyb3JhIHwgUmRzSW5zdGFuY2UgfCBSZHNGcmVlVGllcjtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSVN0b3JhZ2VQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgdGhpcy5pZCA9IGlkO1xuICAgIHRoaXMuc2NvcGUgPSBzY29wZTtcblxuICAgIHRoaXMuZGF0YWJhc2VOYW1lID0gcHJvcHMuZGF0YWJhc2VOYW1lO1xuICAgIHRoaXMuYWRkU3RvcmFnZShwcm9wcyk7XG4gIH1cblxuICBhZGRTdG9yYWdlKHByb3BzOiBJU3RvcmFnZVByb3BzKSB7XG4gICAgaWYgKHByb3BzLnR5cGUgPT09IFwiQXVyb3JhXCIpIHtcbiAgICAgIGlmICghcHJvcHMudnBjKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcihcIlZQQyBpcyByZXF1aXJlZCBmb3IgQXVyb3JhIGRhdGFiYXNlXCIpO1xuICAgICAgfVxuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNBdXJvcmEodGhpcywgYCR7cHJvcHMuZGF0YWJhc2VOYW1lfVJkc2AsIHtcbiAgICAgICAgdnBjOiBwcm9wcy52cGMsXG4gICAgICAgIGRhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2VOYW1lLFxuICAgICAgICB0YWdzOiBwcm9wcy50YWdzIHx8IHt9XG4gICAgICB9KTtcbiAgICB9IGVsc2UgaWYgKHByb3BzLnR5cGUgPT09IFwiSW5zdGFuY2VcIikge1xuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNJbnN0YW5jZSh0aGlzLCBgJHtwcm9wcy5kYXRhYmFzZU5hbWV9UmRzYCwge1xuICAgICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgICAgZGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZU5hbWUsXG4gICAgICAgIHRhZ3M6IHByb3BzLnRhZ3MgfHwge31cbiAgICAgIH0pO1xuICAgIH0gZWxzZSBpZiAocHJvcHMudHlwZSA9PT0gXCJGcmVlVGllclwiKSB7XG4gICAgICB0aGlzLmRhdGFiYXNlID0gbmV3IFJkc0ZyZWVUaWVyKHRoaXMsIGAke3Byb3BzLmRhdGFiYXNlTmFtZX1SZHNgLCB7XG4gICAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgICBkYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgdGFnczogcHJvcHMudGFncyB8fCB7fVxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcIkludmFsaWQgZGF0YWJhc2UgdHlwZVwiKTtcbiAgICB9XG5cbiAgICB0aGlzLmNvbm5lY3Rpb25zID0gdGhpcy5kYXRhYmFzZS5jb25uZWN0aW9ucztcbiAgfVxuXG4gIGdldENyZWRlbnRpYWxzKCk6IFNlY3JldCB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2UuZ2V0Q3JlZGVudGlhbHMoKTtcbiAgfVxuXG4gIGdldEhvc3RFbmRwb2ludCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmRhdGFiYXNlLmdldEhvc3RFbmRwb2ludCgpO1xuICB9XG5cbiAgZ2V0SG9zdFBvcnQoKTogc3RyaW5nIHwgbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5kYXRhYmFzZS5nZXRIb3N0UG9ydCgpO1xuICB9XG5cbiAgZ2V0RGF0YWJhc2VOYW1lKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2VOYW1lO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3Mvc3RvcmFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBdUM7QUFHdkMsMkRBSXNDO0FBY3RDLE1BQWEsY0FBYztJQUN6QixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFvQjtRQUMzQyxPQUFPLENBQUMsR0FBUSxFQUFFLEtBQWdCLEVBQUUsRUFBRTtZQUNwQyxNQUFNLFlBQVksR0FBRztnQkFDbkIsR0FBRztvQkFDRCxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsYUFBYSxFQUFFO2lCQUN0QztnQkFDRCxHQUFHLEtBQUs7YUFDVCxDQUFDO1lBQ0YsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQzlDLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQVpELHdDQVlDO0FBRUQsTUFBYSxPQUFRLFNBQVEsc0JBQVM7SUFVcEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFFbkIsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELFVBQVUsQ0FBQyxLQUFvQjtRQUM3QixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDNUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQztnQkFDZixNQUFNLElBQUksS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7WUFDekQsQ0FBQztZQUNELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxvQkFBUyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDOUQsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDaEUsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDaEUsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztRQUMzQyxDQUFDO1FBRUQsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQztJQUMvQyxDQUFDO0lBRUQsY0FBYztRQUNaLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQztJQUMzQixDQUFDO0NBQ0Y7QUEvREQsMEJBK0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmltcG9ydCBBcHAgZnJvbSBcIi4uLy4uL2FwcFwiO1xuaW1wb3J0IHtcbiAgUmRzQXVyb3JhLFxuICBSZHNGcmVlVGllcixcbiAgUmRzSW5zdGFuY2Vcbn0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvZGF0YWJhc2VcIjtcbmltcG9ydCB7IFNlY3JldCB9IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL3NlY3JldHNcIjtcblxuaW1wb3J0IHsgQ29ubmVjdGlvbnMsIElDb25uZWN0YWJsZSwgSVZwYyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5cbnR5cGUgU3RvcmFnZVR5cGUgPSBcIkF1cm9yYVwiIHwgXCJJbnN0YW5jZVwiIHwgXCJGcmVlVGllclwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIElTdG9yYWdlUHJvcHMge1xuICB0eXBlOiBTdG9yYWdlVHlwZTtcbiAgZGF0YWJhc2VOYW1lOiBzdHJpbmc7XG4gIHZwYz86IElWcGM7XG4gIHRhZ3M/OiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xufVxuXG5leHBvcnQgY2xhc3MgU3RvcmFnZUZhY3Rvcnkge1xuICBzdGF0aWMgYnVpbGQoaWQ6IHN0cmluZywgcHJvcHM6IElTdG9yYWdlUHJvcHMpIHtcbiAgICByZXR1cm4gKGFwcDogQXBwLCBzY29wZTogQ29uc3RydWN0KSA9PiB7XG4gICAgICBjb25zdCBzdG9yYWdlUHJvcHMgPSB7XG4gICAgICAgIC4uLntcbiAgICAgICAgICB2cGM6IHByb3BzLnZwYyB8fCBhcHAuZ2V0RGVmYXVsdFZwYygpXG4gICAgICAgIH0sXG4gICAgICAgIC4uLnByb3BzXG4gICAgICB9O1xuICAgICAgcmV0dXJuIG5ldyBTdG9yYWdlKHNjb3BlLCBpZCwgc3RvcmFnZVByb3BzKTtcbiAgICB9O1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBTdG9yYWdlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSUNvbm5lY3RhYmxlIHtcbiAgcHVibGljIGlkOiBzdHJpbmc7XG4gIHB1YmxpYyBzY29wZTogQ29uc3RydWN0O1xuICBwdWJsaWMgdnBjOiBJVnBjO1xuXG4gIHB1YmxpYyBjb25uZWN0aW9uczogQ29ubmVjdGlvbnM7XG5cbiAgcHJpdmF0ZSBkYXRhYmFzZU5hbWU6IHN0cmluZztcbiAgcHJpdmF0ZSBkYXRhYmFzZTogUmRzQXVyb3JhIHwgUmRzSW5zdGFuY2UgfCBSZHNGcmVlVGllcjtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSVN0b3JhZ2VQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgdGhpcy5pZCA9IGlkO1xuICAgIHRoaXMuc2NvcGUgPSBzY29wZTtcblxuICAgIHRoaXMuZGF0YWJhc2VOYW1lID0gcHJvcHMuZGF0YWJhc2VOYW1lO1xuICAgIHRoaXMuYWRkU3RvcmFnZShwcm9wcyk7XG4gIH1cblxuICBhZGRTdG9yYWdlKHByb3BzOiBJU3RvcmFnZVByb3BzKSB7XG4gICAgaWYgKHByb3BzLnR5cGUgPT09IFwiQXVyb3JhXCIpIHtcbiAgICAgIGlmICghcHJvcHMudnBjKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcihcIlZQQyBpcyByZXF1aXJlZCBmb3IgQXVyb3JhIGRhdGFiYXNlXCIpO1xuICAgICAgfVxuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNBdXJvcmEodGhpcywgYCR7cHJvcHMuZGF0YWJhc2VOYW1lfVJkc2AsIHtcbiAgICAgICAgdnBjOiBwcm9wcy52cGMsXG4gICAgICAgIGRhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2VOYW1lLFxuICAgICAgICB0YWdzOiBwcm9wcy50YWdzIHx8IHt9XG4gICAgICB9KTtcbiAgICB9IGVsc2UgaWYgKHByb3BzLnR5cGUgPT09IFwiSW5zdGFuY2VcIikge1xuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNJbnN0YW5jZSh0aGlzLCBgJHtwcm9wcy5kYXRhYmFzZU5hbWV9UmRzYCwge1xuICAgICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgICAgZGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZU5hbWUsXG4gICAgICAgIHRhZ3M6IHByb3BzLnRhZ3MgfHwge31cbiAgICAgIH0pO1xuICAgIH0gZWxzZSBpZiAocHJvcHMudHlwZSA9PT0gXCJGcmVlVGllclwiKSB7XG4gICAgICB0aGlzLmRhdGFiYXNlID0gbmV3IFJkc0ZyZWVUaWVyKHRoaXMsIGAke3Byb3BzLmRhdGFiYXNlTmFtZX1SZHNgLCB7XG4gICAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgICBkYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgdGFnczogcHJvcHMudGFncyB8fCB7fVxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcIkludmFsaWQgZGF0YWJhc2UgdHlwZVwiKTtcbiAgICB9XG5cbiAgICB0aGlzLmNvbm5lY3Rpb25zID0gdGhpcy5kYXRhYmFzZS5jb25uZWN0aW9ucztcbiAgfVxuXG4gIGdldENyZWRlbnRpYWxzKCk6IFNlY3JldCB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2UuZ2V0Q3JlZGVudGlhbHMoKTtcbiAgfVxuXG4gIGdldEhvc3RFbmRwb2ludCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmRhdGFiYXNlLmdldEhvc3RFbmRwb2ludCgpO1xuICB9XG5cbiAgZ2V0SG9zdFBvcnQoKTogc3RyaW5nIHwgbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5kYXRhYmFzZS5nZXRIb3N0UG9ydCgpO1xuICB9XG5cbiAgZ2V0RGF0YWJhc2VOYW1lKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2VOYW1lO1xuICB9XG59XG4iXX0=

package/dist/lib/resources/aws/base/awsStack.js

@@ -33,8 +33,18 @@ class AwsStack {
         return new aws_cdk_lib_1.Stack(app_1.default.getInstance(), id, this.getStackProps(props));
     }
     getStackProps(props) {
-        if (!props)
+        // If no explicit props are provided, fall back to the account/region that
+        // CDK resolved for this run. This allows context look-ups (e.g.
+        // Vpc.fromLookup) to work without every stack having to be created with
+        // explicit env settings.
+        if (!props) {
+            const account = process.env.CDK_DEFAULT_ACCOUNT;
+            const region = process.env.CDK_DEFAULT_REGION;
+            if (account && region) {
+                return { env: { account, region } };
+            }
             return;
+        }
         const stackProps = {
             env: props.accountId && props.region
                 ? { account: props.accountId, region: props.region }
@@ -99,4 +109,4 @@ class AwsStack {
 }
 exports.AwsStack = AwsStack;
 exports.default = AwsStack;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awsStack.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/base/awsStack.ts"],"names":[],"mappings":"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","sourcesContent":["import { Stack, StackProps } from \"aws-cdk-lib\";\nimport { IConnectable, Port } from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\n\nimport App from \"../../../app\";\nimport { Repository } from \"aws-cdk-lib/aws-ecr\";\n\nexport interface StackBuilder {\n  addConstruct(resource: Construct): StackBuilder;\n  addResource(fn: (stackBuilder: StackBuilder) => Construct): StackBuilder;\n\n  addNetwork(resource: Construct): StackBuilder;\n  addNetwork(fn: (stackBuilder: StackBuilder) => Construct): StackBuilder;\n  addNetwork(resource: Construct | string): StackBuilder;\n\n  getStack(): Stack;\n  getNetwork(): Construct;\n}\n\nexport interface AwsStackProps {\n  readonly accountId?: string;\n  readonly region?: string;\n  accountName?: string;\n}\n\nexport class AwsStack implements StackBuilder {\n  public readonly resources: {\n    [key: string]: Construct;\n  } = {};\n\n  private stack: Stack;\n  private network: Construct;\n  private containerRegistry: Repository;\n\n  constructor(\n    id: string,\n    dependencies?: AwsStack | AwsStack[],\n    props?: AwsStackProps\n  ) {\n    // Create inner CDK Stack\n    this.stack = this.getCdkStack(id, props);\n\n    // Register all stack dependencies\n    this.addDependencies(dependencies);\n  }\n\n  private addDependencies(dependencies?: AwsStack | AwsStack[]) {\n    if (!dependencies) return;\n\n    if (Array.isArray(dependencies)) {\n      for (const dependency of dependencies) {\n        this.stack.addDependency(dependency.getStack());\n      }\n    } else {\n      this.stack.addDependency(dependencies.getStack());\n    }\n  }\n\n  private getCdkStack(id: string, props?: AwsStackProps) {\n    if (process.env.JEST_WORKER_ID !== undefined) {\n      return new Stack(undefined, id, this.getStackProps(props)); // Create a mock stack for testing\n    }\n\n    return new Stack(App.getInstance(), id, this.getStackProps(props));\n  }\n\n  private getStackProps(\n    props: AwsStackProps | undefined\n  ): StackProps | undefined {\n    if (!props) return;\n\n    const stackProps: StackProps = {\n      env:\n        props.accountId && props.region\n          ? { account: props.accountId, region: props.region }\n          : undefined\n    };\n\n    return stackProps;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private isConnectable(arg: any): arg is IConnectable {\n    return arg.connections;\n  }\n\n  public addConstruct(construct: Construct): AwsStack {\n    this.resources[construct.node.id] = construct;\n    return this;\n  }\n\n  // @deprecated - use addConstruct instead\n  public addResource(fn: (stackBuilder: StackBuilder) => Construct): AwsStack {\n    const resource = fn(this);\n    this.resources[resource.node.id] = resource;\n    return this;\n  }\n\n  public addNetwork(resource: Construct): AwsStack;\n  public addNetwork(\n    resource: (stackBuilder: StackBuilder) => Construct\n  ): AwsStack;\n  public addNetwork(\n    resource: Construct | ((stackBuilder: StackBuilder) => Construct)\n  ): AwsStack {\n    const resourceActual =\n      resource instanceof Construct ? resource : resource(this);\n    this.resources[resourceActual.node.id] = resourceActual;\n    this.network = resourceActual;\n    return this;\n  }\n\n  public addContainerRegistry(resource: Repository): AwsStack;\n  public addContainerRegistry(\n    resource: (stackBuilder: StackBuilder) => Repository\n  ): AwsStack;\n  public addContainerRegistry(\n    resource: Repository | ((stackBuilder: StackBuilder) => Repository)\n  ): AwsStack {\n    const resourceActual =\n      resource instanceof Repository ? resource : resource(this);\n    this.resources[resourceActual.node.id] = resourceActual;\n    this.containerRegistry = resourceActual;\n    return this;\n  }\n\n  public getStack() {\n    return this.stack;\n  }\n\n  public getStackName() {\n    return this.stack.stackName;\n  }\n\n  public getNetwork() {\n    return this.network;\n  }\n\n  public getContainerRegistry() {\n    return this.containerRegistry;\n  }\n\n  public getResource(identifier: string) {\n    return this.resources[identifier];\n  }\n\n  public connect(\n    from: Construct | string,\n    to: Construct | string,\n    port?: number\n  ) {\n    if (!from || !to) return this;\n\n    const fromResource =\n      from instanceof Construct ? from : this.getResource(from);\n    const toResource = to instanceof Construct ? to : this.getResource(to);\n\n    if (!fromResource || !toResource) return this;\n\n    if (!this.isConnectable(fromResource) || !this.isConnectable(toResource))\n      return this;\n\n    const portActual = port ? Port.tcp(port) : Port.allTcp();\n    fromResource.connections.allowTo(toResource, portActual);\n\n    return this;\n  }\n}\nexport default AwsStack;\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awsStack.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/base/awsStack.ts"],"names":[],"mappings":"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","sourcesContent":["import { Stack, StackProps } from \"aws-cdk-lib\";\nimport { IConnectable, Port } from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\n\nimport App from \"../../../app\";\nimport { Repository } from \"aws-cdk-lib/aws-ecr\";\n\nexport interface StackBuilder {\n  addConstruct(resource: Construct): StackBuilder;\n  addResource(fn: (stackBuilder: StackBuilder) => Construct): StackBuilder;\n\n  addNetwork(resource: Construct): StackBuilder;\n  addNetwork(fn: (stackBuilder: StackBuilder) => Construct): StackBuilder;\n  addNetwork(resource: Construct | string): StackBuilder;\n\n  getStack(): Stack;\n  getNetwork(): Construct;\n}\n\nexport interface AwsStackProps {\n  readonly accountId?: string;\n  readonly region?: string;\n  accountName?: string;\n}\n\nexport class AwsStack implements StackBuilder {\n  public readonly resources: {\n    [key: string]: Construct;\n  } = {};\n\n  private stack: Stack;\n  private network: Construct;\n  private containerRegistry: Repository;\n\n  constructor(\n    id: string,\n    dependencies?: AwsStack | AwsStack[],\n    props?: AwsStackProps\n  ) {\n    // Create inner CDK Stack\n    this.stack = this.getCdkStack(id, props);\n\n    // Register all stack dependencies\n    this.addDependencies(dependencies);\n  }\n\n  private addDependencies(dependencies?: AwsStack | AwsStack[]) {\n    if (!dependencies) return;\n\n    if (Array.isArray(dependencies)) {\n      for (const dependency of dependencies) {\n        this.stack.addDependency(dependency.getStack());\n      }\n    } else {\n      this.stack.addDependency(dependencies.getStack());\n    }\n  }\n\n  private getCdkStack(id: string, props?: AwsStackProps) {\n    if (process.env.JEST_WORKER_ID !== undefined) {\n      return new Stack(undefined, id, this.getStackProps(props)); // Create a mock stack for testing\n    }\n\n    return new Stack(App.getInstance(), id, this.getStackProps(props));\n  }\n\n  private getStackProps(\n    props: AwsStackProps | undefined\n  ): StackProps | undefined {\n    // If no explicit props are provided, fall back to the account/region that\n    // CDK resolved for this run. This allows context look-ups (e.g.\n    // Vpc.fromLookup) to work without every stack having to be created with\n    // explicit env settings.\n\n    if (!props) {\n      const account = process.env.CDK_DEFAULT_ACCOUNT;\n      const region = process.env.CDK_DEFAULT_REGION;\n\n      if (account && region) {\n        return { env: { account, region } } as StackProps;\n      }\n\n      return;\n    }\n\n    const stackProps: StackProps = {\n      env:\n        props.accountId && props.region\n          ? { account: props.accountId, region: props.region }\n          : undefined\n    };\n\n    return stackProps;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private isConnectable(arg: any): arg is IConnectable {\n    return arg.connections;\n  }\n\n  public addConstruct(construct: Construct): AwsStack {\n    this.resources[construct.node.id] = construct;\n    return this;\n  }\n\n  // @deprecated - use addConstruct instead\n  public addResource(fn: (stackBuilder: StackBuilder) => Construct): AwsStack {\n    const resource = fn(this);\n    this.resources[resource.node.id] = resource;\n    return this;\n  }\n\n  public addNetwork(resource: Construct): AwsStack;\n  public addNetwork(\n    resource: (stackBuilder: StackBuilder) => Construct\n  ): AwsStack;\n  public addNetwork(\n    resource: Construct | ((stackBuilder: StackBuilder) => Construct)\n  ): AwsStack {\n    const resourceActual =\n      resource instanceof Construct ? resource : resource(this);\n    this.resources[resourceActual.node.id] = resourceActual;\n    this.network = resourceActual;\n    return this;\n  }\n\n  public addContainerRegistry(resource: Repository): AwsStack;\n  public addContainerRegistry(\n    resource: (stackBuilder: StackBuilder) => Repository\n  ): AwsStack;\n  public addContainerRegistry(\n    resource: Repository | ((stackBuilder: StackBuilder) => Repository)\n  ): AwsStack {\n    const resourceActual =\n      resource instanceof Repository ? resource : resource(this);\n    this.resources[resourceActual.node.id] = resourceActual;\n    this.containerRegistry = resourceActual;\n    return this;\n  }\n\n  public getStack() {\n    return this.stack;\n  }\n\n  public getStackName() {\n    return this.stack.stackName;\n  }\n\n  public getNetwork() {\n    return this.network;\n  }\n\n  public getContainerRegistry() {\n    return this.containerRegistry;\n  }\n\n  public getResource(identifier: string) {\n    return this.resources[identifier];\n  }\n\n  public connect(\n    from: Construct | string,\n    to: Construct | string,\n    port?: number\n  ) {\n    if (!from || !to) return this;\n\n    const fromResource =\n      from instanceof Construct ? from : this.getResource(from);\n    const toResource = to instanceof Construct ? to : this.getResource(to);\n\n    if (!fromResource || !toResource) return this;\n\n    if (!this.isConnectable(fromResource) || !this.isConnectable(toResource))\n      return this;\n\n    const portActual = port ? Port.tcp(port) : Port.allTcp();\n    fromResource.connections.allowTo(toResource, portActual);\n\n    return this;\n  }\n}\nexport default AwsStack;\n"]}

package/dist/lib/resources/aws/compute/ec2.d.ts

@@ -8,7 +8,7 @@ interface Ec2InstanceProps extends StackProps {
     blockDevices?: BlockDevice[];
     accountId?: string;
     serviceName: string;
-    vpcId?: string;
+    vpc?: IVpc;
     subnetConfiguration?: SubnetConfiguration[];
     minCapcity?: number;
     maxCapacity?: number;
@@ -25,13 +25,13 @@ export declare class Ec2Instance extends Construct implements IConnectable {
     asgSecurityGroup: SecurityGroup;
     private autoScalingGroup;
     private keyPair;
-    constructor(scope: Construct, id: string, props: Ec2InstanceProps);
     connections: Connections;
+    constructor(scope: Construct, id: string, props: Ec2InstanceProps);
     addVpc(props: Ec2InstanceProps): void;
     addKeyPair(props: Ec2InstanceProps): void;
     addLaunchTemplate(props: Ec2InstanceProps): void;
     addAutoScalingGroup(props: Ec2InstanceProps): void;
-    suspendAutoScaling(): void;
+    suspendAutoScaling(props: Ec2InstanceProps): void;
 }
 export declare class Ec2InstanceStack extends Stack {
     constructor(scope: Construct, id: string, props: Ec2InstanceProps);

package/dist/lib/resources/aws/compute/ec2.js

@@ -16,14 +16,15 @@ class Ec2Instance extends constructs_1.Construct {
         this.addKeyPair(props);
         this.addLaunchTemplate(props);
         this.addAutoScalingGroup(props);
-        this.suspendAutoScaling();
-        //TODO: Add load balancer as boolean prop, then configure load balancer
+        this.suspendAutoScaling(props);
+        // Initialize connections with the security group
+        this.connections = new aws_ec2_1.Connections({
+            securityGroups: [this.asgSecurityGroup]
+        });
     }
     addVpc(props) {
-        if (props.vpcId) {
-            this.vpc = vpc_1.Vpc.fromLookup(this, `${props.serviceName}Vpc`, {
-                vpcId: props.vpcId
-            });
+        if (props.vpc) {
+            this.vpc = props.vpc;
         }
         else {
             this.vpc = new vpc_1.Vpc(this, `${props.serviceName}Vpc`, {
@@ -93,9 +94,9 @@ class Ec2Instance extends constructs_1.Construct {
         });
         (0, tagResource_1.default)(this.autoScalingGroup, props.tags);
     }
-    suspendAutoScaling() {
+    suspendAutoScaling(props) {
         new awsCustomResource_1.AwsCustomResource(this, "SuspendAutoscaling", {
-            functionName: "suspendAutoScaling",
+            functionName: `${props.serviceName}SuspendAutoScaling`,
             onCreate: {
                 service: "AutoScaling",
                 action: "suspendProcesses",
@@ -128,4 +129,4 @@ class Ec2InstanceStack extends aws_cdk_lib_1.Stack {
     }
 }
 exports.Ec2InstanceStack = Ec2InstanceStack;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/compute/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, Stack, 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 \"../utilities/awsCustomResource\";\nimport { PhysicalResourceId } from \"aws-cdk-lib/custom-resources\";\nimport { Vpc } from \"../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\nexport class Ec2InstanceStack extends Stack {\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id, props);\n\n    new Ec2Instance(this, id, {\n      ...props\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/compute/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, Stack, 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 \"../utilities/awsCustomResource\";\nimport { PhysicalResourceId } from \"aws-cdk-lib/custom-resources\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface Ec2InstanceProps extends StackProps {\n  spotCapacityPercentage?: number;\n  blockDevices?: BlockDevice[];\n  accountId?: string;\n  serviceName: string;\n  vpc?: IVpc;\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  public connections: Connections;\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(props);\n\n    // Initialize connections with the security group\n    this.connections = new Connections({\n      securityGroups: [this.asgSecurityGroup]\n    });\n  }\n\n  addVpc(props: Ec2InstanceProps) {\n    if (props.vpc) {\n      this.vpc = props.vpc;\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(props: Ec2InstanceProps) {\n    new AwsCustomResource(this, \"SuspendAutoscaling\", {\n      functionName: `${props.serviceName}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\nexport class Ec2InstanceStack extends Stack {\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id, props);\n\n    new Ec2Instance(this, id, {\n      ...props\n    });\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "0.19.1",
+  "version": "0.20.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.19.1",
+    "@fjall/util": "^0.20.0",
     "@pepperize/cdk-organizations": "^0.7.135",
     "aws-cdk": "^2.146.0",
     "aws-cdk-lib": "^2.146.0",
@@ -48,5 +48,5 @@
   "overrides": {
     "@smithy/core": "2.5.5"
   },
-  "gitHead": "5885c6563c25481499d44fc24e34fa89335b2203"
+  "gitHead": "5a47023900fb6437d86b01316ce33b365cf7fe4a"
 }