@fjall/components-infrastructure 0.19.1 → 0.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/app.d.ts +8 -2
- package/dist/lib/app.js +33 -5
- package/dist/lib/patterns/aws/compute.d.ts +12 -1
- package/dist/lib/patterns/aws/compute.js +32 -2
- package/dist/lib/patterns/aws/fivetranProxy.d.ts +2 -1
- package/dist/lib/patterns/aws/fivetranProxy.js +2 -2
- package/dist/lib/patterns/aws/storage.d.ts +1 -2
- package/dist/lib/patterns/aws/storage.js +1 -1
- package/dist/lib/resources/aws/base/awsStack.js +12 -2
- package/dist/lib/resources/aws/compute/ec2.d.ts +3 -3
- package/dist/lib/resources/aws/compute/ec2.js +10 -9
- package/dist/lib/resources/aws/networking/ipamPool.d.ts +6 -0
- package/dist/lib/resources/aws/networking/ipamPool.js +45 -10
- package/dist/lib/resources/aws/utilities/awsCustomResource.js +6 -8
- package/dist/lib/resources/aws/utilities/customResource.js +2 -3
- package/dist/lib/resources/aws/utilities/customResourceProvider.js +2 -6
- package/dist/lib/utils/index.d.ts +1 -0
- package/dist/lib/utils/index.js +2 -1
- package/dist/lib/utils/standardTagsAspect.d.ts +42 -0
- package/dist/lib/utils/standardTagsAspect.js +50 -0
- package/package.json +5 -5
package/dist/lib/app.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { App as CdkApp } from "aws-cdk-lib";
|
|
2
2
|
import { Construct } from "constructs";
|
|
3
|
+
import { IVpc } from "aws-cdk-lib/aws-ec2";
|
|
3
4
|
import { AwsStack } from "./resources";
|
|
4
|
-
import { Vpc } from "./resources/aws/networking/vpc";
|
|
5
5
|
import { Ecr } from "./resources/aws/storage/ecr";
|
|
6
6
|
import { Storage } from "./patterns/aws/storage";
|
|
7
7
|
/**
|
|
@@ -15,6 +15,7 @@ export declare class App extends CdkApp {
|
|
|
15
15
|
private stacks;
|
|
16
16
|
private defaultVpc;
|
|
17
17
|
private defaultEcr;
|
|
18
|
+
private existingVpcId?;
|
|
18
19
|
private constructor();
|
|
19
20
|
/**
|
|
20
21
|
* Get/Create a basic Fjall Application
|
|
@@ -52,7 +53,12 @@ export declare class App extends CdkApp {
|
|
|
52
53
|
* Retrieve default vpc. If the VPC does not exist it will be created.
|
|
53
54
|
* @returns {Vpc}
|
|
54
55
|
*/
|
|
55
|
-
getDefaultVpc():
|
|
56
|
+
getDefaultVpc(): IVpc;
|
|
57
|
+
/**
|
|
58
|
+
* Reuse an existing VPC.
|
|
59
|
+
* Accepts either a Vpc object or a plain VPC ID string for convenience.
|
|
60
|
+
*/
|
|
61
|
+
useExistingVpc(vpcId: string): void;
|
|
56
62
|
/**
|
|
57
63
|
* Retreive the default application container registry. If the registry does not exist
|
|
58
64
|
* it will be created.
|
package/dist/lib/app.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.App = void 0;
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
-
const resources_1 = require("./resources");
|
|
6
5
|
const vpc_1 = require("./resources/aws/networking/vpc");
|
|
6
|
+
const resources_1 = require("./resources");
|
|
7
7
|
const ecr_1 = require("./resources/aws/storage/ecr");
|
|
8
8
|
/**
|
|
9
9
|
* The basic corner-stone of all Fjall-hosted applications.
|
|
@@ -81,12 +81,40 @@ class App extends aws_cdk_lib_1.App {
|
|
|
81
81
|
getDefaultVpc() {
|
|
82
82
|
var networkStack = this.getDefaultNetworkStack();
|
|
83
83
|
if (!this.defaultVpc) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
84
|
+
// Use an existing imported VPC if one was supplied
|
|
85
|
+
if (this.existingVpcId) {
|
|
86
|
+
this.defaultVpc = vpc_1.Vpc.fromLookup(networkStack.getStack(), `${this.name}ImportedVpc`, { vpcId: this.existingVpcId });
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
// Attempt to automatically derive the account and region from the
|
|
90
|
+
// environment the CDK is running in. When an account ID is available,
|
|
91
|
+
// use it to import the corresponding IPAM pool so CIDRs are allocated
|
|
92
|
+
// from a central pool instead of using the default 10.0.0.0/16 block.
|
|
93
|
+
const accountId = process.env.CDK_DEFAULT_ACCOUNT;
|
|
94
|
+
const region = process.env.CDK_DEFAULT_REGION;
|
|
95
|
+
const ipv4IpamPoolId = accountId
|
|
96
|
+
? aws_cdk_lib_1.Fn.importValue(`IpamPoolId${accountId}`)
|
|
97
|
+
: undefined;
|
|
98
|
+
this.defaultVpc = vpc_1.VpcFactory.build(`${this.name}DefaultVpc`, {
|
|
99
|
+
accountId,
|
|
100
|
+
region,
|
|
101
|
+
ipv4IpamPoolId,
|
|
102
|
+
tags: {}
|
|
103
|
+
})(this, networkStack.getStack());
|
|
104
|
+
}
|
|
87
105
|
}
|
|
88
106
|
return this.defaultVpc;
|
|
89
107
|
}
|
|
108
|
+
/**
|
|
109
|
+
* Reuse an existing VPC.
|
|
110
|
+
* Accepts either a Vpc object or a plain VPC ID string for convenience.
|
|
111
|
+
*/
|
|
112
|
+
useExistingVpc(vpcId) {
|
|
113
|
+
if (this.defaultVpc) {
|
|
114
|
+
throw new Error("useExistingVpc must be called before the default VPC has been created");
|
|
115
|
+
}
|
|
116
|
+
this.existingVpcId = vpcId;
|
|
117
|
+
}
|
|
90
118
|
/**
|
|
91
119
|
* Retreive the default application container registry. If the registry does not exist
|
|
92
120
|
* it will be created.
|
|
@@ -132,4 +160,4 @@ class App extends aws_cdk_lib_1.App {
|
|
|
132
160
|
exports.App = App;
|
|
133
161
|
App.instance = null;
|
|
134
162
|
exports.default = App;
|
|
135
|
-
//# 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"]}
|
|
163
|
+
//# 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"]}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { RepositoryImage } from "aws-cdk-lib/aws-ecs";
|
|
2
2
|
import { Repository } from "aws-cdk-lib/aws-ecr";
|
|
3
|
-
import { Connections, IConnectable, IVpc } from "aws-cdk-lib/aws-ec2";
|
|
3
|
+
import { Connections, IConnectable, IVpc, UserData, IMachineImage } from "aws-cdk-lib/aws-ec2";
|
|
4
4
|
import { Construct } from "constructs";
|
|
5
5
|
import App from "../../app";
|
|
6
6
|
import { DomainConfig } from "../../resources/aws/compute/ecs";
|
|
7
|
+
import { KeyValue } from "../../types";
|
|
7
8
|
import { SecretImport } from "../../resources/aws/secrets";
|
|
8
9
|
interface IComputeProps {
|
|
9
10
|
vpc?: IVpc;
|
|
10
11
|
ecrRepository?: Repository | RepositoryImage;
|
|
12
|
+
type?: "ecs" | "ec2";
|
|
11
13
|
parentDomain?: string;
|
|
12
14
|
domainConfig?: DomainConfig;
|
|
13
15
|
/**
|
|
@@ -27,6 +29,13 @@ interface IComputeProps {
|
|
|
27
29
|
containerSecretsImport?: {
|
|
28
30
|
[key: string]: SecretImport;
|
|
29
31
|
};
|
|
32
|
+
instanceType?: string;
|
|
33
|
+
enableSSH?: boolean;
|
|
34
|
+
userData?: UserData;
|
|
35
|
+
machineImage?: IMachineImage;
|
|
36
|
+
minCapacity?: number;
|
|
37
|
+
maxCapacity?: number;
|
|
38
|
+
tags?: KeyValue;
|
|
30
39
|
connections?: IConnectable[];
|
|
31
40
|
}
|
|
32
41
|
export declare class ComputeFactory {
|
|
@@ -40,5 +49,7 @@ export declare class Compute extends Construct implements IConnectable {
|
|
|
40
49
|
private compute;
|
|
41
50
|
constructor(scope: Construct, id: string, props: IComputeProps);
|
|
42
51
|
addCompute(props: IComputeProps): void;
|
|
52
|
+
private addEc2Compute;
|
|
53
|
+
private addEcsCompute;
|
|
43
54
|
}
|
|
44
55
|
export {};
|
|
@@ -4,6 +4,7 @@ exports.Compute = exports.ComputeFactory = void 0;
|
|
|
4
4
|
const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
5
5
|
const constructs_1 = require("constructs");
|
|
6
6
|
const ecs_1 = require("../../resources/aws/compute/ecs");
|
|
7
|
+
const ec2_1 = require("../../resources/aws/compute/ec2");
|
|
7
8
|
class ComputeFactory {
|
|
8
9
|
static build(id, props) {
|
|
9
10
|
return (app, scope) => {
|
|
@@ -27,10 +28,39 @@ class Compute extends constructs_1.Construct {
|
|
|
27
28
|
this.addCompute(props);
|
|
28
29
|
}
|
|
29
30
|
addCompute(props) {
|
|
31
|
+
const computeType = props.type || "ecs";
|
|
32
|
+
if (computeType === "ec2") {
|
|
33
|
+
this.addEc2Compute(props);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
this.addEcsCompute(props);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
addEc2Compute(props) {
|
|
40
|
+
const ec2Props = {
|
|
41
|
+
serviceName: `${this.id}Service`,
|
|
42
|
+
instanceType: props.instanceType || "t3.micro",
|
|
43
|
+
enableSSH: props.enableSSH || false,
|
|
44
|
+
userData: props.userData,
|
|
45
|
+
machineImage: props.machineImage,
|
|
46
|
+
minCapcity: props.minCapacity || 1,
|
|
47
|
+
maxCapacity: props.maxCapacity || 1,
|
|
48
|
+
vpc: props.vpc,
|
|
49
|
+
tags: props.tags || {}
|
|
50
|
+
};
|
|
51
|
+
this.compute = new ec2_1.Ec2Instance(this.scope, `${this.id}Ec2`, ec2Props);
|
|
52
|
+
this.connections = this.compute.connections;
|
|
53
|
+
if (props.connections) {
|
|
54
|
+
for (var conn of props.connections) {
|
|
55
|
+
this.compute.connections.allowTo(conn, aws_ec2_1.Port.allTcp());
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
addEcsCompute(props) {
|
|
30
60
|
const fargateProps = {
|
|
31
61
|
...props,
|
|
32
62
|
...{
|
|
33
|
-
tags: {}
|
|
63
|
+
tags: props.tags || {}
|
|
34
64
|
},
|
|
35
65
|
...{
|
|
36
66
|
scalingType: ecs_1.ScalingType.CPU,
|
|
@@ -50,4 +80,4 @@ class Compute extends constructs_1.Construct {
|
|
|
50
80
|
}
|
|
51
81
|
}
|
|
52
82
|
exports.Compute = Compute;
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# 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"]}
|
|
@@ -2,9 +2,10 @@ import { Stack, StackProps } from "aws-cdk-lib";
|
|
|
2
2
|
import { Construct } from "constructs";
|
|
3
3
|
import { KeyValue } from "../../types";
|
|
4
4
|
import { Connections } from "aws-cdk-lib/aws-ec2";
|
|
5
|
+
import { IVpc } from "aws-cdk-lib/aws-ec2";
|
|
5
6
|
interface ProxyAgentProps extends StackProps {
|
|
6
7
|
accountId?: string;
|
|
7
|
-
|
|
8
|
+
vpc?: IVpc;
|
|
8
9
|
publicKey: string;
|
|
9
10
|
enableSSH?: boolean;
|
|
10
11
|
instanceType: string;
|
|
@@ -12,7 +12,7 @@ class FivetranProxy extends aws_cdk_lib_1.Stack {
|
|
|
12
12
|
new ec2_1.Ec2Instance(this, "FivetranProxy", {
|
|
13
13
|
accountId: props.accountId,
|
|
14
14
|
serviceName: "fivetranProxy",
|
|
15
|
-
|
|
15
|
+
vpc: props.vpc,
|
|
16
16
|
instanceType: props.instanceType || "t2.micro",
|
|
17
17
|
enableSSH: props.enableSSH || true,
|
|
18
18
|
env: {
|
|
@@ -30,4 +30,4 @@ class FivetranProxy extends aws_cdk_lib_1.Stack {
|
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
exports.FivetranProxy = FivetranProxy;
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml2ZXRyYW5Qcm94eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3MvZml2ZXRyYW5Qcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBZ0Q7QUFDaEQseURBQThEO0FBRzlELGlEQUE0RDtBQWE1RCxNQUFhLGFBQWMsU0FBUSxtQkFBSztJQUN0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXNCO1FBQzlELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXhCLE1BQU0sUUFBUSxHQUFHLGtCQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFFckMsUUFBUSxDQUFDLFdBQVcsQ0FDbEIsbUJBQW1CLEVBQ25CLGlDQUFpQyxFQUNqQyw4QkFBOEIsRUFDOUIsNkNBQTZDLEVBQzdDLCtCQUErQixFQUMvQixTQUFTLEtBQUssQ0FBQyxTQUFTLHlDQUF5QyxFQUNqRSw2REFBNkQsRUFDN0QsK0NBQStDLENBQ2hELENBQUM7UUFFRixJQUFJLGlCQUFXLENBQUMsSUFBSSxFQUFFLGVBQWUsRUFBRTtZQUNyQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVM7WUFDMUIsV0FBVyxFQUFFLGVBQWU7WUFDNUIsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO1lBQ2QsWUFBWSxFQUFFLEtBQUssQ0FBQyxZQUFZLElBQUksVUFBVTtZQUM5QyxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVMsSUFBSSxJQUFJO1lBQ2xDLEdBQUcsRUFBRTtnQkFDSCxPQUFPLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxPQUFPO2dCQUMzQixNQUFNLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxNQUFNO2FBQzFCO1lBQ0QsUUFBUSxFQUFFLFFBQVE7WUFDbEIsSUFBSSxFQUFFO2dCQUNKLEdBQUcsS0FBSyxDQUFDLElBQUk7Z0JBQ2Isa0NBQWtDLEVBQUUsWUFBWTtnQkFDaEQsOEJBQThCLEVBQUUsVUFBVTtnQkFDMUMsNEJBQTRCLEVBQUUsTUFBTTthQUNyQztTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXBDRCxzQ0FvQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdGFjaywgU3RhY2tQcm9wcyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgRWMySW5zdGFuY2UgfSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy9jb21wdXRlL2VjMlwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uL3R5cGVzXCI7XG5pbXBvcnQgeyBDb25uZWN0aW9ucywgVXNlckRhdGEgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjMlwiO1xuaW1wb3J0IHsgSVZwYyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5cbmludGVyZmFjZSBQcm94eUFnZW50UHJvcHMgZXh0ZW5kcyBTdGFja1Byb3BzIHtcbiAgYWNjb3VudElkPzogc3RyaW5nO1xuICB2cGM/OiBJVnBjO1xuICBwdWJsaWNLZXk6IHN0cmluZztcbiAgZW5hYmxlU1NIPzogYm9vbGVhbjtcbiAgaW5zdGFuY2VUeXBlOiBzdHJpbmc7XG4gIGRhdGFiYXNlQ29ubmVjdGlvbj86IENvbm5lY3Rpb25zO1xuICB0YWdzPzogS2V5VmFsdWU7XG59XG5cbmV4cG9ydCBjbGFzcyBGaXZldHJhblByb3h5IGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogUHJveHlBZ2VudFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCBwcm9wcyk7XG5cbiAgICBjb25zdCB1c2VyRGF0YSA9IFVzZXJEYXRhLmZvckxpbnV4KCk7XG5cbiAgICB1c2VyRGF0YS5hZGRDb21tYW5kcyhcbiAgICAgIFwiZ3JvdXBhZGQgZml2ZXRyYW5cIixcbiAgICAgIFwidXNlcmFkZCAtbSAtZyBmaXZldHJhbiBmaXZldHJhblwiLFxuICAgICAgXCJta2RpciAtcCAvaG9tZS9maXZldHJhbi8uc3NoXCIsXG4gICAgICBcImNob3duIGZpdmV0cmFuOmZpdmV0cmFuIC9ob21lL2ZpdmV0cmFuLy5zc2hcIixcbiAgICAgIFwiY2htb2QgNzAwIC9ob21lL2ZpdmV0cmFuLy5zc2hcIixcbiAgICAgIGBlY2hvIFwiJHtwcm9wcy5wdWJsaWNLZXl9XCIgPiAvaG9tZS9maXZldHJhbi8uc3NoL2F1dGhvcml6ZWRfa2V5c2AsXG4gICAgICBcImNob3duIGZpdmV0cmFuOmZpdmV0cmFuIC9ob21lL2ZpdmV0cmFuLy5zc2gvYXV0aG9yaXplZF9rZXlzXCIsXG4gICAgICBcImNobW9kIDYwMCAvaG9tZS9maXZldHJhbi8uc3NoL2F1dGhvcml6ZWRfa2V5c1wiXG4gICAgKTtcblxuICAgIG5ldyBFYzJJbnN0YW5jZSh0aGlzLCBcIkZpdmV0cmFuUHJveHlcIiwge1xuICAgICAgYWNjb3VudElkOiBwcm9wcy5hY2NvdW50SWQsXG4gICAgICBzZXJ2aWNlTmFtZTogXCJmaXZldHJhblByb3h5XCIsXG4gICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgIGluc3RhbmNlVHlwZTogcHJvcHMuaW5zdGFuY2VUeXBlIHx8IFwidDIubWljcm9cIixcbiAgICAgIGVuYWJsZVNTSDogcHJvcHMuZW5hYmxlU1NIIHx8IHRydWUsXG4gICAgICBlbnY6IHtcbiAgICAgICAgYWNjb3VudDogcHJvcHMuZW52Py5hY2NvdW50LFxuICAgICAgICByZWdpb246IHByb3BzLmVudj8ucmVnaW9uXG4gICAgICB9LFxuICAgICAgdXNlckRhdGE6IHVzZXJEYXRhLFxuICAgICAgdGFnczoge1xuICAgICAgICAuLi5wcm9wcy50YWdzLFxuICAgICAgICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOmVudmlyb25tZW50XCI6IFwicHJvZHVjdGlvblwiLFxuICAgICAgICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOnNlcnZpY2VcIjogXCJmaXZldHJhblwiLFxuICAgICAgICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOm93bmVyXCI6IFwiZGF0YVwiXG4gICAgICB9XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { Construct } from "constructs";
|
|
2
2
|
import App from "../../app";
|
|
3
3
|
import { Secret } from "../../resources/aws/secrets";
|
|
4
|
-
import { Vpc } from "../../resources/aws/networking/vpc";
|
|
5
4
|
import { Connections, IConnectable, IVpc } from "aws-cdk-lib/aws-ec2";
|
|
6
5
|
type StorageType = "Aurora" | "Instance" | "FreeTier";
|
|
7
6
|
export interface IStorageProps {
|
|
8
7
|
type: StorageType;
|
|
9
8
|
databaseName: string;
|
|
10
|
-
vpc?:
|
|
9
|
+
vpc?: IVpc;
|
|
11
10
|
tags?: {
|
|
12
11
|
[key: string]: string;
|
|
13
12
|
};
|
|
@@ -69,4 +69,4 @@ class Storage extends constructs_1.Construct {
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
exports.Storage = Storage;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3Mvc3RvcmFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBdUM7QUFHdkMsMkRBSXNDO0FBY3RDLE1BQWEsY0FBYztJQUN6QixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFvQjtRQUMzQyxPQUFPLENBQUMsR0FBUSxFQUFFLEtBQWdCLEVBQUUsRUFBRTtZQUNwQyxNQUFNLFlBQVksR0FBRztnQkFDbkIsR0FBRztvQkFDRCxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsYUFBYSxFQUFFO2lCQUN0QztnQkFDRCxHQUFHLEtBQUs7YUFDVCxDQUFDO1lBQ0YsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQzlDLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQVpELHdDQVlDO0FBRUQsTUFBYSxPQUFRLFNBQVEsc0JBQVM7SUFVcEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFFbkIsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELFVBQVUsQ0FBQyxLQUFvQjtRQUM3QixJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDNUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQztnQkFDZixNQUFNLElBQUksS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7WUFDekQsQ0FBQztZQUNELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxvQkFBUyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDOUQsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDaEUsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDaEUsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHO2dCQUNkLFlBQVksRUFBRSxLQUFLLENBQUMsWUFBWTtnQkFDaEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRTthQUN2QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztRQUMzQyxDQUFDO1FBRUQsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQztJQUMvQyxDQUFDO0lBRUQsY0FBYztRQUNaLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQztJQUMzQixDQUFDO0NBQ0Y7QUEvREQsMEJBK0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmltcG9ydCBBcHAgZnJvbSBcIi4uLy4uL2FwcFwiO1xuaW1wb3J0IHtcbiAgUmRzQXVyb3JhLFxuICBSZHNGcmVlVGllcixcbiAgUmRzSW5zdGFuY2Vcbn0gZnJvbSBcIi4uLy4uL3Jlc291cmNlcy9hd3MvZGF0YWJhc2VcIjtcbmltcG9ydCB7IFNlY3JldCB9IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL3NlY3JldHNcIjtcblxuaW1wb3J0IHsgQ29ubmVjdGlvbnMsIElDb25uZWN0YWJsZSwgSVZwYyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5cbnR5cGUgU3RvcmFnZVR5cGUgPSBcIkF1cm9yYVwiIHwgXCJJbnN0YW5jZVwiIHwgXCJGcmVlVGllclwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIElTdG9yYWdlUHJvcHMge1xuICB0eXBlOiBTdG9yYWdlVHlwZTtcbiAgZGF0YWJhc2VOYW1lOiBzdHJpbmc7XG4gIHZwYz86IElWcGM7XG4gIHRhZ3M/OiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xufVxuXG5leHBvcnQgY2xhc3MgU3RvcmFnZUZhY3Rvcnkge1xuICBzdGF0aWMgYnVpbGQoaWQ6IHN0cmluZywgcHJvcHM6IElTdG9yYWdlUHJvcHMpIHtcbiAgICByZXR1cm4gKGFwcDogQXBwLCBzY29wZTogQ29uc3RydWN0KSA9PiB7XG4gICAgICBjb25zdCBzdG9yYWdlUHJvcHMgPSB7XG4gICAgICAgIC4uLntcbiAgICAgICAgICB2cGM6IHByb3BzLnZwYyB8fCBhcHAuZ2V0RGVmYXVsdFZwYygpXG4gICAgICAgIH0sXG4gICAgICAgIC4uLnByb3BzXG4gICAgICB9O1xuICAgICAgcmV0dXJuIG5ldyBTdG9yYWdlKHNjb3BlLCBpZCwgc3RvcmFnZVByb3BzKTtcbiAgICB9O1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBTdG9yYWdlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSUNvbm5lY3RhYmxlIHtcbiAgcHVibGljIGlkOiBzdHJpbmc7XG4gIHB1YmxpYyBzY29wZTogQ29uc3RydWN0O1xuICBwdWJsaWMgdnBjOiBJVnBjO1xuXG4gIHB1YmxpYyBjb25uZWN0aW9uczogQ29ubmVjdGlvbnM7XG5cbiAgcHJpdmF0ZSBkYXRhYmFzZU5hbWU6IHN0cmluZztcbiAgcHJpdmF0ZSBkYXRhYmFzZTogUmRzQXVyb3JhIHwgUmRzSW5zdGFuY2UgfCBSZHNGcmVlVGllcjtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSVN0b3JhZ2VQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgdGhpcy5pZCA9IGlkO1xuICAgIHRoaXMuc2NvcGUgPSBzY29wZTtcblxuICAgIHRoaXMuZGF0YWJhc2VOYW1lID0gcHJvcHMuZGF0YWJhc2VOYW1lO1xuICAgIHRoaXMuYWRkU3RvcmFnZShwcm9wcyk7XG4gIH1cblxuICBhZGRTdG9yYWdlKHByb3BzOiBJU3RvcmFnZVByb3BzKSB7XG4gICAgaWYgKHByb3BzLnR5cGUgPT09IFwiQXVyb3JhXCIpIHtcbiAgICAgIGlmICghcHJvcHMudnBjKSB7XG4gICAgICAgIHRocm93IG5ldyBFcnJvcihcIlZQQyBpcyByZXF1aXJlZCBmb3IgQXVyb3JhIGRhdGFiYXNlXCIpO1xuICAgICAgfVxuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNBdXJvcmEodGhpcywgYCR7cHJvcHMuZGF0YWJhc2VOYW1lfVJkc2AsIHtcbiAgICAgICAgdnBjOiBwcm9wcy52cGMsXG4gICAgICAgIGRhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2VOYW1lLFxuICAgICAgICB0YWdzOiBwcm9wcy50YWdzIHx8IHt9XG4gICAgICB9KTtcbiAgICB9IGVsc2UgaWYgKHByb3BzLnR5cGUgPT09IFwiSW5zdGFuY2VcIikge1xuICAgICAgdGhpcy5kYXRhYmFzZSA9IG5ldyBSZHNJbnN0YW5jZSh0aGlzLCBgJHtwcm9wcy5kYXRhYmFzZU5hbWV9UmRzYCwge1xuICAgICAgICB2cGM6IHByb3BzLnZwYyxcbiAgICAgICAgZGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZU5hbWUsXG4gICAgICAgIHRhZ3M6IHByb3BzLnRhZ3MgfHwge31cbiAgICAgIH0pO1xuICAgIH0gZWxzZSBpZiAocHJvcHMudHlwZSA9PT0gXCJGcmVlVGllclwiKSB7XG4gICAgICB0aGlzLmRhdGFiYXNlID0gbmV3IFJkc0ZyZWVUaWVyKHRoaXMsIGAke3Byb3BzLmRhdGFiYXNlTmFtZX1SZHNgLCB7XG4gICAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgICBkYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgdGFnczogcHJvcHMudGFncyB8fCB7fVxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcIkludmFsaWQgZGF0YWJhc2UgdHlwZVwiKTtcbiAgICB9XG5cbiAgICB0aGlzLmNvbm5lY3Rpb25zID0gdGhpcy5kYXRhYmFzZS5jb25uZWN0aW9ucztcbiAgfVxuXG4gIGdldENyZWRlbnRpYWxzKCk6IFNlY3JldCB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2UuZ2V0Q3JlZGVudGlhbHMoKTtcbiAgfVxuXG4gIGdldEhvc3RFbmRwb2ludCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmRhdGFiYXNlLmdldEhvc3RFbmRwb2ludCgpO1xuICB9XG5cbiAgZ2V0SG9zdFBvcnQoKTogc3RyaW5nIHwgbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5kYXRhYmFzZS5nZXRIb3N0UG9ydCgpO1xuICB9XG5cbiAgZ2V0RGF0YWJhc2VOYW1lKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2VOYW1lO1xuICB9XG59XG4iXX0=
|
|
@@ -33,8 +33,18 @@ class AwsStack {
|
|
|
33
33
|
return new aws_cdk_lib_1.Stack(app_1.default.getInstance(), id, this.getStackProps(props));
|
|
34
34
|
}
|
|
35
35
|
getStackProps(props) {
|
|
36
|
-
|
|
36
|
+
// If no explicit props are provided, fall back to the account/region that
|
|
37
|
+
// CDK resolved for this run. This allows context look-ups (e.g.
|
|
38
|
+
// Vpc.fromLookup) to work without every stack having to be created with
|
|
39
|
+
// explicit env settings.
|
|
40
|
+
if (!props) {
|
|
41
|
+
const account = process.env.CDK_DEFAULT_ACCOUNT;
|
|
42
|
+
const region = process.env.CDK_DEFAULT_REGION;
|
|
43
|
+
if (account && region) {
|
|
44
|
+
return { env: { account, region } };
|
|
45
|
+
}
|
|
37
46
|
return;
|
|
47
|
+
}
|
|
38
48
|
const stackProps = {
|
|
39
49
|
env: props.accountId && props.region
|
|
40
50
|
? { account: props.accountId, region: props.region }
|
|
@@ -99,4 +109,4 @@ class AwsStack {
|
|
|
99
109
|
}
|
|
100
110
|
exports.AwsStack = AwsStack;
|
|
101
111
|
exports.default = AwsStack;
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awsStack.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/base/awsStack.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAChD,iDAAyD;AACzD,2CAAuC;AAEvC,sCAA+B;AAC/B,iDAAiD;AAoBjD,MAAa,QAAQ;IASnB,YACE,EAAU,EACV,YAAoC,EACpC,KAAqB;QAXP,cAAS,GAErB,EAAE,CAAC;QAWL,yBAAyB;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAEzC,kCAAkC;QAClC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAEO,eAAe,CAAC,YAAoC;QAC1D,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;gBACtC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,EAAU,EAAE,KAAqB;QACnD,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YAC7C,OAAO,IAAI,mBAAK,CAAC,SAAS,EAAE,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,kCAAkC;QAChG,CAAC;QAED,OAAO,IAAI,mBAAK,CAAC,aAAG,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;IAEO,aAAa,CACnB,KAAgC;QAEhC,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,UAAU,GAAe;YAC7B,GAAG,EACD,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM;gBAC7B,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;gBACpD,CAAC,CAAC,SAAS;SAChB,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,8DAA8D;IACtD,aAAa,CAAC,GAAQ;QAC5B,OAAO,GAAG,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,SAAoB;QACtC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yCAAyC;IAClC,WAAW,CAAC,EAA6C;QAC9D,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAMM,UAAU,CACf,QAAiE;QAEjE,MAAM,cAAc,GAClB,QAAQ,YAAY,sBAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAMM,oBAAoB,CACzB,QAAmE;QAEnE,MAAM,cAAc,GAClB,QAAQ,YAAY,oBAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC;QACxD,IAAI,CAAC,iBAAiB,GAAG,cAAc,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAEM,WAAW,CAAC,UAAkB;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAEM,OAAO,CACZ,IAAwB,EACxB,EAAsB,EACtB,IAAa;QAEb,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAE9B,MAAM,YAAY,GAChB,IAAI,YAAY,sBAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,EAAE,YAAY,sBAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAEvE,IAAI,CAAC,YAAY,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QAE9C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;YACtE,OAAO,IAAI,CAAC;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,cAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,MAAM,EAAE,CAAC;QACzD,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEzD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA9ID,4BA8IC;AACD,kBAAe,QAAQ,CAAC","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"]}
|
|
112
|
+
//# 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"]}
|
|
@@ -8,7 +8,7 @@ interface Ec2InstanceProps extends StackProps {
|
|
|
8
8
|
blockDevices?: BlockDevice[];
|
|
9
9
|
accountId?: string;
|
|
10
10
|
serviceName: string;
|
|
11
|
-
|
|
11
|
+
vpc?: IVpc;
|
|
12
12
|
subnetConfiguration?: SubnetConfiguration[];
|
|
13
13
|
minCapcity?: number;
|
|
14
14
|
maxCapacity?: number;
|
|
@@ -25,13 +25,13 @@ export declare class Ec2Instance extends Construct implements IConnectable {
|
|
|
25
25
|
asgSecurityGroup: SecurityGroup;
|
|
26
26
|
private autoScalingGroup;
|
|
27
27
|
private keyPair;
|
|
28
|
-
constructor(scope: Construct, id: string, props: Ec2InstanceProps);
|
|
29
28
|
connections: Connections;
|
|
29
|
+
constructor(scope: Construct, id: string, props: Ec2InstanceProps);
|
|
30
30
|
addVpc(props: Ec2InstanceProps): void;
|
|
31
31
|
addKeyPair(props: Ec2InstanceProps): void;
|
|
32
32
|
addLaunchTemplate(props: Ec2InstanceProps): void;
|
|
33
33
|
addAutoScalingGroup(props: Ec2InstanceProps): void;
|
|
34
|
-
suspendAutoScaling(): void;
|
|
34
|
+
suspendAutoScaling(props: Ec2InstanceProps): void;
|
|
35
35
|
}
|
|
36
36
|
export declare class Ec2InstanceStack extends Stack {
|
|
37
37
|
constructor(scope: Construct, id: string, props: Ec2InstanceProps);
|
|
@@ -16,14 +16,15 @@ class Ec2Instance extends constructs_1.Construct {
|
|
|
16
16
|
this.addKeyPair(props);
|
|
17
17
|
this.addLaunchTemplate(props);
|
|
18
18
|
this.addAutoScalingGroup(props);
|
|
19
|
-
this.suspendAutoScaling();
|
|
20
|
-
//
|
|
19
|
+
this.suspendAutoScaling(props);
|
|
20
|
+
// Initialize connections with the security group
|
|
21
|
+
this.connections = new aws_ec2_1.Connections({
|
|
22
|
+
securityGroups: [this.asgSecurityGroup]
|
|
23
|
+
});
|
|
21
24
|
}
|
|
22
25
|
addVpc(props) {
|
|
23
|
-
if (props.
|
|
24
|
-
this.vpc =
|
|
25
|
-
vpcId: props.vpcId
|
|
26
|
-
});
|
|
26
|
+
if (props.vpc) {
|
|
27
|
+
this.vpc = props.vpc;
|
|
27
28
|
}
|
|
28
29
|
else {
|
|
29
30
|
this.vpc = new vpc_1.Vpc(this, `${props.serviceName}Vpc`, {
|
|
@@ -93,9 +94,9 @@ class Ec2Instance extends constructs_1.Construct {
|
|
|
93
94
|
});
|
|
94
95
|
(0, tagResource_1.default)(this.autoScalingGroup, props.tags);
|
|
95
96
|
}
|
|
96
|
-
suspendAutoScaling() {
|
|
97
|
+
suspendAutoScaling(props) {
|
|
97
98
|
new awsCustomResource_1.AwsCustomResource(this, "SuspendAutoscaling", {
|
|
98
|
-
functionName:
|
|
99
|
+
functionName: `${props.serviceName}SuspendAutoScaling`,
|
|
99
100
|
onCreate: {
|
|
100
101
|
service: "AutoScaling",
|
|
101
102
|
action: "suspendProcesses",
|
|
@@ -128,4 +129,4 @@ class Ec2InstanceStack extends aws_cdk_lib_1.Stack {
|
|
|
128
129
|
}
|
|
129
130
|
}
|
|
130
131
|
exports.Ec2InstanceStack = Ec2InstanceStack;
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/compute/ec2.ts"],"names":[],"mappings":";;;AAAA,iDAkB6B;AAC7B,2CAAuC;AACvC,6CAA0D;AAC1D,4DAAqD;AAErD,iEAKqC;AAErC,sEAAmE;AACnE,mEAAkE;AAClE,2CAAwC;AAmBxC,MAAa,WAAY,SAAQ,sBAAS;IAOxC,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAuB;QAC/D,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,uEAAuE;IACzE,CAAC;IAGD,MAAM,CAAC,KAAuB;QAC5B,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,GAAG,SAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,KAAK,EAAE;gBACzD,KAAK,EAAE,KAAK,CAAC,KAAK;aACnB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,GAAG,IAAI,SAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,KAAK,EAAE;gBAClD,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;aAC/C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,UAAU,CAAC,KAAuB;QAChC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,6EAA6E;YAC7E,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CAAC,IAAI,EAAE,SAAS,EAAE;gBAC1C,WAAW,EAAE,GAAG,KAAK,CAAC,WAAW,SAAS;aAC3C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,KAAuB;QACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,uBAAa,CAAC,IAAI,EAAE,kBAAkB,EAAE;YAClE,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,WAAW,EAAE,0BAA0B,KAAK,CAAC,WAAW,qBAAqB;SAC9E,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAClC,cAAI,CAAC,OAAO,EAAE,EACd,cAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EACZ,WAAW,CACZ,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,wBAAc,CAAC,IAAI,EAAE,gBAAgB,EAAE;YAC/D,kBAAkB,EAAE,GAAG,KAAK,CAAC,WAAW,gBAAgB;YACxD,YAAY,EAAE,IAAI,sBAAY,CAAC,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;YACvD,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,sBAAY,CAAC,kBAAkB,EAAE;YACrE,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,EAAE,YAAY;YACjC,aAAa,EAAE,IAAI,CAAC,gBAAgB;YACpC,kBAAkB,EAAE,IAAI;YACxB,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,CAAC;YAC1B,UAAU,EAAE,kCAAwB,CAAC,QAAQ;YAC7C,oBAAoB,EAAE,IAAI;YAC1B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,wBAAwB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;SACtD,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB,CAAC,KAAuB;QACzC,+BAA+B;QAC/B,yEAAyE;QACzE,IAAI,CAAC,gBAAgB,GAAG,IAAI,kCAAgB,CAAC,IAAI,EAAE,kBAAkB,EAAE;YACrE,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,UAAU,EAAE;gBACV,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aAC5D;YACD,WAAW,EAAE,KAAK,CAAC,UAAU;YAC7B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,QAAQ,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,YAAY,EAAE,CAAC,8BAAY,CAAC,GAAG,EAAE,CAAC;YAClC,YAAY,EAAE,8BAAY,CAAC,eAAe,EAAE;YAC5C,gCAAgC,EAAE,IAAI;YACtC,wCAAwC;YACxC,mBAAmB,EAAE;gBACnB,mCAAiB,CAAC,2BAA2B;gBAC7C,mCAAiB,CAAC,6BAA6B;aAChD;YACD,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;QACH,IAAA,qBAAW,EAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,kBAAkB;QAChB,IAAI,qCAAiB,CAAC,IAAI,EAAE,oBAAoB,EAAE;YAChD,YAAY,EAAE,oBAAoB;YAClC,QAAQ,EAAE;gBACR,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE,kBAAkB;gBAC1B,UAAU,EAAE;oBACV,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB;oBAChE,gBAAgB,EAAE,CAAC,aAAa,CAAC;iBAClC;gBACD,kBAAkB,EAAE,qCAAkB,CAAC,EAAE,CAAC,oBAAoB,CAAC;aAChE;YACD,QAAQ,EAAE;gBACR,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE,kBAAkB;gBAC1B,UAAU,EAAE;oBACV,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB;oBAChE,gBAAgB,EAAE,CAAC,aAAa,CAAC;iBAClC;gBACD,kBAAkB,EAAE,qCAAkB,CAAC,EAAE,CAAC,oBAAoB,CAAC;aAChE;YACD,YAAY,EAAE,4BAA4B;SAC3C,CAAC,CAAC;IACL,CAAC;CACF;AA9HD,kCA8HC;AAED,MAAa,gBAAiB,SAAQ,mBAAK;IACzC,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAuB;QAC/D,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAExB,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE;YACxB,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AARD,4CAQC","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"]}
|
|
132
|
+
//# 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"]}
|
|
@@ -4,6 +4,12 @@ export interface IpamPoolProps extends StackProps {
|
|
|
4
4
|
orgAccounts: string[];
|
|
5
5
|
ipamScope?: string;
|
|
6
6
|
region: string;
|
|
7
|
+
/**
|
|
8
|
+
* The netmask length (/CIDR) each child IPAM pool should receive.
|
|
9
|
+
* Controls the size of CIDR blocks automatically allocated to VPCs from the pool.
|
|
10
|
+
* Accepted range: /16 (65,536 IPs) – /28 (16 IPs). Defaults to /20 (4,096 IPs).
|
|
11
|
+
*/
|
|
12
|
+
allocationDefaultNetmaskLength?: number;
|
|
7
13
|
}
|
|
8
14
|
interface IpamPoolStackProps extends StackProps {
|
|
9
15
|
orgAccounts: string[];
|
|
@@ -4,7 +4,6 @@ exports.IpamPoolStack = exports.IpamPool = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const constructs_1 = require("constructs");
|
|
6
6
|
const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
7
|
-
const getCidr_1 = require("../../../utils/getCidr");
|
|
8
7
|
const resourceShare_1 = require("../utilities/resourceShare");
|
|
9
8
|
const getAccountId_1 = require("../../../utils/getAccountId");
|
|
10
9
|
class IpamPool extends constructs_1.Construct {
|
|
@@ -15,16 +14,47 @@ class IpamPool extends constructs_1.Construct {
|
|
|
15
14
|
// Prioritise region from props, then from env
|
|
16
15
|
const region = props.region;
|
|
17
16
|
const organisationAccounts = props.orgAccounts.map((account) => account.toLowerCase());
|
|
17
|
+
// Determine the child-pool CIDR size (defaults to /20)
|
|
18
|
+
const defaultNetmaskLength = props.allocationDefaultNetmaskLength ?? 20;
|
|
19
|
+
// Basic validation – /16 to /28 inclusive are considered safe for VPC allocations
|
|
20
|
+
if (defaultNetmaskLength < 16 || defaultNetmaskLength > 28) {
|
|
21
|
+
throw new Error(`allocationDefaultNetmaskLength must be between 16 and 28 (inclusive). Received: ${defaultNetmaskLength}`);
|
|
22
|
+
}
|
|
23
|
+
// Create the top-level pools
|
|
24
|
+
const rootPool = new aws_ec2_1.CfnIPAMPool(this, "TopLevelIpamPool", {
|
|
25
|
+
description: `Root IPAM pool`,
|
|
26
|
+
addressFamily: "ipv4",
|
|
27
|
+
ipamScopeId: IpamPrivateDefaultScopeId,
|
|
28
|
+
locale: region,
|
|
29
|
+
// Explicitly provision the /8 CIDR once at the top-level
|
|
30
|
+
provisionedCidrs: [
|
|
31
|
+
{ cidr: "10.0.0.0/8" },
|
|
32
|
+
{ cidr: "172.16.0.0/12" },
|
|
33
|
+
{ cidr: "192.168.0.0/16" }
|
|
34
|
+
],
|
|
35
|
+
autoImport: true,
|
|
36
|
+
tags: [
|
|
37
|
+
{
|
|
38
|
+
key: "fjall:operations:pool",
|
|
39
|
+
value: "top-level"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
key: "fjall:costAllocation:type",
|
|
43
|
+
value: "root"
|
|
44
|
+
}
|
|
45
|
+
]
|
|
46
|
+
});
|
|
47
|
+
// Create a child pool for each Organisation account
|
|
18
48
|
for (const account of organisationAccounts) {
|
|
19
|
-
const cidrBlock = new getCidr_1.default();
|
|
20
|
-
const freeCidrBlock = cidrBlock.getCidrBlock();
|
|
21
|
-
cidrBlock.updateState(freeCidrBlock, false);
|
|
22
49
|
const accountId = (0, getAccountId_1.default)(account);
|
|
23
|
-
const ipamPool = new aws_ec2_1.CfnIPAMPool(this, `${account}IpamPool
|
|
24
|
-
description: `${account} - IPAM pool - ${region}
|
|
50
|
+
const ipamPool = new aws_ec2_1.CfnIPAMPool(this, `${account}IpamPool`, {
|
|
51
|
+
description: `${account} - IPAM pool - ${region}`,
|
|
25
52
|
addressFamily: "ipv4",
|
|
26
53
|
ipamScopeId: IpamPrivateDefaultScopeId,
|
|
27
54
|
locale: region,
|
|
55
|
+
// Allocate from the root pool automatically
|
|
56
|
+
sourceIpamPoolId: rootPool.attrIpamPoolId,
|
|
57
|
+
allocationDefaultNetmaskLength: defaultNetmaskLength,
|
|
28
58
|
allocationResourceTags: [
|
|
29
59
|
{
|
|
30
60
|
key: "fjall:operations:pool",
|
|
@@ -32,11 +62,10 @@ class IpamPool extends constructs_1.Construct {
|
|
|
32
62
|
}
|
|
33
63
|
],
|
|
34
64
|
autoImport: true,
|
|
35
|
-
provisionedCidrs: [{ cidr: freeCidrBlock }],
|
|
36
65
|
tags: [
|
|
37
66
|
{
|
|
38
67
|
key: "fjall:operations:pool",
|
|
39
|
-
value:
|
|
68
|
+
value: `${accountId}`
|
|
40
69
|
},
|
|
41
70
|
{
|
|
42
71
|
key: "fjall:costAllocation:accountName",
|
|
@@ -44,10 +73,15 @@ class IpamPool extends constructs_1.Construct {
|
|
|
44
73
|
}
|
|
45
74
|
]
|
|
46
75
|
});
|
|
76
|
+
// Allocate an initial CIDR block to the child pool so that VPCs can immediately allocate
|
|
77
|
+
new aws_ec2_1.CfnIPAMPoolCidr(this, `${account}PoolCidr${defaultNetmaskLength}`, {
|
|
78
|
+
ipamPoolId: ipamPool.attrIpamPoolId,
|
|
79
|
+
netmaskLength: defaultNetmaskLength
|
|
80
|
+
});
|
|
81
|
+
// Share the pool with the target account so that VPCs can allocate
|
|
47
82
|
new resourceShare_1.ResourceShare(this, `${account}${region}IpamResourceShare`, {
|
|
48
83
|
name: `${account}IpamResourceShare.${region}`,
|
|
49
84
|
allowExternalPrincipals: false,
|
|
50
|
-
// TODO: getAccountId expects environment as argument
|
|
51
85
|
principals: [accountId],
|
|
52
86
|
resourceArns: [ipamPool.attrArn],
|
|
53
87
|
tags: [
|
|
@@ -57,6 +91,7 @@ class IpamPool extends constructs_1.Construct {
|
|
|
57
91
|
}
|
|
58
92
|
]
|
|
59
93
|
});
|
|
94
|
+
// Expose the pool ID for cross-stack usage (e.g. VPC allocations)
|
|
60
95
|
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolId${accountId}`, {
|
|
61
96
|
key: `IpamPoolId${accountId}`,
|
|
62
97
|
value: ipamPool.attrIpamPoolId,
|
|
@@ -81,4 +116,4 @@ class IpamPoolStack extends aws_cdk_lib_1.Stack {
|
|
|
81
116
|
}
|
|
82
117
|
}
|
|
83
118
|
exports.IpamPoolStack = IpamPoolStack;
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBhbVBvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9uZXR3b3JraW5nL2lwYW1Qb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUErRDtBQUMvRCwyQ0FBdUM7QUFDdkMsaURBQW1FO0FBQ25FLG9EQUErQztBQUMvQyw4REFBMkQ7QUFDM0QsOERBQXVEO0FBYXZELE1BQWEsUUFBUyxTQUFRLHNCQUFTO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQiwwREFBMEQ7UUFDMUQsTUFBTSx5QkFBeUIsR0FDN0IsS0FBSyxDQUFDLFNBQVMsSUFBSSxnQkFBRSxDQUFDLFdBQVcsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1FBQ2pFLDhDQUE4QztRQUM5QyxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDO1FBRTVCLE1BQU0sb0JBQW9CLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUM3RCxPQUFPLENBQUMsV0FBVyxFQUFFLENBQ3RCLENBQUM7UUFFRixLQUFLLE1BQU0sT0FBTyxJQUFJLG9CQUFvQixFQUFFLENBQUM7WUFDM0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxpQkFBUyxFQUFFLENBQUM7WUFDbEMsTUFBTSxhQUFhLEdBQUcsU0FBUyxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQy9DLFNBQVMsQ0FBQyxXQUFXLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBRTVDLE1BQU0sU0FBUyxHQUFHLElBQUEsc0JBQVksRUFBQyxPQUFPLENBQUMsQ0FBQztZQUV4QyxNQUFNLFFBQVEsR0FBRyxJQUFJLHFCQUFhLENBQ2hDLElBQUksRUFDSixHQUFHLE9BQU8sV0FBVyxhQUFhLEVBQUUsRUFDcEM7Z0JBQ0UsV0FBVyxFQUFFLEdBQUcsT0FBTyxrQkFBa0IsTUFBTSxNQUFNLGFBQWEsRUFBRTtnQkFDcEUsYUFBYSxFQUFFLE1BQU07Z0JBQ3JCLFdBQVcsRUFBRSx5QkFBeUI7Z0JBQ3RDLE1BQU0sRUFBRSxNQUFNO2dCQUNkLHNCQUFzQixFQUFFO29CQUN0Qjt3QkFDRSxHQUFHLEVBQUUsdUJBQXVCO3dCQUM1QixLQUFLLEVBQUUsR0FBRyxTQUFTLEVBQUU7cUJBQ3RCO2lCQUNGO2dCQUNELFVBQVUsRUFBRSxJQUFJO2dCQUNoQixnQkFBZ0IsRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxDQUFDO2dCQUMzQyxJQUFJLEVBQUU7b0JBQ0o7d0JBQ0UsR0FBRyxFQUFFLHVCQUF1Qjt3QkFDNUIsS0FBSyxFQUFFLFdBQVc7cUJBQ25CO29CQUNEO3dCQUNFLEdBQUcsRUFBRSxrQ0FBa0M7d0JBQ3ZDLEtBQUssRUFBRSxHQUFHLE9BQU8sRUFBRTtxQkFDcEI7aUJBQ0Y7YUFDRixDQUNGLENBQUM7WUFFRixJQUFJLDZCQUFhLENBQUMsSUFBSSxFQUFFLEdBQUcsT0FBTyxHQUFHLE1BQU0sbUJBQW1CLEVBQUU7Z0JBQzlELElBQUksRUFBRSxHQUFHLE9BQU8scUJBQXFCLE1BQU0sRUFBRTtnQkFDN0MsdUJBQXVCLEVBQUUsS0FBSztnQkFDOUIscURBQXFEO2dCQUNyRCxVQUFVLEVBQUUsQ0FBQyxTQUFTLENBQUM7Z0JBQ3ZCLFlBQVksRUFBRSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7Z0JBQ2hDLElBQUksRUFBRTtvQkFDSjt3QkFDRSxHQUFHLEVBQUUsOEJBQThCO3dCQUNuQyxLQUFLLEVBQUUsR0FBRyxPQUFPLEVBQUU7cUJBQ3BCO2lCQUNGO2FBQ0YsQ0FBQyxDQUFDO1lBRUgsSUFBSSx1QkFBUyxDQUFDLElBQUksRUFBRSxhQUFhLFNBQVMsRUFBRSxFQUFFO2dCQUM1QyxHQUFHLEVBQUUsYUFBYSxTQUFTLEVBQUU7Z0JBQzdCLEtBQUssRUFBRSxRQUFRLENBQUMsY0FBYztnQkFDOUIsVUFBVSxFQUFFLGFBQWEsU0FBUyxFQUFFO2FBQ3JDLENBQUMsQ0FBQztZQUVILElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsY0FBYyxTQUFTLEVBQUUsRUFBRTtnQkFDN0MsR0FBRyxFQUFFLGNBQWMsU0FBUyxFQUFFO2dCQUM5QixLQUFLLEVBQUUsUUFBUSxDQUFDLE9BQU87Z0JBQ3ZCLFVBQVUsRUFBRSxjQUFjLFNBQVMsRUFBRTthQUN0QyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBN0VELDRCQTZFQztBQUVELE1BQWEsYUFBYyxTQUFRLG1CQUFLO0lBQ3RDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBeUI7UUFDakUsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQixJQUFJLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFO1lBQzdCLFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVztZQUM5QixNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU07U0FDckIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBVEQsc0NBU0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBGbiwgQ2ZuT3V0cHV0LCBTdGFja1Byb3BzLCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IENmbklQQU1Qb29sIGFzIElwYW1Qb29sQ2xhc3MgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjMlwiO1xuaW1wb3J0IENpZHJCbG9jayBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvZ2V0Q2lkclwiO1xuaW1wb3J0IHsgUmVzb3VyY2VTaGFyZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcmVzb3VyY2VTaGFyZVwiO1xuaW1wb3J0IGdldEFjY291bnRJZCBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvZ2V0QWNjb3VudElkXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSXBhbVBvb2xQcm9wcyBleHRlbmRzIFN0YWNrUHJvcHMge1xuICBvcmdBY2NvdW50czogc3RyaW5nW107XG4gIGlwYW1TY29wZT86IHN0cmluZztcbiAgcmVnaW9uOiBzdHJpbmc7XG59XG5cbmludGVyZmFjZSBJcGFtUG9vbFN0YWNrUHJvcHMgZXh0ZW5kcyBTdGFja1Byb3BzIHtcbiAgb3JnQWNjb3VudHM6IHN0cmluZ1tdO1xuICByZWdpb246IHN0cmluZztcbn1cblxuZXhwb3J0IGNsYXNzIElwYW1Qb29sIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IElwYW1Qb29sUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuXG4gICAgLy8gR2V0IHRoZSBkZWZhdWx0IElQQU0gc2NvcGUgSUQgZnJvbSBwcm9wcywgb3IgQ0ZOIGltcG9ydFxuICAgIGNvbnN0IElwYW1Qcml2YXRlRGVmYXVsdFNjb3BlSWQgPVxuICAgICAgcHJvcHMuaXBhbVNjb3BlIHx8IEZuLmltcG9ydFZhbHVlKFwiSXBhbVByaXZhdGVEZWZhdWx0U2NvcGVJZFwiKTtcbiAgICAvLyBQcmlvcml0aXNlIHJlZ2lvbiBmcm9tIHByb3BzLCB0aGVuIGZyb20gZW52XG4gICAgY29uc3QgcmVnaW9uID0gcHJvcHMucmVnaW9uO1xuXG4gICAgY29uc3Qgb3JnYW5pc2F0aW9uQWNjb3VudHMgPSBwcm9wcy5vcmdBY2NvdW50cy5tYXAoKGFjY291bnQpID0+XG4gICAgICBhY2NvdW50LnRvTG93ZXJDYXNlKClcbiAgICApO1xuXG4gICAgZm9yIChjb25zdCBhY2NvdW50IG9mIG9yZ2FuaXNhdGlvbkFjY291bnRzKSB7XG4gICAgICBjb25zdCBjaWRyQmxvY2sgPSBuZXcgQ2lkckJsb2NrKCk7XG4gICAgICBjb25zdCBmcmVlQ2lkckJsb2NrID0gY2lkckJsb2NrLmdldENpZHJCbG9jaygpO1xuICAgICAgY2lkckJsb2NrLnVwZGF0ZVN0YXRlKGZyZWVDaWRyQmxvY2ssIGZhbHNlKTtcblxuICAgICAgY29uc3QgYWNjb3VudElkID0gZ2V0QWNjb3VudElkKGFjY291bnQpO1xuXG4gICAgICBjb25zdCBpcGFtUG9vbCA9IG5ldyBJcGFtUG9vbENsYXNzKFxuICAgICAgICB0aGlzLFxuICAgICAgICBgJHthY2NvdW50fUlwYW1Qb29sJHtmcmVlQ2lkckJsb2NrfWAsXG4gICAgICAgIHtcbiAgICAgICAgICBkZXNjcmlwdGlvbjogYCR7YWNjb3VudH0gLSBJUEFNIHBvb2wgLSAke3JlZ2lvbn0gLSAke2ZyZWVDaWRyQmxvY2t9YCxcbiAgICAgICAgICBhZGRyZXNzRmFtaWx5OiBcImlwdjRcIixcbiAgICAgICAgICBpcGFtU2NvcGVJZDogSXBhbVByaXZhdGVEZWZhdWx0U2NvcGVJZCxcbiAgICAgICAgICBsb2NhbGU6IHJlZ2lvbixcbiAgICAgICAgICBhbGxvY2F0aW9uUmVzb3VyY2VUYWdzOiBbXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgIGtleTogXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIixcbiAgICAgICAgICAgICAgdmFsdWU6IGAke2FjY291bnRJZH1gXG4gICAgICAgICAgICB9XG4gICAgICAgICAgXSxcbiAgICAgICAgICBhdXRvSW1wb3J0OiB0cnVlLFxuICAgICAgICAgIHByb3Zpc2lvbmVkQ2lkcnM6IFt7IGNpZHI6IGZyZWVDaWRyQmxvY2sgfV0sXG4gICAgICAgICAgdGFnczogW1xuICAgICAgICAgICAge1xuICAgICAgICAgICAgICBrZXk6IFwiZmphbGw6b3BlcmF0aW9uczpwb29sXCIsXG4gICAgICAgICAgICAgIHZhbHVlOiBcInRvcC1sZXZlbFwiXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAge1xuICAgICAgICAgICAgICBrZXk6IFwiZmphbGw6Y29zdEFsbG9jYXRpb246YWNjb3VudE5hbWVcIixcbiAgICAgICAgICAgICAgdmFsdWU6IGAke2FjY291bnR9YFxuICAgICAgICAgICAgfVxuICAgICAgICAgIF1cbiAgICAgICAgfVxuICAgICAgKTtcblxuICAgICAgbmV3IFJlc291cmNlU2hhcmUodGhpcywgYCR7YWNjb3VudH0ke3JlZ2lvbn1JcGFtUmVzb3VyY2VTaGFyZWAsIHtcbiAgICAgICAgbmFtZTogYCR7YWNjb3VudH1JcGFtUmVzb3VyY2VTaGFyZS4ke3JlZ2lvbn1gLFxuICAgICAgICBhbGxvd0V4dGVybmFsUHJpbmNpcGFsczogZmFsc2UsXG4gICAgICAgIC8vIFRPRE86IGdldEFjY291bnRJZCBleHBlY3RzIGVudmlyb25tZW50IGFzIGFyZ3VtZW50XG4gICAgICAgIHByaW5jaXBhbHM6IFthY2NvdW50SWRdLFxuICAgICAgICByZXNvdXJjZUFybnM6IFtpcGFtUG9vbC5hdHRyQXJuXSxcbiAgICAgICAgdGFnczogW1xuICAgICAgICAgIHtcbiAgICAgICAgICAgIGtleTogXCJmamFsbDpjb3N0QWxsb2NhdGlvbjphY2NvdW50XCIsXG4gICAgICAgICAgICB2YWx1ZTogYCR7YWNjb3VudH1gXG4gICAgICAgICAgfVxuICAgICAgICBdXG4gICAgICB9KTtcblxuICAgICAgbmV3IENmbk91dHB1dCh0aGlzLCBgSXBhbVBvb2xJZCR7YWNjb3VudElkfWAsIHtcbiAgICAgICAga2V5OiBgSXBhbVBvb2xJZCR7YWNjb3VudElkfWAsXG4gICAgICAgIHZhbHVlOiBpcGFtUG9vbC5hdHRySXBhbVBvb2xJZCxcbiAgICAgICAgZXhwb3J0TmFtZTogYElwYW1Qb29sSWQke2FjY291bnRJZH1gXG4gICAgICB9KTtcblxuICAgICAgbmV3IENmbk91dHB1dCh0aGlzLCBgSXBhbVBvb2xBcm4ke2FjY291bnRJZH1gLCB7XG4gICAgICAgIGtleTogYElwYW1Qb29sQXJuJHthY2NvdW50SWR9YCxcbiAgICAgICAgdmFsdWU6IGlwYW1Qb29sLmF0dHJBcm4sXG4gICAgICAgIGV4cG9ydE5hbWU6IGBJcGFtUG9vbEFybiR7YWNjb3VudElkfWBcbiAgICAgIH0pO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgSXBhbVBvb2xTdGFjayBleHRlbmRzIFN0YWNrIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IElwYW1Qb29sU3RhY2tQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBuZXcgSXBhbVBvb2wodGhpcywgXCJJcGFtUG9vbFwiLCB7XG4gICAgICBvcmdBY2NvdW50czogcHJvcHMub3JnQWNjb3VudHMsXG4gICAgICByZWdpb246IHByb3BzLnJlZ2lvblxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ipamPool.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/networking/ipamPool.ts"],"names":[],"mappings":"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","sourcesContent":["import { Fn, CfnOutput, StackProps, Stack } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport {\n  CfnIPAMPool as IpamPoolClass,\n  CfnIPAMPoolCidr\n} from \"aws-cdk-lib/aws-ec2\";\nimport { ResourceShare } from \"../utilities/resourceShare\";\nimport getAccountId from \"../../../utils/getAccountId\";\n\nexport interface IpamPoolProps extends StackProps {\n  orgAccounts: string[];\n  ipamScope?: string;\n  region: string;\n  /**\n   * The netmask length (/CIDR) each child IPAM pool should receive.\n   * Controls the size of CIDR blocks automatically allocated to VPCs from the pool.\n   * Accepted range: /16 (65,536 IPs) – /28 (16 IPs). Defaults to /20 (4,096 IPs).\n   */\n  allocationDefaultNetmaskLength?: number;\n}\n\ninterface IpamPoolStackProps extends StackProps {\n  orgAccounts: string[];\n  region: string;\n}\n\nexport class IpamPool extends Construct {\n  constructor(scope: Construct, id: string, props: IpamPoolProps) {\n    super(scope, id);\n\n    // Get the default IPAM scope ID from props, or CFN import\n    const IpamPrivateDefaultScopeId =\n      props.ipamScope || Fn.importValue(\"IpamPrivateDefaultScopeId\");\n    // Prioritise region from props, then from env\n    const region = props.region;\n\n    const organisationAccounts = props.orgAccounts.map((account) =>\n      account.toLowerCase()\n    );\n\n    // Determine the child-pool CIDR size (defaults to /20)\n    const defaultNetmaskLength = props.allocationDefaultNetmaskLength ?? 20;\n\n    // Basic validation – /16 to /28 inclusive are considered safe for VPC allocations\n    if (defaultNetmaskLength < 16 || defaultNetmaskLength > 28) {\n      throw new Error(\n        `allocationDefaultNetmaskLength must be between 16 and 28 (inclusive). Received: ${defaultNetmaskLength}`\n      );\n    }\n\n    // Create the top-level pools\n    const rootPool = new IpamPoolClass(this, \"TopLevelIpamPool\", {\n      description: `Root IPAM pool`,\n      addressFamily: \"ipv4\",\n      ipamScopeId: IpamPrivateDefaultScopeId,\n      locale: region,\n      // Explicitly provision the /8 CIDR once at the top-level\n      provisionedCidrs: [\n        { cidr: \"10.0.0.0/8\" },\n        { cidr: \"172.16.0.0/12\" },\n        { cidr: \"192.168.0.0/16\" }\n      ],\n      autoImport: true,\n      tags: [\n        {\n          key: \"fjall:operations:pool\",\n          value: \"top-level\"\n        },\n        {\n          key: \"fjall:costAllocation:type\",\n          value: \"root\"\n        }\n      ]\n    });\n\n    // Create a child pool for each Organisation account\n    for (const account of organisationAccounts) {\n      const accountId = getAccountId(account);\n\n      const ipamPool = new IpamPoolClass(this, `${account}IpamPool`, {\n        description: `${account} - IPAM pool - ${region}`,\n        addressFamily: \"ipv4\",\n        ipamScopeId: IpamPrivateDefaultScopeId,\n        locale: region,\n        // Allocate from the root pool automatically\n        sourceIpamPoolId: rootPool.attrIpamPoolId,\n        allocationDefaultNetmaskLength: defaultNetmaskLength,\n        allocationResourceTags: [\n          {\n            key: \"fjall:operations:pool\",\n            value: `${accountId}`\n          }\n        ],\n        autoImport: true,\n        tags: [\n          {\n            key: \"fjall:operations:pool\",\n            value: `${accountId}`\n          },\n          {\n            key: \"fjall:costAllocation:accountName\",\n            value: `${account}`\n          }\n        ]\n      });\n\n      // Allocate an initial CIDR block to the child pool so that VPCs can immediately allocate\n      new CfnIPAMPoolCidr(this, `${account}PoolCidr${defaultNetmaskLength}`, {\n        ipamPoolId: ipamPool.attrIpamPoolId,\n        netmaskLength: defaultNetmaskLength\n      });\n\n      // Share the pool with the target account so that VPCs can allocate\n      new ResourceShare(this, `${account}${region}IpamResourceShare`, {\n        name: `${account}IpamResourceShare.${region}`,\n        allowExternalPrincipals: false,\n        principals: [accountId],\n        resourceArns: [ipamPool.attrArn],\n        tags: [\n          {\n            key: \"fjall:costAllocation:account\",\n            value: `${account}`\n          }\n        ]\n      });\n\n      // Expose the pool ID for cross-stack usage (e.g. VPC allocations)\n      new CfnOutput(this, `IpamPoolId${accountId}`, {\n        key: `IpamPoolId${accountId}`,\n        value: ipamPool.attrIpamPoolId,\n        exportName: `IpamPoolId${accountId}`\n      });\n\n      new CfnOutput(this, `IpamPoolArn${accountId}`, {\n        key: `IpamPoolArn${accountId}`,\n        value: ipamPool.attrArn,\n        exportName: `IpamPoolArn${accountId}`\n      });\n    }\n  }\n}\n\nexport class IpamPoolStack extends Stack {\n  constructor(scope: Construct, id: string, props: IpamPoolStackProps) {\n    super(scope, id);\n\n    new IpamPool(this, \"IpamPool\", {\n      orgAccounts: props.orgAccounts,\n      region: props.region\n    });\n  }\n}\n"]}
|
|
@@ -1,19 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AwsCustomResource = void 0;
|
|
4
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
4
|
const customResource = require("aws-cdk-lib/custom-resources");
|
|
6
5
|
class AwsCustomResource extends customResource.AwsCustomResource {
|
|
7
6
|
constructor(scope, id, props) {
|
|
8
7
|
super(scope, id, {
|
|
9
|
-
...props,
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
...props,
|
|
9
|
+
policy: props.policy ||
|
|
10
|
+
customResource.AwsCustomResourcePolicy.fromSdkCalls({
|
|
11
|
+
resources: customResource.AwsCustomResourcePolicy.ANY_RESOURCE
|
|
12
|
+
})
|
|
14
13
|
});
|
|
15
14
|
}
|
|
16
15
|
}
|
|
17
16
|
exports.AwsCustomResource = AwsCustomResource;
|
|
18
|
-
;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXdzQ3VzdG9tUmVzb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy91dGlsaXRpZXMvYXdzQ3VzdG9tUmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQXVDO0FBQ3ZDLCtEQUErRDtBQUcvRCxNQUFhLGlCQUFrQixTQUFRLGNBQWMsQ0FBQyxpQkFBaUI7SUFHckUsWUFDRSxLQUFnQixFQUNoQixFQUFVLEVBQ1YsS0FBNEM7UUFFNUMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixHQUFHLEtBQUssRUFBRSw2RkFBNkY7WUFDdkcsWUFBWSxFQUFFLHNCQUFRLENBQUMsYUFBYSxDQUFDLFFBQVE7WUFDN0MsTUFBTSxFQUFFLEtBQUssQ0FBQyxNQUFNLElBQUksY0FBYyxDQUFDLHVCQUF1QixDQUFDLFlBQVksQ0FBQztnQkFDMUUsU0FBUyxFQUFFLGNBQWMsQ0FBQyx1QkFBdUIsQ0FBQyxZQUFZO2FBQy9ELENBQUM7U0FDTCxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQUM7QUFmRiw4Q0FlRTtBQUFBLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBhd3NfbG9ncyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0ICogYXMgY3VzdG9tUmVzb3VyY2UgZnJvbSBcImF3cy1jZGstbGliL2N1c3RvbS1yZXNvdXJjZXNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmV4cG9ydCBjbGFzcyBBd3NDdXN0b21SZXNvdXJjZSBleHRlbmRzIGN1c3RvbVJlc291cmNlLkF3c0N1c3RvbVJlc291cmNlIHtcbiAgcHVibGljIHJlYWRvbmx5IHJlc3BvbnNlOiBzdHJpbmc7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgc2NvcGU6IENvbnN0cnVjdCxcbiAgICBpZDogc3RyaW5nLFxuICAgIHByb3BzOiBjdXN0b21SZXNvdXJjZS5Bd3NDdXN0b21SZXNvdXJjZVByb3BzXG4gICkge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgLi4ucHJvcHMsIC8vIGh0dHBzOi8vZG9jcy5hd3MuYW1hem9uLmNvbS9jZGsvYXBpL3YyL2RvY3MvYXdzLWNkay1saWIuY3VzdG9tX3Jlc291cmNlcy5Bd3NDdXN0b21SZXNvdXJjZVxuICAgICAgbG9nUmV0ZW50aW9uOiBhd3NfbG9ncy5SZXRlbnRpb25EYXlzLk9ORV9ZRUFSLFxuICAgICAgcG9saWN5OiBwcm9wcy5wb2xpY3kgfHwgY3VzdG9tUmVzb3VyY2UuQXdzQ3VzdG9tUmVzb3VyY2VQb2xpY3kuZnJvbVNka0NhbGxzKHtcbiAgICAgICAgcmVzb3VyY2VzOiBjdXN0b21SZXNvdXJjZS5Bd3NDdXN0b21SZXNvdXJjZVBvbGljeS5BTllfUkVTT1VSQ0VcbiAgICAgIH0pLFxuICB9KTtcbn19O1xuIl19
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXdzQ3VzdG9tUmVzb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy91dGlsaXRpZXMvYXdzQ3VzdG9tUmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0RBQStEO0FBRy9ELE1BQWEsaUJBQWtCLFNBQVEsY0FBYyxDQUFDLGlCQUFpQjtJQUdyRSxZQUNFLEtBQWdCLEVBQ2hCLEVBQVUsRUFDVixLQUE0QztRQUU1QyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLEdBQUcsS0FBSztZQUNSLE1BQU0sRUFDSixLQUFLLENBQUMsTUFBTTtnQkFDWixjQUFjLENBQUMsdUJBQXVCLENBQUMsWUFBWSxDQUFDO29CQUNsRCxTQUFTLEVBQUUsY0FBYyxDQUFDLHVCQUF1QixDQUFDLFlBQVk7aUJBQy9ELENBQUM7U0FDTCxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFqQkQsOENBaUJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgY3VzdG9tUmVzb3VyY2UgZnJvbSBcImF3cy1jZGstbGliL2N1c3RvbS1yZXNvdXJjZXNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5cbmV4cG9ydCBjbGFzcyBBd3NDdXN0b21SZXNvdXJjZSBleHRlbmRzIGN1c3RvbVJlc291cmNlLkF3c0N1c3RvbVJlc291cmNlIHtcbiAgcHVibGljIHJlYWRvbmx5IHJlc3BvbnNlOiBzdHJpbmc7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgc2NvcGU6IENvbnN0cnVjdCxcbiAgICBpZDogc3RyaW5nLFxuICAgIHByb3BzOiBjdXN0b21SZXNvdXJjZS5Bd3NDdXN0b21SZXNvdXJjZVByb3BzXG4gICkge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgLi4ucHJvcHMsXG4gICAgICBwb2xpY3k6XG4gICAgICAgIHByb3BzLnBvbGljeSB8fFxuICAgICAgICBjdXN0b21SZXNvdXJjZS5Bd3NDdXN0b21SZXNvdXJjZVBvbGljeS5mcm9tU2RrQ2FsbHMoe1xuICAgICAgICAgIHJlc291cmNlczogY3VzdG9tUmVzb3VyY2UuQXdzQ3VzdG9tUmVzb3VyY2VQb2xpY3kuQU5ZX1JFU09VUkNFXG4gICAgICAgIH0pXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -18,8 +18,7 @@ class CustomResource extends constructs_1.Construct {
|
|
|
18
18
|
inlinePolicy: props.inlinePolicy
|
|
19
19
|
});
|
|
20
20
|
const provider = new custom_resources_1.Provider(this, `${id}Provider`, {
|
|
21
|
-
onEventHandler: lambdaFunction
|
|
22
|
-
logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_YEAR
|
|
21
|
+
onEventHandler: lambdaFunction
|
|
23
22
|
});
|
|
24
23
|
const resource = new aws_cdk_lib_1.CustomResource(this, `${id}Resource`, {
|
|
25
24
|
serviceToken: provider.serviceToken,
|
|
@@ -29,4 +28,4 @@ class CustomResource extends constructs_1.Construct {
|
|
|
29
28
|
}
|
|
30
29
|
}
|
|
31
30
|
exports.CustomResource = CustomResource;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3VzdG9tUmVzb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy91dGlsaXRpZXMvY3VzdG9tUmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQTZFO0FBQzdFLG1FQUF3RDtBQUV4RCx1REFBdUQ7QUFDdkQsMkNBQXVDO0FBRXZDLDhDQUFzRDtBQWV0RCxNQUFhLGNBQWUsU0FBUSxzQkFBUztJQUczQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQTBCO1FBQ2xFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsTUFBTSxjQUFjLEdBQUcsSUFBSSwwQkFBaUIsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRTtZQUNoRSxJQUFJLEVBQUUsaUJBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsWUFBWSxDQUFDO1lBQ3hELE9BQU8sRUFBRSxHQUFHLEVBQUUsVUFBVTtZQUN4QixPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU87WUFDdEIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQixJQUFJLEdBQUcsRUFBRSxTQUFTO1lBQzVELGVBQWUsRUFBRSxLQUFLLENBQUMsZUFBZSxJQUFJLEdBQUcsRUFBRSx5QkFBeUI7WUFDeEUsWUFBWSxFQUFFLEtBQUssQ0FBQyxZQUFZO1NBQ2pDLENBQUMsQ0FBQztRQUVILE1BQU0sUUFBUSxHQUFHLElBQUksMkJBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLFVBQVUsRUFBRTtZQUNuRCxjQUFjLEVBQUUsY0FBYztTQUMvQixDQUFDLENBQUM7UUFFSCxNQUFNLFFBQVEsR0FBRyxJQUFJLDRCQUFjLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUU7WUFDekQsWUFBWSxFQUFFLFFBQVEsQ0FBQyxZQUFZO1lBQ25DLFVBQVUsRUFBRSxLQUFLLENBQUMsVUFBVTtTQUM3QixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDekQsQ0FBQztDQUNGO0FBMUJELHdDQTBCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEN1c3RvbVJlc291cmNlIGFzIGN1c3RvbVJlc291cmNlLCBBc3NldE9wdGlvbnMgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IFByb3ZpZGVyIH0gZnJvbSBcImF3cy1jZGstbGliL2N1c3RvbS1yZXNvdXJjZXNcIjtcbmltcG9ydCB7IFBvbGljeURvY3VtZW50IH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1pYW1cIjtcbmltcG9ydCB7IENvZGUsIFJ1bnRpbWUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWxhbWJkYVwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuaW1wb3J0IHsgU2luZ2xldG9uRnVuY3Rpb24gfSBmcm9tIFwiLi4vY29tcHV0ZS9sYW1iZGFcIjtcblxuaW50ZXJmYWNlIEN1c3RvbVJlc291cmNlUHJvcHMge1xuICBydW50aW1lOiBSdW50aW1lO1xuICByb2xlRGVzY3JpcHRpb24/OiBzdHJpbmc7XG4gIGxhbWJkYURlc2NyaXB0aW9uPzogc3RyaW5nO1xuICBpbmxpbmVQb2xpY3k6IHtcbiAgICBbbmFtZTogc3RyaW5nXTogUG9saWN5RG9jdW1lbnQ7XG4gIH07XG4gIHByb3BlcnRpZXM/OiB7XG4gICAgW2tleTogc3RyaW5nXTogc3RyaW5nOyAvLyBVc2VkIHRvIGJlIGBba2V5OiBzdHJpbmddOiBhbnlgLCB0aGlzIGNvdWxkIGJyZWFrXG4gIH07XG4gIGNvZGVQYXRoOiBzdHJpbmc7XG4gIGFzc2V0T3B0aW9ucz86IEFzc2V0T3B0aW9ucztcbn1cbmV4cG9ydCBjbGFzcyBDdXN0b21SZXNvdXJjZSBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyByZWFkb25seSByZXNwb25zZTogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBDdXN0b21SZXNvdXJjZVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIGNvbnN0IGxhbWJkYUZ1bmN0aW9uID0gbmV3IFNpbmdsZXRvbkZ1bmN0aW9uKHRoaXMsIGAke2lkfUxhbWJkYWAsIHtcbiAgICAgIGNvZGU6IENvZGUuZnJvbUFzc2V0KHByb3BzLmNvZGVQYXRoLCBwcm9wcy5hc3NldE9wdGlvbnMpLFxuICAgICAgaGFuZGxlcjogYCR7aWR9LmhhbmRsZXJgLFxuICAgICAgcnVudGltZTogcHJvcHMucnVudGltZSxcbiAgICAgIGxhbWJkYURlc2NyaXB0aW9uOiBwcm9wcy5sYW1iZGFEZXNjcmlwdGlvbiB8fCBgJHtpZH0gbGFtYmRhYCxcbiAgICAgIHJvbGVEZXNjcmlwdGlvbjogcHJvcHMucm9sZURlc2NyaXB0aW9uIHx8IGAke2lkfSBjdXN0b20gcmVzb3VyY2UgbGFtYmRhYCxcbiAgICAgIGlubGluZVBvbGljeTogcHJvcHMuaW5saW5lUG9saWN5XG4gICAgfSk7XG5cbiAgICBjb25zdCBwcm92aWRlciA9IG5ldyBQcm92aWRlcih0aGlzLCBgJHtpZH1Qcm92aWRlcmAsIHtcbiAgICAgIG9uRXZlbnRIYW5kbGVyOiBsYW1iZGFGdW5jdGlvblxuICAgIH0pO1xuXG4gICAgY29uc3QgcmVzb3VyY2UgPSBuZXcgY3VzdG9tUmVzb3VyY2UodGhpcywgYCR7aWR9UmVzb3VyY2VgLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHByb3BzLnByb3BlcnRpZXNcbiAgICB9KTtcblxuICAgIHRoaXMucmVzcG9uc2UgPSByZXNvdXJjZS5nZXRBdHQoXCJSZXNwb25zZVwiKS50b1N0cmluZygpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CustomResourceProvider = void 0;
|
|
4
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
4
|
const custom_resources_1 = require("aws-cdk-lib/custom-resources");
|
|
6
5
|
class CustomResourceProvider extends custom_resources_1.Provider {
|
|
7
6
|
constructor(scope, id, props) {
|
|
8
|
-
super(scope, id,
|
|
9
|
-
...props, // https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.CustomResourceProvider.html
|
|
10
|
-
logRetention: aws_cdk_lib_1.aws_logs.RetentionDays.ONE_YEAR,
|
|
11
|
-
});
|
|
7
|
+
super(scope, id, props);
|
|
12
8
|
}
|
|
13
9
|
}
|
|
14
10
|
exports.CustomResourceProvider = CustomResourceProvider;
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3VzdG9tUmVzb3VyY2VQcm92aWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYi9yZXNvdXJjZXMvYXdzL3V0aWxpdGllcy9jdXN0b21SZXNvdXJjZVByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1FQUF1RTtBQUd2RSxNQUFhLHNCQUF1QixTQUFRLDJCQUFRO0lBQ2xELFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDMUIsQ0FBQztDQUNGO0FBSkQsd0RBSUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQcm92aWRlciwgUHJvdmlkZXJQcm9wcyB9IGZyb20gXCJhd3MtY2RrLWxpYi9jdXN0b20tcmVzb3VyY2VzXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG5leHBvcnQgY2xhc3MgQ3VzdG9tUmVzb3VyY2VQcm92aWRlciBleHRlbmRzIFByb3ZpZGVyIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFByb3ZpZGVyUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQsIHByb3BzKTtcbiAgfVxufVxuIl19
|
package/dist/lib/utils/index.js
CHANGED
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./getConfig"), exports);
|
|
18
|
-
|
|
18
|
+
__exportStar(require("./standardTagsAspect"), exports);
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDhDQUE0QjtBQUM1Qix1REFBcUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi9nZXRDb25maWdcIjtcbmV4cG9ydCAqIGZyb20gXCIuL3N0YW5kYXJkVGFnc0FzcGVjdFwiO1xuIl19
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { IAspect } from "aws-cdk-lib";
|
|
2
|
+
import { IConstruct } from "constructs";
|
|
3
|
+
/**
|
|
4
|
+
* Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.
|
|
5
|
+
*
|
|
6
|
+
* Usage – attach once near the root of your CDK app (or to an individual stack):
|
|
7
|
+
* ```ts
|
|
8
|
+
* import { App, Aspects } from "aws-cdk-lib";
|
|
9
|
+
* import { StandardTagsAspect } from "./utils";
|
|
10
|
+
*
|
|
11
|
+
* const app = new App();
|
|
12
|
+
*
|
|
13
|
+
* // Define the required tags
|
|
14
|
+
* const tags = {
|
|
15
|
+
* "fjall:costAllocation:environment": "production",
|
|
16
|
+
* "fjall:costAllocation:owner": "engineering"
|
|
17
|
+
* };
|
|
18
|
+
*
|
|
19
|
+
* // Add the aspect – CDK will invoke it for every construct during synthesis
|
|
20
|
+
* Aspects.of(app).add(new StandardTagsAspect(tags));
|
|
21
|
+
*
|
|
22
|
+
* // define stacks/constructs after the aspect is attached
|
|
23
|
+
* new MyStack(app, "MyStack");
|
|
24
|
+
*
|
|
25
|
+
* app.synth();
|
|
26
|
+
* ```
|
|
27
|
+
*
|
|
28
|
+
* How it works:
|
|
29
|
+
* 1. CDK traverses every construct and calls `visit(node)`.
|
|
30
|
+
* 2. For each required tag the aspect adds it to the construct via `Tags.of(node).add()`.
|
|
31
|
+
* 3. Constructs that don't support tagging are silently ignored.
|
|
32
|
+
* 4. The resulting CloudFormation template contains the enforced tags on all resources.
|
|
33
|
+
*
|
|
34
|
+
* If a tag already exists on a construct, CDK de-duplicates by key so no duplication occurs.
|
|
35
|
+
*/
|
|
36
|
+
export declare class StandardTagsAspect implements IAspect {
|
|
37
|
+
private readonly requiredTags;
|
|
38
|
+
constructor(requiredTags: {
|
|
39
|
+
[key: string]: string;
|
|
40
|
+
});
|
|
41
|
+
visit(node: IConstruct): void;
|
|
42
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StandardTagsAspect = void 0;
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
+
/**
|
|
6
|
+
* Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.
|
|
7
|
+
*
|
|
8
|
+
* Usage – attach once near the root of your CDK app (or to an individual stack):
|
|
9
|
+
* ```ts
|
|
10
|
+
* import { App, Aspects } from "aws-cdk-lib";
|
|
11
|
+
* import { StandardTagsAspect } from "./utils";
|
|
12
|
+
*
|
|
13
|
+
* const app = new App();
|
|
14
|
+
*
|
|
15
|
+
* // Define the required tags
|
|
16
|
+
* const tags = {
|
|
17
|
+
* "fjall:costAllocation:environment": "production",
|
|
18
|
+
* "fjall:costAllocation:owner": "engineering"
|
|
19
|
+
* };
|
|
20
|
+
*
|
|
21
|
+
* // Add the aspect – CDK will invoke it for every construct during synthesis
|
|
22
|
+
* Aspects.of(app).add(new StandardTagsAspect(tags));
|
|
23
|
+
*
|
|
24
|
+
* // define stacks/constructs after the aspect is attached
|
|
25
|
+
* new MyStack(app, "MyStack");
|
|
26
|
+
*
|
|
27
|
+
* app.synth();
|
|
28
|
+
* ```
|
|
29
|
+
*
|
|
30
|
+
* How it works:
|
|
31
|
+
* 1. CDK traverses every construct and calls `visit(node)`.
|
|
32
|
+
* 2. For each required tag the aspect adds it to the construct via `Tags.of(node).add()`.
|
|
33
|
+
* 3. Constructs that don't support tagging are silently ignored.
|
|
34
|
+
* 4. The resulting CloudFormation template contains the enforced tags on all resources.
|
|
35
|
+
*
|
|
36
|
+
* If a tag already exists on a construct, CDK de-duplicates by key so no duplication occurs.
|
|
37
|
+
*/
|
|
38
|
+
class StandardTagsAspect {
|
|
39
|
+
constructor(requiredTags) {
|
|
40
|
+
this.requiredTags = requiredTags;
|
|
41
|
+
}
|
|
42
|
+
visit(node) {
|
|
43
|
+
// Only attempt to tag constructs that support tagging
|
|
44
|
+
for (const [key, value] of Object.entries(this.requiredTags)) {
|
|
45
|
+
aws_cdk_lib_1.Tags.of(node).add(key, value);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
exports.StandardTagsAspect = StandardTagsAspect;
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRUYWdzQXNwZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL3N0YW5kYXJkVGFnc0FzcGVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBNEM7QUFHNUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBZ0NHO0FBQ0gsTUFBYSxrQkFBa0I7SUFHN0IsWUFBWSxZQUF1QztRQUNqRCxJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztJQUNuQyxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQWdCO1FBQ3BCLHNEQUFzRDtRQUN0RCxLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztZQUM3RCxrQkFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ2hDLENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUFiRCxnREFhQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElBc3BlY3QsIFRhZ3MgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IElDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG4vKipcbiAqIEFzcGVjdCB0byBlbmZvcmNlIGEgc3RhbmRhcmQgc2V0IG9mIHRhZ3Mgb24gZXZlcnkgdGFnLWNhcGFibGUgcmVzb3VyY2UgaW4gYSBjb25zdHJ1Y3QgdHJlZS5cbiAqXG4gKiBVc2FnZSDigJMgYXR0YWNoIG9uY2UgbmVhciB0aGUgcm9vdCBvZiB5b3VyIENESyBhcHAgKG9yIHRvIGFuIGluZGl2aWR1YWwgc3RhY2spOlxuICogYGBgdHNcbiAqIGltcG9ydCB7IEFwcCwgQXNwZWN0cyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuICogaW1wb3J0IHsgU3RhbmRhcmRUYWdzQXNwZWN0IH0gZnJvbSBcIi4vdXRpbHNcIjtcbiAqXG4gKiBjb25zdCBhcHAgPSBuZXcgQXBwKCk7XG4gKlxuICogLy8gRGVmaW5lIHRoZSByZXF1aXJlZCB0YWdzXG4gKiBjb25zdCB0YWdzID0ge1xuICogICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOmVudmlyb25tZW50XCI6IFwicHJvZHVjdGlvblwiLFxuICogICBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOm93bmVyXCI6IFwiZW5naW5lZXJpbmdcIlxuICogfTtcbiAqXG4gKiAvLyBBZGQgdGhlIGFzcGVjdCDigJMgQ0RLIHdpbGwgaW52b2tlIGl0IGZvciBldmVyeSBjb25zdHJ1Y3QgZHVyaW5nIHN5bnRoZXNpc1xuICogQXNwZWN0cy5vZihhcHApLmFkZChuZXcgU3RhbmRhcmRUYWdzQXNwZWN0KHRhZ3MpKTtcbiAqXG4gKiAvLyBkZWZpbmUgc3RhY2tzL2NvbnN0cnVjdHMgYWZ0ZXIgdGhlIGFzcGVjdCBpcyBhdHRhY2hlZFxuICogbmV3IE15U3RhY2soYXBwLCBcIk15U3RhY2tcIik7XG4gKlxuICogYXBwLnN5bnRoKCk7XG4gKiBgYGBcbiAqXG4gKiBIb3cgaXQgd29ya3M6XG4gKiAgIDEuIENESyB0cmF2ZXJzZXMgZXZlcnkgY29uc3RydWN0IGFuZCBjYWxscyBgdmlzaXQobm9kZSlgLlxuICogICAyLiBGb3IgZWFjaCByZXF1aXJlZCB0YWcgdGhlIGFzcGVjdCBhZGRzIGl0IHRvIHRoZSBjb25zdHJ1Y3QgdmlhIGBUYWdzLm9mKG5vZGUpLmFkZCgpYC5cbiAqICAgMy4gQ29uc3RydWN0cyB0aGF0IGRvbid0IHN1cHBvcnQgdGFnZ2luZyBhcmUgc2lsZW50bHkgaWdub3JlZC5cbiAqICAgNC4gVGhlIHJlc3VsdGluZyBDbG91ZEZvcm1hdGlvbiB0ZW1wbGF0ZSBjb250YWlucyB0aGUgZW5mb3JjZWQgdGFncyBvbiBhbGwgcmVzb3VyY2VzLlxuICpcbiAqIElmIGEgdGFnIGFscmVhZHkgZXhpc3RzIG9uIGEgY29uc3RydWN0LCBDREsgZGUtZHVwbGljYXRlcyBieSBrZXkgc28gbm8gZHVwbGljYXRpb24gb2NjdXJzLlxuICovXG5leHBvcnQgY2xhc3MgU3RhbmRhcmRUYWdzQXNwZWN0IGltcGxlbWVudHMgSUFzcGVjdCB7XG4gIHByaXZhdGUgcmVhZG9ubHkgcmVxdWlyZWRUYWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xuXG4gIGNvbnN0cnVjdG9yKHJlcXVpcmVkVGFnczogeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfSkge1xuICAgIHRoaXMucmVxdWlyZWRUYWdzID0gcmVxdWlyZWRUYWdzO1xuICB9XG5cbiAgdmlzaXQobm9kZTogSUNvbnN0cnVjdCk6IHZvaWQge1xuICAgIC8vIE9ubHkgYXR0ZW1wdCB0byB0YWcgY29uc3RydWN0cyB0aGF0IHN1cHBvcnQgdGFnZ2luZ1xuICAgIGZvciAoY29uc3QgW2tleSwgdmFsdWVdIG9mIE9iamVjdC5lbnRyaWVzKHRoaXMucmVxdWlyZWRUYWdzKSkge1xuICAgICAgVGFncy5vZihub2RlKS5hZGQoa2V5LCB2YWx1ZSk7XG4gICAgfVxuICB9XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.1",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@aws-sdk/client-cost-explorer": "^3.717.0",
|
|
37
37
|
"@aws-sdk/client-organizations": "^3.716.0",
|
|
38
|
-
"@fjall/util": "^0.
|
|
38
|
+
"@fjall/util": "^0.20.1",
|
|
39
39
|
"@pepperize/cdk-organizations": "^0.7.135",
|
|
40
|
-
"aws-cdk": "^2.
|
|
41
|
-
"aws-cdk-lib": "^2.
|
|
40
|
+
"aws-cdk": "^2.204.0",
|
|
41
|
+
"aws-cdk-lib": "^2.204.0",
|
|
42
42
|
"aws-lambda": "^1.0.7",
|
|
43
43
|
"cdk-time-sleep": "^1.0.0",
|
|
44
44
|
"constructs": "^10.0.0",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"overrides": {
|
|
49
49
|
"@smithy/core": "2.5.5"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "ad9483a84d0dc3707a65c7daf9d1531282bdf995"
|
|
52
52
|
}
|