@fjall/components-infrastructure 0.1.11 → 0.1.16
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/config/aws/identityCenter.d.ts +2 -2
- package/dist/lib/config/aws/identityCenter.js +1 -1
- package/dist/lib/config/aws/identityCenterUser.js +2 -2
- package/dist/lib/config/aws/ipamPoolId.d.ts +1 -0
- package/dist/lib/config/aws/ipamPoolId.js +5 -3
- package/dist/lib/config/aws/organisation.d.ts +9 -9
- package/dist/lib/config/aws/organisation.js +31 -61
- package/dist/lib/patterns/aws/basicApp.d.ts +3 -2
- package/dist/lib/patterns/aws/basicApp.js +5 -5
- package/dist/lib/patterns/aws/buildkite.d.ts +37 -28
- package/dist/lib/patterns/aws/buildkite.js +66 -40
- package/dist/lib/patterns/aws/freeTierApp.d.ts +2 -1
- package/dist/lib/patterns/aws/freeTierApp.js +5 -5
- package/dist/lib/patterns/aws/managedAccount.js +5 -4
- package/dist/lib/patterns/aws/managedOrganisation.d.ts +9 -7
- package/dist/lib/patterns/aws/managedOrganisation.js +13 -6
- package/dist/lib/patterns/aws/spotInstanceApp.d.ts +1 -0
- package/dist/lib/patterns/aws/spotInstanceApp.js +4 -4
- package/dist/lib/resources/aws/awsStack.d.ts +2 -2
- package/dist/lib/resources/aws/awsStack.js +3 -3
- package/dist/lib/resources/aws/database/rdsFreeTier.js +2 -2
- package/dist/lib/resources/aws/networking/ipamPool.js +21 -18
- package/dist/lib/resources/aws/networking/vpc.d.ts +1 -1
- package/dist/lib/resources/aws/networking/vpc.js +5 -3
- package/dist/lib/resources/aws/secrets/kms.js +2 -2
- package/dist/lib/utils/getAccountId.js +5 -4
- package/dist/lib/utils/getAsync.d.ts +10 -0
- package/dist/lib/utils/getAsync.js +37 -0
- package/dist/lib/utils/getCidr.js +4 -4
- package/dist/lib/utils/getConfig.d.ts +4 -2
- package/dist/lib/utils/getConfig.js +20 -16
- package/dist/lib/utils/usersConfig.js +2 -2
- package/package.json +7 -3
|
@@ -15,7 +15,7 @@ class BasicApp {
|
|
|
15
15
|
const stackProps = this.getStackProps(props);
|
|
16
16
|
this.vpcStack = new awsStack_1.default(`${id}Network`, [], stackProps)
|
|
17
17
|
.addNetwork(vpc_1.Vpc.build(`${id}Vpc`, {
|
|
18
|
-
environment: props.environment,
|
|
18
|
+
// environment: props.environment,
|
|
19
19
|
region: props.region,
|
|
20
20
|
tags: props.tags
|
|
21
21
|
}))
|
|
@@ -63,9 +63,9 @@ class BasicApp {
|
|
|
63
63
|
if (!props)
|
|
64
64
|
return;
|
|
65
65
|
return {
|
|
66
|
-
|
|
66
|
+
accountId: props.account,
|
|
67
67
|
region: props.region,
|
|
68
|
-
|
|
68
|
+
accountName: props.accountName
|
|
69
69
|
};
|
|
70
70
|
}
|
|
71
71
|
getProps(id, rawProps) {
|
|
@@ -92,4 +92,4 @@ class BasicApp {
|
|
|
92
92
|
}
|
|
93
93
|
exports.BasicApp = BasicApp;
|
|
94
94
|
exports.default = BasicApp;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"spotInstanceApp.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/spotInstanceApp.ts"],"names":[],"mappings":"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","sourcesContent":["import AwsStack, { AwsStackProps } from \"../../resources/aws/awsStack\";\nimport { Vpc } from \"../../resources/aws/networking/vpc\";\nimport { ContainerSecret, ScalingType } from \"../../resources/aws/compute/ecs\";\nimport Ec2Cluster from \"../../resources/aws/compute/ecsSpot\";\nimport { Secret } from \"../../resources/aws/secrets\";\nimport { Ecr } from \"../../resources/aws/storage\";\nimport { SecretValue } from \"aws-cdk-lib\";\nimport { IManagedPolicy, PolicyDocument } from \"aws-cdk-lib/aws-iam\";\nimport { KeyValue } from \"../../types\";\nimport Database from \"../../resources/aws/database/databaseInstance\";\n\n/**\n * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct\n * to treat these as required properties and avoid constant null checking.\n */\nexport interface BasicAppPropDefaults {\n  tags: KeyValue;\n  serviceName: string;\n  clusterName: string;\n  scalingType: ScalingType;\n  containerPort: number;\n}\n\nexport interface BasicAppProps {\n  account?: string;\n  clusterName?: string;\n  containerEntryPoint?: string[];\n  containerCommand?: string[];\n  containerEnvironment?: KeyValue;\n  containerPort?: number;\n  containerSecrets?: string[];\n  // The team/domain/business-unit that is responsible for this service\n  owner?: string;\n  parentDomain?: string; // Fix to make a dependency of protocol\n  environment: string;\n  listenerPort?: number;\n  region?: string;\n  scalingType?: ScalingType;\n  serviceName?: string;\n  taskRoleInlinePolicies?: {\n    [name: string]: PolicyDocument;\n  };\n  taskRoleManagedPolicies?: IManagedPolicy[];\n  tags?: KeyValue;\n}\n\nexport class BasicApp {\n  private vpcStack: AwsStack;\n  private databaseStack: AwsStack;\n  private secretStack: AwsStack;\n  private computeStack: AwsStack;\n\n  constructor(id: string, rawProps: BasicAppProps) {\n    const props = this.getProps(id, rawProps);\n    const stackProps = this.getStackProps(props);\n\n    this.vpcStack = new AwsStack(`${id}Network`, [], stackProps)\n      .addNetwork(\n        Vpc.build(`${id}Vpc`, {\n          environment: props.environment,\n          region: props.region,\n          tags: props.tags\n        })\n      )\n      .addContainerRegistry(Ecr.build(`${id}Ecr`));\n\n    this.databaseStack = new AwsStack(\n      `${id}Database`,\n      this.vpcStack,\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(\n        Database.build(`${id}Database`, {\n          tags: props.tags\n        })\n      );\n\n    // Fetches the dbResource from the databaseStack\n    const dbResource = this.databaseStack.getResource(\n      `${id}Database`\n    ) as Database;\n\n    const secretObjectValue: ContainerSecret = {};\n    if (props.containerSecrets) {\n      for (const secretObject of props.containerSecrets) {\n        secretObjectValue[secretObject] = SecretValue.unsafePlainText(\"\");\n      }\n    }\n\n    this.secretStack = new AwsStack(`${id}Secret`, [], stackProps).addResource(\n      Secret.build(`${id}Secret`, {\n        secretName: `/${props.clusterName}/${props.serviceName}`,\n        secretObjectValue: secretObjectValue,\n        tags: props.tags\n      })\n    );\n\n    this.computeStack = new AwsStack(\n      `${id}Compute`,\n      [this.vpcStack, this.databaseStack, this.secretStack],\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(\n        Ec2Cluster.build(`${id}Fargate`, {\n          clusterName: props.clusterName,\n          //TODO: This should work via line 124, but doesn't work (at least on update)\n          databaseConnection: dbResource.databaseSecurityGroup.connections,\n          containerEntryPoint: props.containerEntryPoint,\n          containerCommand: props.containerCommand,\n          containerEnvironment: props.containerEnvironment,\n          containerPort: props.containerPort,\n          containerSecrets: secretObjectValue,\n          ecrRepository: this.vpcStack.getContainerRegistry(),\n          parentDomain: props.parentDomain?.toLowerCase(),\n          listenerPort: props.listenerPort,\n          serviceName: props.serviceName,\n          taskRoleInlinePolicies: props.taskRoleInlinePolicies,\n          taskRoleManagedPolicies: props.taskRoleManagedPolicies,\n          tags: props.tags\n        })\n      )\n      .connect(`${id}Fargate`, `${id}Database`, 5432);\n  }\n\n  getStackProps(props: BasicAppProps): AwsStackProps | undefined {\n    if (!props) return;\n\n    return {\n      account: props.account,\n      region: props.region,\n      environment: props.environment\n    };\n  }\n\n  getProps(\n    id: string,\n    rawProps: BasicAppProps\n  ): BasicAppProps & BasicAppPropDefaults {\n    const defaultProps = {\n      tags: {\n        \"fjall:costAllocation:service\": \"app\",\n        \"fjall:costAllocation:environment\":\n          rawProps.environment || \"production\",\n        \"fjall:costAllocation:owner\": rawProps.owner || \"Engineer\"\n      },\n      scalingType: ScalingType.CPU,\n      containerPort: rawProps.containerPort || 3000,\n      serviceName: `${id}Service`,\n      clusterName: `${id}Cluster`,\n      containerEntryPoint: [\"node\", \"main.js\"],\n      containerCommand: rawProps.containerPort\n        ? [`${rawProps.containerPort}`]\n        : [`3000`]\n    };\n\n    return {\n      ...defaultProps,\n      ...rawProps\n    };\n  }\n}\nexport default BasicApp;\n"]}
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"spotInstanceApp.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/spotInstanceApp.ts"],"names":[],"mappings":"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","sourcesContent":["import AwsStack, { AwsStackProps } from \"../../resources/aws/awsStack\";\nimport { Vpc } from \"../../resources/aws/networking/vpc\";\nimport { ContainerSecret, ScalingType } from \"../../resources/aws/compute/ecs\";\nimport Ec2Cluster from \"../../resources/aws/compute/ecsSpot\";\nimport { Secret } from \"../../resources/aws/secrets\";\nimport { Ecr } from \"../../resources/aws/storage\";\nimport { SecretValue } from \"aws-cdk-lib\";\nimport { IManagedPolicy, PolicyDocument } from \"aws-cdk-lib/aws-iam\";\nimport { KeyValue } from \"../../types\";\nimport Database from \"../../resources/aws/database/databaseInstance\";\n\n/**\n * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct\n * to treat these as required properties and avoid constant null checking.\n */\nexport interface BasicAppPropDefaults {\n  tags: KeyValue;\n  serviceName: string;\n  clusterName: string;\n  scalingType: ScalingType;\n  containerPort: number;\n}\n\nexport interface BasicAppProps {\n  account?: string;\n  clusterName?: string;\n  containerEntryPoint?: string[];\n  containerCommand?: string[];\n  containerEnvironment?: KeyValue;\n  containerPort?: number;\n  containerSecrets?: string[];\n  accountName: string;\n  // The team/domain/business-unit that is responsible for this service\n  owner?: string;\n  parentDomain?: string; // Fix to make a dependency of protocol\n  environment: string;\n  listenerPort?: number;\n  region?: string;\n  scalingType?: ScalingType;\n  serviceName?: string;\n  taskRoleInlinePolicies?: {\n    [name: string]: PolicyDocument;\n  };\n  taskRoleManagedPolicies?: IManagedPolicy[];\n  tags?: KeyValue;\n}\n\nexport class BasicApp {\n  private vpcStack: AwsStack;\n  private databaseStack: AwsStack;\n  private secretStack: AwsStack;\n  private computeStack: AwsStack;\n\n  constructor(id: string, rawProps: BasicAppProps) {\n    const props = this.getProps(id, rawProps);\n    const stackProps = this.getStackProps(props);\n\n    this.vpcStack = new AwsStack(`${id}Network`, [], stackProps)\n      .addNetwork(\n        Vpc.build(`${id}Vpc`, {\n          // environment: props.environment,\n          region: props.region,\n          tags: props.tags\n        })\n      )\n      .addContainerRegistry(Ecr.build(`${id}Ecr`));\n\n    this.databaseStack = new AwsStack(\n      `${id}Database`,\n      this.vpcStack,\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(\n        Database.build(`${id}Database`, {\n          tags: props.tags\n        })\n      );\n\n    // Fetches the dbResource from the databaseStack\n    const dbResource = this.databaseStack.getResource(\n      `${id}Database`\n    ) as Database;\n\n    const secretObjectValue: ContainerSecret = {};\n    if (props.containerSecrets) {\n      for (const secretObject of props.containerSecrets) {\n        secretObjectValue[secretObject] = SecretValue.unsafePlainText(\"\");\n      }\n    }\n\n    this.secretStack = new AwsStack(`${id}Secret`, [], stackProps).addResource(\n      Secret.build(`${id}Secret`, {\n        secretName: `/${props.clusterName}/${props.serviceName}`,\n        secretObjectValue: secretObjectValue,\n        tags: props.tags\n      })\n    );\n\n    this.computeStack = new AwsStack(\n      `${id}Compute`,\n      [this.vpcStack, this.databaseStack, this.secretStack],\n      stackProps\n    )\n      .addNetwork(this.vpcStack.getNetwork())\n      .addResource(\n        Ec2Cluster.build(`${id}Fargate`, {\n          clusterName: props.clusterName,\n          //TODO: This should work via line 124, but doesn't work (at least on update)\n          databaseConnection: dbResource.databaseSecurityGroup.connections,\n          containerEntryPoint: props.containerEntryPoint,\n          containerCommand: props.containerCommand,\n          containerEnvironment: props.containerEnvironment,\n          containerPort: props.containerPort,\n          containerSecrets: secretObjectValue,\n          ecrRepository: this.vpcStack.getContainerRegistry(),\n          parentDomain: props.parentDomain?.toLowerCase(),\n          listenerPort: props.listenerPort,\n          serviceName: props.serviceName,\n          taskRoleInlinePolicies: props.taskRoleInlinePolicies,\n          taskRoleManagedPolicies: props.taskRoleManagedPolicies,\n          tags: props.tags\n        })\n      )\n      .connect(`${id}Fargate`, `${id}Database`, 5432);\n  }\n\n  getStackProps(props: BasicAppProps): AwsStackProps | undefined {\n    if (!props) return;\n\n    return {\n      accountId: props.account,\n      region: props.region,\n      accountName: props.accountName\n    };\n  }\n\n  getProps(\n    id: string,\n    rawProps: BasicAppProps\n  ): BasicAppProps & BasicAppPropDefaults {\n    const defaultProps = {\n      tags: {\n        \"fjall:costAllocation:service\": \"app\",\n        \"fjall:costAllocation:environment\":\n          rawProps.environment || \"production\",\n        \"fjall:costAllocation:owner\": rawProps.owner || \"Engineer\"\n      },\n      scalingType: ScalingType.CPU,\n      containerPort: rawProps.containerPort || 3000,\n      serviceName: `${id}Service`,\n      clusterName: `${id}Cluster`,\n      containerEntryPoint: [\"node\", \"main.js\"],\n      containerCommand: rawProps.containerPort\n        ? [`${rawProps.containerPort}`]\n        : [`3000`]\n    };\n\n    return {\n      ...defaultProps,\n      ...rawProps\n    };\n  }\n}\nexport default BasicApp;\n"]}
|
|
@@ -11,9 +11,9 @@ export interface StackBuilder {
|
|
|
11
11
|
getNetwork(): Construct;
|
|
12
12
|
}
|
|
13
13
|
export interface AwsStackProps {
|
|
14
|
-
readonly
|
|
14
|
+
readonly accountId?: string;
|
|
15
15
|
readonly region?: string;
|
|
16
|
-
|
|
16
|
+
accountName?: string;
|
|
17
17
|
}
|
|
18
18
|
export default class AwsStack implements StackBuilder {
|
|
19
19
|
readonly resources: {
|
|
@@ -35,8 +35,8 @@ class AwsStack {
|
|
|
35
35
|
if (!props)
|
|
36
36
|
return;
|
|
37
37
|
const stackProps = {
|
|
38
|
-
env: props.
|
|
39
|
-
? { account: props.
|
|
38
|
+
env: props.accountId && props.region
|
|
39
|
+
? { account: props.accountId, region: props.region }
|
|
40
40
|
: undefined
|
|
41
41
|
};
|
|
42
42
|
return stackProps;
|
|
@@ -93,4 +93,4 @@ class AwsStack {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
exports.default = AwsStack;
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awsStack.js","sourceRoot":"","sources":["../../../../lib/resources/aws/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 account?: string;\n  readonly region?: string;\n  environment?: string;\n}\n\nexport default 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.account && props.region\n          ? { account: props.account, 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  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 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}\n"]}
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awsStack.js","sourceRoot":"","sources":["../../../../lib/resources/aws/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 default 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  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 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}\n"]}
|
|
@@ -19,7 +19,7 @@ class Rds extends constructs_1.Construct {
|
|
|
19
19
|
? props.vpc
|
|
20
20
|
: new vpc_1.Vpc(this, `${props.databaseName}Vpc`, {
|
|
21
21
|
tags: props.tags,
|
|
22
|
-
|
|
22
|
+
accountName: aws_cdk_lib_1.Fn.importValue("AccountName")
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
addDatabase(props) {
|
|
@@ -77,4 +77,4 @@ class Rds extends constructs_1.Construct {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
exports.default = Rds;
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmRzRnJlZVRpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9kYXRhYmFzZS9yZHNGcmVlVGllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZDQUFzRTtBQUN0RSxpREFRNkI7QUFDN0IsaURBUTZCO0FBQzdCLDJDQUF1QztBQUN2QyxnQ0FBdUM7QUFDdkMsd0NBQXdEO0FBRXhELDREQUFxRDtBQUNyRCwyQ0FBd0M7QUFxQnhDLE1BQXFCLEdBQUksU0FBUSxzQkFBUztJQVV4QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWU7UUFDdkQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ25CLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFlO1FBQ3BCLElBQUksQ0FBQyxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUc7WUFDbEIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHO1lBQ1gsQ0FBQyxDQUFDLElBQUksU0FBRyxDQUFDLElBQUksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDeEMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJO2dCQUNoQixXQUFXLEVBQUUsZ0JBQUUsQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDO2FBQzNDLENBQUMsQ0FBQztJQUNULENBQUM7SUFDRCxXQUFXLENBQUMsS0FBZTtRQUN6Qix1QkFBdUI7UUFDdkIsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksZ0JBQU0sQ0FDbkMsSUFBSSxFQUNKLEdBQUcsS0FBSyxDQUFDLFlBQVksYUFBYSxFQUNsQztZQUNFLFVBQVUsRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLGFBQWE7WUFDOUMsb0JBQW9CLEVBQUU7Z0JBQ3BCLG9CQUFvQixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUM7b0JBQ25DLFFBQVEsRUFBRSxVQUFVO2lCQUNyQixDQUFDO2dCQUNGLGtCQUFrQixFQUFFLElBQUk7Z0JBQ3hCLFlBQVksRUFBRSxLQUFLO2dCQUNuQixpQkFBaUIsRUFBRSxVQUFVO2FBQzlCO1lBQ0QsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJO1NBQ2pCLENBQ0YsQ0FBQztRQUVGLHdCQUF3QjtRQUN4QixJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksNEJBQWtCLENBQ3pDLElBQUksRUFDSixHQUFHLEtBQUssQ0FBQyxZQUFZLHNCQUFzQixFQUMzQztZQUNFLFNBQVMsRUFBRSxXQUFXLEtBQUssQ0FBQyxZQUFZLGdCQUFnQjtZQUN4RCxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUk7U0FDakIsQ0FDRixDQUFDO1FBRUYsSUFBSSxDQUFDLHFCQUFxQixHQUFHLElBQUksbUJBQWEsQ0FDNUMsSUFBSSxFQUNKLEdBQUcsS0FBSyxDQUFDLFlBQVksZUFBZSxFQUNwQztZQUNFLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLFdBQVcsRUFBRSx5RUFBeUUsS0FBSyxDQUFDLFlBQVksRUFBRTtTQUMzRyxDQUNGLENBQUM7UUFFRixtQkFBbUI7UUFDbkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLDBCQUFnQixDQUNsQyxJQUFJLEVBQ0osR0FBRyxLQUFLLENBQUMsWUFBWSxVQUFVLEVBQy9CO1lBQ0UsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO1lBQ2IsVUFBVSxFQUFFO2dCQUNWLFVBQVUsRUFBRSxvQkFBVSxDQUFDLG1CQUFtQjthQUMzQztZQUNELGNBQWMsRUFBRSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQztZQUM1QyxNQUFNLEVBQ0osS0FBSyxDQUFDLE1BQU07Z0JBQ1osZ0NBQXNCLENBQUMsUUFBUSxDQUFDO29CQUM5QixPQUFPLEVBQUUsK0JBQXFCLENBQUMsUUFBUTtpQkFDeEMsQ0FBQztZQUNKLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxnQkFBZ0I7WUFDeEMsZUFBZSxFQUFFLEtBQUssQ0FBQyxlQUFlLElBQUksc0JBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQzNELGdCQUFnQixFQUFFLElBQUk7WUFDdEIsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHO1lBQzVDLFdBQVcsRUFBRSxxQkFBVyxDQUFDLEdBQUc7WUFDNUIsYUFBYSxFQUFFLHVCQUFhLENBQUMsaUJBQWlCO1lBQzlDLGFBQWEsRUFBRSwyQkFBYSxDQUFDLFFBQVE7WUFDckMsc0JBQXNCLEVBQUUsS0FBSztZQUM3QixZQUFZLEVBQ1YsS0FBSyxDQUFDLFlBQVksSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEVBQUU7WUFDNUQsa0JBQWtCLEVBQUUsS0FBSyxDQUFDLFlBQVk7WUFDdEMsWUFBWSxFQUNWLEtBQUssQ0FBQyxZQUFZO2dCQUNsQixzQkFBWSxDQUFDLEVBQUUsQ0FBQyx1QkFBYSxDQUFDLFVBQVUsRUFBRSxzQkFBWSxDQUFDLEtBQUssQ0FBQztZQUMvRCxPQUFPLEVBQUUsS0FBSztZQUNkLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSTtZQUNoQiwwQkFBMEIsRUFDeEIsS0FBSyxDQUFDLDBCQUEwQixJQUFJLHFCQUFxQjtZQUMzRCxXQUFXLEVBQUUscUJBQVcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQztTQUNyRSxDQUNGLENBQUM7UUFDRixJQUFBLHFCQUFXLEVBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsQ0FBQztDQUNGO0FBcEdELHNCQW9HQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IER1cmF0aW9uLCBGbiwgUmVtb3ZhbFBvbGljeSwgU3RhY2tQcm9wcyB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHtcbiAgQ29ubmVjdGlvbnMsXG4gIElDb25uZWN0YWJsZSxcbiAgSW5zdGFuY2VDbGFzcyxcbiAgSW5zdGFuY2VTaXplLFxuICBJbnN0YW5jZVR5cGUsXG4gIElWcGMsXG4gIFN1Ym5ldFR5cGVcbn0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcbmltcG9ydCB7XG4gIENhQ2VydGlmaWNhdGUsXG4gIENyZWRlbnRpYWxzLFxuICBEYXRhYmFzZUluc3RhbmNlLFxuICBEYXRhYmFzZUluc3RhbmNlRW5naW5lLFxuICBJSW5zdGFuY2VFbmdpbmUsXG4gIFBvc3RncmVzRW5naW5lVmVyc2lvbixcbiAgU3RvcmFnZVR5cGVcbn0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yZHNcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBTZWN1cml0eUdyb3VwIH0gZnJvbSBcIi4uL2lhbVwiO1xuaW1wb3J0IHsgQ3VzdG9tZXJNYW5hZ2VkS2V5LCBTZWNyZXQgfSBmcm9tIFwiLi4vc2VjcmV0c1wiO1xuaW1wb3J0IHsgS2V5VmFsdWUgfSBmcm9tIFwiLi4vLi4vLi4vdHlwZXNcIjtcbmltcG9ydCB0YWdSZXNvdXJjZSBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvdGFnUmVzb3VyY2VcIjtcbmltcG9ydCB7IFZwYyB9IGZyb20gXCIuLi9uZXR3b3JraW5nL3ZwY1wiO1xuXG5pbnRlcmZhY2UgUmRzUHJvcHMgZXh0ZW5kcyBTdGFja1Byb3BzIHtcbiAgdnBjPzogVnBjO1xuICBkYXRhYmFzZU5hbWU/OiBzdHJpbmc7XG4gIGVuZ2luZT86IElJbnN0YW5jZUVuZ2luZTtcbiAgaW5zdGFuY2VUeXBlPzogSW5zdGFuY2VUeXBlO1xuICBtYXhBbGxvY2F0ZWRTdG9yYWdlPzogbnVtYmVyO1xuICBhbGxvY2F0ZWRTdG9yYWdlPzogbnVtYmVyO1xuICBiYWNrdXBSZXRlbnRpb24/OiBEdXJhdGlvbjtcbiAgY2x1c3RlcklkZW50aWZpZXI/OiBzdHJpbmc7XG4gIG1vbml0b3JpbmdJbnRlcnZhbD86IER1cmF0aW9uO1xuICBwcmVmZXJyZWRNYWludGVuYW5jZVdpbmRvdz86IHN0cmluZztcbiAgcG9ydD86IG51bWJlcjtcbiAgZW5hYmxlUGVyZm9ybWFuY2VJbnNpZ2h0cz86IGJvb2xlYW47XG4gIGRhdGFiYXNlUHJveHk/OiBib29sZWFuO1xuICAvLyBUT0RPOiBUaGUgYmVsb3cgY291bGQgYmUgYSBudW1iZXIsIHRoZW4gaXQgc2NhbGVzIGJhc2VkIG9uIHRoZSBhbW91bnRcbiAgcmVhZFJlcGxpY2E/
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsFreeTier.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsFreeTier.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration, Fn, RemovalPolicy, StackProps } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  InstanceClass,\n  InstanceSize,\n  InstanceType,\n  IVpc,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceEngine,\n  IInstanceEngine,\n  PostgresEngineVersion,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\nimport tagResource from \"../../../utils/tagResource\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface RdsProps extends StackProps {\n  vpc?: Vpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  instanceType?: InstanceType;\n  maxAllocatedStorage?: number;\n  allocatedStorage?: number;\n  backupRetention?: Duration;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  enablePerformanceInsights?: boolean;\n  databaseProxy?: boolean;\n  // TODO: The below could be a number, then it scales based on the amount\n  readReplica?: boolean;\n  tags: KeyValue;\n}\n\nexport default class Rds extends Construct implements IConnectable {\n  public connections: Connections;\n  public databaseSecurityGroup: SecurityGroup;\n\n  private databaseCredentials: Secret;\n  private encryptionKey: CustomerManagedKey;\n  // private databaseSecurityGroup: SecurityGroup;\n  private database: DatabaseInstance;\n  private vpc: IVpc;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n    this.addVpc(props);\n    this.addDatabase(props);\n  }\n\n  addVpc(props: RdsProps) {\n    this.vpc = props.vpc\n      ? props.vpc\n      : new Vpc(this, `${props.databaseName}Vpc`, {\n          tags: props.tags,\n          accountName: Fn.importValue(\"AccountName\")\n        });\n  }\n  addDatabase(props: RdsProps) {\n    // Database Credentials\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: `${props.databaseName}Credentials`,\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username: \"postgres\"\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        },\n        tags: props.tags\n      }\n    );\n\n    // Customer Managed Keys\n    this.encryptionKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ClusterEncryptionKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/encryptionKey`,\n        tags: props.tags\n      }\n    );\n\n    this.databaseSecurityGroup = new SecurityGroup(\n      this,\n      `${props.databaseName}SecurityGroup`,\n      {\n        vpc: this.vpc,\n        description: `Security group that allows inbound access to the postgres cluster for ${props.databaseName}`\n      }\n    );\n\n    // Database Cluster\n    this.database = new DatabaseInstance(\n      this,\n      `${props.databaseName}Database`,\n      {\n        vpc: this.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PRIVATE_WITH_EGRESS\n        },\n        securityGroups: [this.databaseSecurityGroup],\n        engine:\n          props.engine ||\n          DatabaseInstanceEngine.postgres({\n            version: PostgresEngineVersion.VER_16_3\n          }),\n        allocatedStorage: props.allocatedStorage,\n        backupRetention: props.backupRetention || Duration.days(14),\n        storageEncrypted: true,\n        storageEncryptionKey: this.encryptionKey.key,\n        storageType: StorageType.GP3,\n        caCertificate: CaCertificate.RDS_CA_RSA4096_G1,\n        removalPolicy: RemovalPolicy.SNAPSHOT,\n        deleteAutomatedBackups: false,\n        databaseName:\n          props.databaseName || `${this.node.id.replace(\"Rds\", \"\")}`,\n        instanceIdentifier: props.databaseName,\n        instanceType:\n          props.instanceType ||\n          InstanceType.of(InstanceClass.BURSTABLE3, InstanceSize.MICRO),\n        multiAz: false,\n        port: props.port,\n        preferredMaintenanceWindow:\n          props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\",\n        credentials: Credentials.fromSecret(this.databaseCredentials.secret)\n      }\n    );\n    tagResource(this.database, props.tags);\n  }\n}\n"]}
|
|
@@ -7,6 +7,7 @@ const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
|
7
7
|
const getCidr_1 = require("../../../utils/getCidr");
|
|
8
8
|
const resourceShare_1 = require("../utilities/resourceShare");
|
|
9
9
|
const getAccountId_1 = require("../../../utils/getAccountId");
|
|
10
|
+
const stripAndCamelCase_1 = require("../../../utils/stripAndCamelCase");
|
|
10
11
|
class IpamPool extends constructs_1.Construct {
|
|
11
12
|
constructor(scope, id, props) {
|
|
12
13
|
super(scope, id);
|
|
@@ -15,19 +16,20 @@ class IpamPool extends constructs_1.Construct {
|
|
|
15
16
|
// Prioritise region from props, then from env
|
|
16
17
|
const region = props.region;
|
|
17
18
|
const organisationAccounts = props.orgAccounts.map((account) => account.toLowerCase());
|
|
18
|
-
for (const
|
|
19
|
+
for (const account of organisationAccounts) {
|
|
19
20
|
const cidrBlock = new getCidr_1.default();
|
|
20
21
|
const freeCidrBlock = cidrBlock.getCidrBlock();
|
|
21
22
|
cidrBlock.updateState(freeCidrBlock, false);
|
|
22
|
-
const
|
|
23
|
-
|
|
23
|
+
const accountName = (0, stripAndCamelCase_1.stripAndCamelCase)(account);
|
|
24
|
+
const ipamPool = new aws_ec2_1.CfnIPAMPool(this, `${account}IpamPool${freeCidrBlock}`, {
|
|
25
|
+
description: `${account} - IPAM pool - ${region} - ${freeCidrBlock}`,
|
|
24
26
|
addressFamily: "ipv4",
|
|
25
27
|
ipamScopeId: IpamPrivateDefaultScopeId,
|
|
26
28
|
locale: region,
|
|
27
29
|
allocationResourceTags: [
|
|
28
30
|
{
|
|
29
31
|
key: "fjall:operations:pool",
|
|
30
|
-
value: `${
|
|
32
|
+
value: `${account}`
|
|
31
33
|
}
|
|
32
34
|
],
|
|
33
35
|
autoImport: true,
|
|
@@ -38,32 +40,33 @@ class IpamPool extends constructs_1.Construct {
|
|
|
38
40
|
value: "top-level"
|
|
39
41
|
},
|
|
40
42
|
{
|
|
41
|
-
key: "fjall:costAllocation:
|
|
42
|
-
value: `${
|
|
43
|
+
key: "fjall:costAllocation:account",
|
|
44
|
+
value: `${account}`
|
|
43
45
|
}
|
|
44
46
|
]
|
|
45
47
|
});
|
|
46
|
-
new resourceShare_1.ResourceShare(this, `${
|
|
47
|
-
name: `${
|
|
48
|
+
new resourceShare_1.ResourceShare(this, `${account}${region}IpamResourceShare`, {
|
|
49
|
+
name: `${account}IpamResourceShare.${region}`,
|
|
48
50
|
allowExternalPrincipals: false,
|
|
49
|
-
|
|
51
|
+
// TODO: getAccountId expects environment as argument
|
|
52
|
+
principals: [(0, getAccountId_1.default)(account)],
|
|
50
53
|
resourceArns: [ipamPool.attrArn],
|
|
51
54
|
tags: [
|
|
52
55
|
{
|
|
53
|
-
key: "fjall:costAllocation:
|
|
54
|
-
value: `${
|
|
56
|
+
key: "fjall:costAllocation:account",
|
|
57
|
+
value: `${account}`
|
|
55
58
|
}
|
|
56
59
|
]
|
|
57
60
|
});
|
|
58
|
-
new aws_cdk_lib_1.CfnOutput(this, `${
|
|
59
|
-
key: `${
|
|
61
|
+
new aws_cdk_lib_1.CfnOutput(this, `${accountName}IpamPoolId`, {
|
|
62
|
+
key: `${accountName}IpamPoolId`,
|
|
60
63
|
value: ipamPool.attrIpamPoolId,
|
|
61
|
-
exportName: `${
|
|
64
|
+
exportName: `${accountName}IpamPoolId`
|
|
62
65
|
});
|
|
63
|
-
new aws_cdk_lib_1.CfnOutput(this, `${
|
|
64
|
-
key: `${
|
|
66
|
+
new aws_cdk_lib_1.CfnOutput(this, `${accountName}IpamPoolArn`, {
|
|
67
|
+
key: `${accountName}IpamPoolArn`,
|
|
65
68
|
value: ipamPool.attrArn,
|
|
66
|
-
exportName: `${
|
|
69
|
+
exportName: `${accountName}IpamPoolArn`
|
|
67
70
|
});
|
|
68
71
|
}
|
|
69
72
|
}
|
|
@@ -79,4 +82,4 @@ class IpamPoolStack extends aws_cdk_lib_1.Stack {
|
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
84
|
exports.IpamPoolStack = IpamPoolStack;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBhbVBvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9uZXR3b3JraW5nL2lwYW1Qb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUErRDtBQUMvRCwyQ0FBdUM7QUFDdkMsaURBQW1FO0FBQ25FLG9EQUErQztBQUMvQyw4REFBMkQ7QUFDM0QsOERBQXVEO0FBQ3ZELHdFQUFxRTtBQWFyRSxNQUFhLFFBQVMsU0FBUSxzQkFBUztJQUNyQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQW9CO1FBQzVELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsMERBQTBEO1FBQzFELE1BQU0seUJBQXlCLEdBQzdCLEtBQUssQ0FBQyxTQUFTLElBQUksZ0JBQUUsQ0FBQyxXQUFXLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUNqRSw4Q0FBOEM7UUFDOUMsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztRQUU1QixNQUFNLG9CQUFvQixHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FDN0QsT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUN0QixDQUFDO1FBRUYsS0FBSyxNQUFNLE9BQU8sSUFBSSxvQkFBb0IsRUFBRTtZQUMxQyxNQUFNLFNBQVMsR0FBRyxJQUFJLGlCQUFTLEVBQUUsQ0FBQztZQUNsQyxNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDL0MsU0FBUyxDQUFDLFdBQVcsQ0FBQyxhQUFhLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFFNUMsTUFBTSxXQUFXLEdBQUcsSUFBQSxxQ0FBaUIsRUFBQyxPQUFPLENBQUMsQ0FBQztZQUUvQyxNQUFNLFFBQVEsR0FBRyxJQUFJLHFCQUFhLENBQ2hDLElBQUksRUFDSixHQUFHLE9BQU8sV0FBVyxhQUFhLEVBQUUsRUFDcEM7Z0JBQ0UsV0FBVyxFQUFFLEdBQUcsT0FBTyxrQkFBa0IsTUFBTSxNQUFNLGFBQWEsRUFBRTtnQkFDcEUsYUFBYSxFQUFFLE1BQU07Z0JBQ3JCLFdBQVcsRUFBRSx5QkFBeUI7Z0JBQ3RDLE1BQU0sRUFBRSxNQUFNO2dCQUNkLHNCQUFzQixFQUFFO29CQUN0Qjt3QkFDRSxHQUFHLEVBQUUsdUJBQXVCO3dCQUM1QixLQUFLLEVBQUUsR0FBRyxPQUFPLEVBQUU7cUJBQ3BCO2lCQUNGO2dCQUNELFVBQVUsRUFBRSxJQUFJO2dCQUNoQixnQkFBZ0IsRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxDQUFDO2dCQUMzQyxJQUFJLEVBQUU7b0JBQ0o7d0JBQ0UsR0FBRyxFQUFFLHVCQUF1Qjt3QkFDNUIsS0FBSyxFQUFFLFdBQVc7cUJBQ25CO29CQUNEO3dCQUNFLEdBQUcsRUFBRSw4QkFBOEI7d0JBQ25DLEtBQUssRUFBRSxHQUFHLE9BQU8sRUFBRTtxQkFDcEI7aUJBQ0Y7YUFDRixDQUNGLENBQUM7WUFFRixJQUFJLDZCQUFhLENBQUMsSUFBSSxFQUFFLEdBQUcsT0FBTyxHQUFHLE1BQU0sbUJBQW1CLEVBQUU7Z0JBQzlELElBQUksRUFBRSxHQUFHLE9BQU8scUJBQXFCLE1BQU0sRUFBRTtnQkFDN0MsdUJBQXVCLEVBQUUsS0FBSztnQkFDOUIscURBQXFEO2dCQUNyRCxVQUFVLEVBQUUsQ0FBQyxJQUFBLHNCQUFZLEVBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ25DLFlBQVksRUFBRSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7Z0JBQ2hDLElBQUksRUFBRTtvQkFDSjt3QkFDRSxHQUFHLEVBQUUsOEJBQThCO3dCQUNuQyxLQUFLLEVBQUUsR0FBRyxPQUFPLEVBQUU7cUJBQ3BCO2lCQUNGO2FBQ0YsQ0FBQyxDQUFDO1lBRUgsSUFBSSx1QkFBUyxDQUFDLElBQUksRUFBRSxHQUFHLFdBQVcsWUFBWSxFQUFFO2dCQUM5QyxHQUFHLEVBQUUsR0FBRyxXQUFXLFlBQVk7Z0JBQy9CLEtBQUssRUFBRSxRQUFRLENBQUMsY0FBYztnQkFDOUIsVUFBVSxFQUFFLEdBQUcsV0FBVyxZQUFZO2FBQ3ZDLENBQUMsQ0FBQztZQUVILElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxXQUFXLGFBQWEsRUFBRTtnQkFDL0MsR0FBRyxFQUFFLEdBQUcsV0FBVyxhQUFhO2dCQUNoQyxLQUFLLEVBQUUsUUFBUSxDQUFDLE9BQU87Z0JBQ3ZCLFVBQVUsRUFBRSxHQUFHLFdBQVcsYUFBYTthQUN4QyxDQUFDLENBQUM7U0FDSjtJQUNILENBQUM7Q0FDRjtBQTdFRCw0QkE2RUM7QUFFRCxNQUFhLGFBQWMsU0FBUSxtQkFBSztJQUN0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXlCO1FBQ2pFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRTtZQUM3QixXQUFXLEVBQUUsS0FBSyxDQUFDLFdBQVc7WUFDOUIsTUFBTSxFQUFFLEtBQUssQ0FBQyxNQUFNO1NBQ3JCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQVRELHNDQVNDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRm4sIENmbk91dHB1dCwgU3RhY2tQcm9wcywgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBDZm5JUEFNUG9vbCBhcyBJcGFtUG9vbENsYXNzIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1lYzJcIjtcbmltcG9ydCBDaWRyQmxvY2sgZnJvbSBcIi4uLy4uLy4uL3V0aWxzL2dldENpZHJcIjtcbmltcG9ydCB7IFJlc291cmNlU2hhcmUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3Jlc291cmNlU2hhcmVcIjtcbmltcG9ydCBnZXRBY2NvdW50SWQgZnJvbSBcIi4uLy4uLy4uL3V0aWxzL2dldEFjY291bnRJZFwiO1xuaW1wb3J0IHsgc3RyaXBBbmRDYW1lbENhc2UgfSBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvc3RyaXBBbmRDYW1lbENhc2VcIjtcblxuZXhwb3J0IGludGVyZmFjZSBJcGFtUG9vbFByb3BzIGV4dGVuZHMgU3RhY2tQcm9wcyB7XG4gIG9yZ0FjY291bnRzOiBzdHJpbmdbXTtcbiAgaXBhbVNjb3BlPzogc3RyaW5nO1xuICByZWdpb246IHN0cmluZztcbn1cblxuaW50ZXJmYWNlIElwYW1Qb29sU3RhY2tQcm9wcyBleHRlbmRzIFN0YWNrUHJvcHMge1xuICBvcmdBY2NvdW50czogc3RyaW5nW107XG4gIHJlZ2lvbjogc3RyaW5nO1xufVxuXG5leHBvcnQgY2xhc3MgSXBhbVBvb2wgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSXBhbVBvb2xQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICAvLyBHZXQgdGhlIGRlZmF1bHQgSVBBTSBzY29wZSBJRCBmcm9tIHByb3BzLCBvciBDRk4gaW1wb3J0XG4gICAgY29uc3QgSXBhbVByaXZhdGVEZWZhdWx0U2NvcGVJZCA9XG4gICAgICBwcm9wcy5pcGFtU2NvcGUgfHwgRm4uaW1wb3J0VmFsdWUoXCJJcGFtUHJpdmF0ZURlZmF1bHRTY29wZUlkXCIpO1xuICAgIC8vIFByaW9yaXRpc2UgcmVnaW9uIGZyb20gcHJvcHMsIHRoZW4gZnJvbSBlbnZcbiAgICBjb25zdCByZWdpb24gPSBwcm9wcy5yZWdpb247XG5cbiAgICBjb25zdCBvcmdhbmlzYXRpb25BY2NvdW50cyA9IHByb3BzLm9yZ0FjY291bnRzLm1hcCgoYWNjb3VudCkgPT5cbiAgICAgIGFjY291bnQudG9Mb3dlckNhc2UoKVxuICAgICk7XG5cbiAgICBmb3IgKGNvbnN0IGFjY291bnQgb2Ygb3JnYW5pc2F0aW9uQWNjb3VudHMpIHtcbiAgICAgIGNvbnN0IGNpZHJCbG9jayA9IG5ldyBDaWRyQmxvY2soKTtcbiAgICAgIGNvbnN0IGZyZWVDaWRyQmxvY2sgPSBjaWRyQmxvY2suZ2V0Q2lkckJsb2NrKCk7XG4gICAgICBjaWRyQmxvY2sudXBkYXRlU3RhdGUoZnJlZUNpZHJCbG9jaywgZmFsc2UpO1xuXG4gICAgICBjb25zdCBhY2NvdW50TmFtZSA9IHN0cmlwQW5kQ2FtZWxDYXNlKGFjY291bnQpO1xuXG4gICAgICBjb25zdCBpcGFtUG9vbCA9IG5ldyBJcGFtUG9vbENsYXNzKFxuICAgICAgICB0aGlzLFxuICAgICAgICBgJHthY2NvdW50fUlwYW1Qb29sJHtmcmVlQ2lkckJsb2NrfWAsXG4gICAgICAgIHtcbiAgICAgICAgICBkZXNjcmlwdGlvbjogYCR7YWNjb3VudH0gLSBJUEFNIHBvb2wgLSAke3JlZ2lvbn0gLSAke2ZyZWVDaWRyQmxvY2t9YCxcbiAgICAgICAgICBhZGRyZXNzRmFtaWx5OiBcImlwdjRcIixcbiAgICAgICAgICBpcGFtU2NvcGVJZDogSXBhbVByaXZhdGVEZWZhdWx0U2NvcGVJZCxcbiAgICAgICAgICBsb2NhbGU6IHJlZ2lvbixcbiAgICAgICAgICBhbGxvY2F0aW9uUmVzb3VyY2VUYWdzOiBbXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgIGtleTogXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIixcbiAgICAgICAgICAgICAgdmFsdWU6IGAke2FjY291bnR9YFxuICAgICAgICAgICAgfVxuICAgICAgICAgIF0sXG4gICAgICAgICAgYXV0b0ltcG9ydDogdHJ1ZSxcbiAgICAgICAgICBwcm92aXNpb25lZENpZHJzOiBbeyBjaWRyOiBmcmVlQ2lkckJsb2NrIH1dLFxuICAgICAgICAgIHRhZ3M6IFtcbiAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAga2V5OiBcImZqYWxsOm9wZXJhdGlvbnM6cG9vbFwiLFxuICAgICAgICAgICAgICB2YWx1ZTogXCJ0b3AtbGV2ZWxcIlxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAga2V5OiBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOmFjY291bnRcIixcbiAgICAgICAgICAgICAgdmFsdWU6IGAke2FjY291bnR9YFxuICAgICAgICAgICAgfVxuICAgICAgICAgIF1cbiAgICAgICAgfVxuICAgICAgKTtcblxuICAgICAgbmV3IFJlc291cmNlU2hhcmUodGhpcywgYCR7YWNjb3VudH0ke3JlZ2lvbn1JcGFtUmVzb3VyY2VTaGFyZWAsIHtcbiAgICAgICAgbmFtZTogYCR7YWNjb3VudH1JcGFtUmVzb3VyY2VTaGFyZS4ke3JlZ2lvbn1gLFxuICAgICAgICBhbGxvd0V4dGVybmFsUHJpbmNpcGFsczogZmFsc2UsXG4gICAgICAgIC8vIFRPRE86IGdldEFjY291bnRJZCBleHBlY3RzIGVudmlyb25tZW50IGFzIGFyZ3VtZW50XG4gICAgICAgIHByaW5jaXBhbHM6IFtnZXRBY2NvdW50SWQoYWNjb3VudCldLFxuICAgICAgICByZXNvdXJjZUFybnM6IFtpcGFtUG9vbC5hdHRyQXJuXSxcbiAgICAgICAgdGFnczogW1xuICAgICAgICAgIHtcbiAgICAgICAgICAgIGtleTogXCJmamFsbDpjb3N0QWxsb2NhdGlvbjphY2NvdW50XCIsXG4gICAgICAgICAgICB2YWx1ZTogYCR7YWNjb3VudH1gXG4gICAgICAgICAgfVxuICAgICAgICBdXG4gICAgICB9KTtcblxuICAgICAgbmV3IENmbk91dHB1dCh0aGlzLCBgJHthY2NvdW50TmFtZX1JcGFtUG9vbElkYCwge1xuICAgICAgICBrZXk6IGAke2FjY291bnROYW1lfUlwYW1Qb29sSWRgLFxuICAgICAgICB2YWx1ZTogaXBhbVBvb2wuYXR0cklwYW1Qb29sSWQsXG4gICAgICAgIGV4cG9ydE5hbWU6IGAke2FjY291bnROYW1lfUlwYW1Qb29sSWRgXG4gICAgICB9KTtcblxuICAgICAgbmV3IENmbk91dHB1dCh0aGlzLCBgJHthY2NvdW50TmFtZX1JcGFtUG9vbEFybmAsIHtcbiAgICAgICAga2V5OiBgJHthY2NvdW50TmFtZX1JcGFtUG9vbEFybmAsXG4gICAgICAgIHZhbHVlOiBpcGFtUG9vbC5hdHRyQXJuLFxuICAgICAgICBleHBvcnROYW1lOiBgJHthY2NvdW50TmFtZX1JcGFtUG9vbEFybmBcbiAgICAgIH0pO1xuICAgIH1cbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgSXBhbVBvb2xTdGFjayBleHRlbmRzIFN0YWNrIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IElwYW1Qb29sU3RhY2tQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICBuZXcgSXBhbVBvb2wodGhpcywgXCJJcGFtUG9vbFwiLCB7XG4gICAgICBvcmdBY2NvdW50czogcHJvcHMub3JnQWNjb3VudHMsXG4gICAgICByZWdpb246IHByb3BzLnJlZ2lvblxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -3,7 +3,7 @@ import * as ec2 from "aws-cdk-lib/aws-ec2";
|
|
|
3
3
|
import { StackBuilder } from "../awsStack";
|
|
4
4
|
import { KeyValue } from "../../../types";
|
|
5
5
|
interface VpcProps extends ec2.VpcProps {
|
|
6
|
-
|
|
6
|
+
accountName?: string;
|
|
7
7
|
region?: string;
|
|
8
8
|
availabilityZones?: string[];
|
|
9
9
|
ipv4IpamPoolId?: string;
|
|
@@ -4,6 +4,7 @@ exports.Vpc = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const ec2 = require("aws-cdk-lib/aws-ec2");
|
|
6
6
|
const logGroup_1 = require("../logging/logGroup");
|
|
7
|
+
const stripAndCamelCase_1 = require("../../../utils/stripAndCamelCase");
|
|
7
8
|
class Vpc extends ec2.Vpc {
|
|
8
9
|
constructor(scope, id, props) {
|
|
9
10
|
super(scope, `vpc-${id}`, {
|
|
@@ -21,13 +22,14 @@ class Vpc extends ec2.Vpc {
|
|
|
21
22
|
ipAddresses: Vpc.ipAddresses(scope, props)
|
|
22
23
|
});
|
|
23
24
|
// Required for the VPC to use the IPAM Pool to provsion IP addresses
|
|
24
|
-
aws_cdk_lib_1.Tags.of(this).add("fjall:operations:pool", `${props?.
|
|
25
|
+
aws_cdk_lib_1.Tags.of(this).add("fjall:operations:pool", `${props?.accountName || "noPool"}`);
|
|
25
26
|
}
|
|
26
27
|
static availabilityZones(scope) {
|
|
27
28
|
return aws_cdk_lib_1.Stack.of(scope).availabilityZones.slice(0, 3);
|
|
28
29
|
}
|
|
29
30
|
static ipAddresses(scope, props) {
|
|
30
|
-
const ipv4IpamPoolId = props?.ipv4IpamPoolId ||
|
|
31
|
+
const ipv4IpamPoolId = props?.ipv4IpamPoolId ||
|
|
32
|
+
aws_cdk_lib_1.Fn.importValue(`${(0, stripAndCamelCase_1.stripAndCamelCase)(props?.accountName || "noPool")}IpamPoolId`);
|
|
31
33
|
// Default to unspecified ipAddresses if unable to read from stack output
|
|
32
34
|
if (!ipv4IpamPoolId)
|
|
33
35
|
return undefined;
|
|
@@ -61,4 +63,4 @@ class Vpc extends ec2.Vpc {
|
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
65
|
exports.Vpc = Vpc;
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3MvbmV0d29ya2luZy92cGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQTZEO0FBQzdELDJDQUEyQztBQUczQyxrREFBK0M7QUFFL0Msd0VBQXFFO0FBVXJFLE1BQWEsR0FBSSxTQUFRLEdBQUcsQ0FBQyxHQUFHO0lBQzlCLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZ0I7UUFDeEQsS0FBSyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLEdBQUcsS0FBSztZQUNSLE9BQU8sRUFBRSxPQUFPLEVBQUUsRUFBRTtZQUNwQixpQkFBaUIsRUFBRSxHQUFHLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDO1lBQy9DLFFBQVEsRUFBRTtnQkFDUixDQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsRUFBRTtvQkFDcEIsV0FBVyxFQUFFLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FDbEQsSUFBSSxtQkFBUSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsY0FBYyxFQUFFO3dCQUN2QyxZQUFZLEVBQUUscUJBQXFCLEVBQUUsR0FBRzt3QkFDeEMsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztxQkFDckMsQ0FBQyxDQUNIO2lCQUNGO2FBQ0Y7WUFDRCxXQUFXLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDO1NBQzNDLENBQUMsQ0FBQztRQUVILHFFQUFxRTtRQUNyRSxrQkFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQ2YsdUJBQXVCLEVBQ3ZCLEdBQUcsS0FBSyxFQUFFLFdBQVcsSUFBSSxRQUFRLEVBQUUsQ0FDcEMsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsaUJBQWlCLENBQUMsS0FBZ0I7UUFDdkMsT0FBTyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQWdCLEVBQUUsS0FBZ0I7UUFDbkQsTUFBTSxjQUFjLEdBQ2xCLEtBQUssRUFBRSxjQUFjO1lBQ3JCLGdCQUFFLENBQUMsV0FBVyxDQUNaLEdBQUcsSUFBQSxxQ0FBaUIsRUFBQyxLQUFLLEVBQUUsV0FBVyxJQUFJLFFBQVEsQ0FBQyxZQUFZLENBQ2pFLENBQUM7UUFFSix5RUFBeUU7UUFDekUsSUFBSSxDQUFDLGNBQWM7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUV0QyxPQUFPLEdBQUcsQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUM7WUFDdkMsY0FBYyxFQUFFLGNBQWM7WUFDOUIsaUJBQWlCLEVBQUUsRUFBRTtZQUNyQiw4QkFBOEIsRUFBRSxFQUFFO1NBQ25DLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFnQjtRQUN2QyxPQUFPLENBQUMsRUFBZ0IsRUFBRSxFQUFFO1lBQzFCLE9BQU8sSUFBSSxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM1QyxDQUFDLENBQUM7SUFDSixDQUFDO0lBQ0Q7Ozs7Ozs7OztPQVNHO0lBQ0gsTUFBTSxDQUFDLE1BQU0sQ0FDWCxFQUFVLEVBQ1YsWUFBb0I7UUFFcEIsT0FBTyxDQUFDLEVBQWdCLEVBQUUsRUFBRTtZQUMxQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQUU7Z0JBQzNDLE9BQU8sRUFBRSxHQUFHLFlBQVksSUFBSSxFQUFFLEVBQUU7YUFDakMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBeEVELGtCQXdFQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBUYWdzLCBSZW1vdmFsUG9saWN5LCBTdGFjaywgRm4gfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCAqIGFzIGVjMiBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjMlwiO1xuXG5pbXBvcnQgeyBTdGFja0J1aWxkZXIgfSBmcm9tIFwiLi4vYXdzU3RhY2tcIjtcbmltcG9ydCB7IExvZ0dyb3VwIH0gZnJvbSBcIi4uL2xvZ2dpbmcvbG9nR3JvdXBcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uLy4uL3R5cGVzXCI7XG5pbXBvcnQgeyBzdHJpcEFuZENhbWVsQ2FzZSB9IGZyb20gXCIuLi8uLi8uLi91dGlscy9zdHJpcEFuZENhbWVsQ2FzZVwiO1xuXG5pbnRlcmZhY2UgVnBjUHJvcHMgZXh0ZW5kcyBlYzIuVnBjUHJvcHMge1xuICBhY2NvdW50TmFtZT86IHN0cmluZztcbiAgcmVnaW9uPzogc3RyaW5nO1xuICBhdmFpbGFiaWxpdHlab25lcz86IHN0cmluZ1tdO1xuICBpcHY0SXBhbVBvb2xJZD86IHN0cmluZztcbiAgdGFnczogS2V5VmFsdWU7XG59XG5cbmV4cG9ydCBjbGFzcyBWcGMgZXh0ZW5kcyBlYzIuVnBjIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM/OiBWcGNQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBgdnBjLSR7aWR9YCwge1xuICAgICAgLi4ucHJvcHMsXG4gICAgICB2cGNOYW1lOiBgdnBjLSR7aWR9YCxcbiAgICAgIGF2YWlsYWJpbGl0eVpvbmVzOiBWcGMuYXZhaWxhYmlsaXR5Wm9uZXMoc2NvcGUpLFxuICAgICAgZmxvd0xvZ3M6IHtcbiAgICAgICAgW2Ake2lkfVZwY0Zsb3dMb2dzYF06IHtcbiAgICAgICAgICBkZXN0aW5hdGlvbjogZWMyLkZsb3dMb2dEZXN0aW5hdGlvbi50b0Nsb3VkV2F0Y2hMb2dzKFxuICAgICAgICAgICAgbmV3IExvZ0dyb3VwKHNjb3BlLCBgJHtpZH1GbG93TG9nR3JvdXBgLCB7XG4gICAgICAgICAgICAgIGxvZ0dyb3VwTmFtZTogYC92cGMvZmxvd2xvZ3MvdnBjLSR7aWR9L2AsXG4gICAgICAgICAgICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWVxuICAgICAgICAgICAgfSlcbiAgICAgICAgICApXG4gICAgICAgIH1cbiAgICAgIH0sXG4gICAgICBpcEFkZHJlc3NlczogVnBjLmlwQWRkcmVzc2VzKHNjb3BlLCBwcm9wcylcbiAgICB9KTtcblxuICAgIC8vIFJlcXVpcmVkIGZvciB0aGUgVlBDIHRvIHVzZSB0aGUgSVBBTSBQb29sIHRvIHByb3ZzaW9uIElQIGFkZHJlc3Nlc1xuICAgIFRhZ3Mub2YodGhpcykuYWRkKFxuICAgICAgXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIixcbiAgICAgIGAke3Byb3BzPy5hY2NvdW50TmFtZSB8fCBcIm5vUG9vbFwifWBcbiAgICApO1xuICB9XG5cbiAgc3RhdGljIGF2YWlsYWJpbGl0eVpvbmVzKHNjb3BlOiBDb25zdHJ1Y3QpIHtcbiAgICByZXR1cm4gU3RhY2sub2Yoc2NvcGUpLmF2YWlsYWJpbGl0eVpvbmVzLnNsaWNlKDAsIDMpO1xuICB9XG5cbiAgc3RhdGljIGlwQWRkcmVzc2VzKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzPzogVnBjUHJvcHMpIHtcbiAgICBjb25zdCBpcHY0SXBhbVBvb2xJZCA9XG4gICAgICBwcm9wcz8uaXB2NElwYW1Qb29sSWQgfHxcbiAgICAgIEZuLmltcG9ydFZhbHVlKFxuICAgICAgICBgJHtzdHJpcEFuZENhbWVsQ2FzZShwcm9wcz8uYWNjb3VudE5hbWUgfHwgXCJub1Bvb2xcIil9SXBhbVBvb2xJZGBcbiAgICAgICk7XG5cbiAgICAvLyBEZWZhdWx0IHRvIHVuc3BlY2lmaWVkIGlwQWRkcmVzc2VzIGlmIHVuYWJsZSB0byByZWFkIGZyb20gc3RhY2sgb3V0cHV0XG4gICAgaWYgKCFpcHY0SXBhbVBvb2xJZCkgcmV0dXJuIHVuZGVmaW5lZDtcblxuICAgIHJldHVybiBlYzIuSXBBZGRyZXNzZXMuYXdzSXBhbUFsbG9jYXRpb24oe1xuICAgICAgaXB2NElwYW1Qb29sSWQ6IGlwdjRJcGFtUG9vbElkLFxuICAgICAgaXB2NE5ldG1hc2tMZW5ndGg6IDIwLFxuICAgICAgZGVmYXVsdFN1Ym5ldElwdjROZXRtYXNrTGVuZ3RoOiAyM1xuICAgIH0pO1xuICB9XG5cbiAgc3RhdGljIGJ1aWxkKGlkOiBzdHJpbmcsIHByb3BzPzogVnBjUHJvcHMpOiAoc2I6IFN0YWNrQnVpbGRlcikgPT4gQ29uc3RydWN0IHtcbiAgICByZXR1cm4gKHNiOiBTdGFja0J1aWxkZXIpID0+IHtcbiAgICAgIHJldHVybiBuZXcgdGhpcyhzYi5nZXRTdGFjaygpLCBpZCwgcHJvcHMpO1xuICAgIH07XG4gIH1cbiAgLyoqXG4gICAqIEltcG9ydHMgYSBwcmUtZXhpc3RpbmcgVlBDIFJlc291cmNlIGludG8geW91ciBTdGFja1xuICAgKlxuICAgKiBCZWZvcmUgdXNpbmcgYW4gaW1wb3J0IG1ldGhvZCBlbnN1cmUgeW91IGhhdmUgc2V0IHRoZSBhY2NvdW50IGFuZCByZWdpb24gcHJvcHNcbiAgICogIHdoZW4gY3JlYXRpbmcgeW91ciBBd3NTdGFjay5cbiAgICpcbiAgICogQHBhcmFtIGlkXG4gICAqIEBwYXJhbSB2cGNTdGFja05hbWVcbiAgICogQHJldHVybnNcbiAgICovXG4gIHN0YXRpYyBpbXBvcnQoXG4gICAgaWQ6IHN0cmluZyxcbiAgICB2cGNTdGFja05hbWU6IHN0cmluZ1xuICApOiAoc2I6IFN0YWNrQnVpbGRlcikgPT4gQ29uc3RydWN0IHtcbiAgICByZXR1cm4gKHNiOiBTdGFja0J1aWxkZXIpID0+IHtcbiAgICAgIHJldHVybiBlYzIuVnBjLmZyb21Mb29rdXAoc2IuZ2V0U3RhY2soKSwgaWQsIHtcbiAgICAgICAgdnBjTmFtZTogYCR7dnBjU3RhY2tOYW1lfS8ke2lkfWBcbiAgICAgIH0pO1xuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -10,7 +10,7 @@ class CustomerManagedKey extends constructs_1.Construct {
|
|
|
10
10
|
super(scope, id);
|
|
11
11
|
this.key = new aws_kms_1.Key(this, `${id}Key`, {
|
|
12
12
|
description: props.description || `${id} KMS Key`,
|
|
13
|
-
removalPolicy: aws_cdk_lib_1.RemovalPolicy.
|
|
13
|
+
removalPolicy: aws_cdk_lib_1.RemovalPolicy.RETAIN
|
|
14
14
|
});
|
|
15
15
|
new aws_cdk_lib_1.CfnOutput(this, `${id}KeyArn`, {
|
|
16
16
|
key: `${id}Arn`,
|
|
@@ -31,4 +31,4 @@ class CustomerManagedKey extends constructs_1.Construct {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
exports.CustomerManagedKey = CustomerManagedKey;
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3Mvc2VjcmV0cy9rbXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQXVEO0FBQ3ZELGlEQUFpRDtBQUNqRCwyQ0FBdUM7QUFDdkMsNERBQXFEO0FBU3JELE1BQWEsa0JBQW1CLFNBQVEsc0JBQVM7SUFJL0MsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUE4QjtRQUN0RSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxhQUFHLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUU7WUFDbkMsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXLElBQUksR0FBRyxFQUFFLFVBQVU7WUFDakQsYUFBYSxFQUFFLDJCQUFhLENBQUMsTUFBTTtTQUNwQyxDQUFDLENBQUM7UUFDSCxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUU7WUFDakMsR0FBRyxFQUFFLEdBQUcsRUFBRSxLQUFLO1lBQ2YsS0FBSyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTTtZQUN0QixVQUFVLEVBQUUsR0FBRyxFQUFFLFFBQVE7U0FDMUIsQ0FBQyxDQUFDO1FBQ0gsSUFBQSxxQkFBVyxFQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRWxDLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxlQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUU7WUFDNUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxTQUFTLElBQUksT0FBTyxFQUFFLEVBQUU7WUFDekMsU0FBUyxFQUFFLElBQUksQ0FBQyxHQUFHO1NBQ3BCLENBQUMsQ0FBQztRQUNILElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLGFBQWEsRUFBRTtZQUN0QyxHQUFHLEVBQUUsR0FBRyxFQUFFLFVBQVU7WUFDcEIsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUTtZQUMxQixVQUFVLEVBQUUsR0FBRyxFQUFFLGFBQWE7U0FDL0IsQ0FBQyxDQUFDO1FBQ0gsSUFBQSxxQkFBVyxFQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3RDLENBQUM7Q0FDRjtBQTdCRCxnREE2QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDZm5PdXRwdXQsIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IEFsaWFzLCBLZXkgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWttc1wiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB0YWdSZXNvdXJjZSBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvdGFnUmVzb3VyY2VcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uLy4uL3R5cGVzXCI7XG5cbmludGVyZmFjZSBDdXN0b21lck1hbmFnZWRLZXlQcm9wcyB7XG4gIGRlc2NyaXB0aW9uPzogc3RyaW5nO1xuICBhbGlhc05hbWU/OiBzdHJpbmc7XG4gIHRhZ3M6IEtleVZhbHVlO1xufVxuXG5leHBvcnQgY2xhc3MgQ3VzdG9tZXJNYW5hZ2VkS2V5IGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IGtleTogS2V5O1xuICBwdWJsaWMgcmVhZG9ubHkgYWxpYXM6IEFsaWFzO1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBDdXN0b21lck1hbmFnZWRLZXlQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICB0aGlzLmtleSA9IG5ldyBLZXkodGhpcywgYCR7aWR9S2V5YCwge1xuICAgICAgZGVzY3JpcHRpb246IHByb3BzLmRlc2NyaXB0aW9uIHx8IGAke2lkfSBLTVMgS2V5YCxcbiAgICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuUkVUQUlOXG4gICAgfSk7XG4gICAgbmV3IENmbk91dHB1dCh0aGlzLCBgJHtpZH1LZXlBcm5gLCB7XG4gICAgICBrZXk6IGAke2lkfUFybmAsXG4gICAgICB2YWx1ZTogdGhpcy5rZXkua2V5QXJuLFxuICAgICAgZXhwb3J0TmFtZTogYCR7aWR9S2V5QXJuYFxuICAgIH0pO1xuICAgIHRhZ1Jlc291cmNlKHRoaXMua2V5LCBwcm9wcy50YWdzKTtcblxuICAgIHRoaXMuYWxpYXMgPSBuZXcgQWxpYXModGhpcywgYCR7aWR9S2V5QWxpYXNgLCB7XG4gICAgICBhbGlhc05hbWU6IHByb3BzLmFsaWFzTmFtZSB8fCBgY21rLyR7aWR9YCxcbiAgICAgIHRhcmdldEtleTogdGhpcy5rZXlcbiAgICB9KTtcbiAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIGAke2lkfUtleUFsaWFzQXJuYCwge1xuICAgICAga2V5OiBgJHtpZH1BbGlhc0FybmAsXG4gICAgICB2YWx1ZTogdGhpcy5hbGlhcy5hbGlhc0FybixcbiAgICAgIGV4cG9ydE5hbWU6IGAke2lkfUtleUFsaWFzQXJuYFxuICAgIH0pO1xuICAgIHRhZ1Jlc291cmNlKHRoaXMuYWxpYXMsIHByb3BzLnRhZ3MpO1xuICB9XG59XG4iXX0=
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const getConfig_1 = require("./getConfig");
|
|
4
4
|
function getAccountId(environment) {
|
|
5
|
-
|
|
5
|
+
//TODO: in the use cases of getAccountId, we are currently passing in accountName
|
|
6
|
+
const config = (0, getConfig_1.getEnvironmentConfig)(environment);
|
|
6
7
|
// TODO: need to fix how we handle this in the VPC module
|
|
7
|
-
if (!config || !config.
|
|
8
|
+
if (!config || !config.accountId)
|
|
8
9
|
return "error";
|
|
9
|
-
return config.
|
|
10
|
+
return config.accountId;
|
|
10
11
|
}
|
|
11
12
|
exports.default = getAccountId;
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0QWNjb3VudElkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL2dldEFjY291bnRJZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUFtRDtBQUVuRCxTQUF3QixZQUFZLENBQUMsV0FBbUI7SUFDdEQsaUZBQWlGO0lBQ2pGLE1BQU0sTUFBTSxHQUFHLElBQUEsZ0NBQW9CLEVBQUMsV0FBVyxDQUFDLENBQUM7SUFDakQseURBQXlEO0lBQ3pELElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUztRQUFFLE9BQU8sT0FBTyxDQUFDO0lBRWpELE9BQU8sTUFBTSxDQUFDLFNBQVMsQ0FBQztBQUMxQixDQUFDO0FBUEQsK0JBT0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBnZXRFbnZpcm9ubWVudENvbmZpZyB9IGZyb20gXCIuL2dldENvbmZpZ1wiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBnZXRBY2NvdW50SWQoZW52aXJvbm1lbnQ6IHN0cmluZyk6IHN0cmluZyB7XG4gIC8vVE9ETzogaW4gdGhlIHVzZSBjYXNlcyBvZiBnZXRBY2NvdW50SWQsIHdlIGFyZSBjdXJyZW50bHkgcGFzc2luZyBpbiBhY2NvdW50TmFtZVxuICBjb25zdCBjb25maWcgPSBnZXRFbnZpcm9ubWVudENvbmZpZyhlbnZpcm9ubWVudCk7XG4gIC8vIFRPRE86IG5lZWQgdG8gZml4IGhvdyB3ZSBoYW5kbGUgdGhpcyBpbiB0aGUgVlBDIG1vZHVsZVxuICBpZiAoIWNvbmZpZyB8fCAhY29uZmlnLmFjY291bnRJZCkgcmV0dXJuIFwiZXJyb3JcIjtcblxuICByZXR1cm4gY29uZmlnLmFjY291bnRJZDtcbn1cbiJdfQ==
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Account } from "@aws-sdk/client-organizations";
|
|
2
|
+
/**
|
|
3
|
+
* This is an example of an async class that will resolve when a synth is run
|
|
4
|
+
*/
|
|
5
|
+
export default class Accounts {
|
|
6
|
+
ready: Promise<void>;
|
|
7
|
+
private configFile;
|
|
8
|
+
constructor(region: string);
|
|
9
|
+
getAccounts(): Account[];
|
|
10
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const client_organizations_1 = require("@aws-sdk/client-organizations");
|
|
4
|
+
const fs = require("fs");
|
|
5
|
+
/**
|
|
6
|
+
* This is an example of an async class that will resolve when a synth is run
|
|
7
|
+
*/
|
|
8
|
+
class Accounts {
|
|
9
|
+
constructor(region) {
|
|
10
|
+
this.configFile = "fjall/accounts-config.json";
|
|
11
|
+
// Ensure fjall directory exists
|
|
12
|
+
fs.mkdirSync("fjall", { recursive: true });
|
|
13
|
+
// Make API Call
|
|
14
|
+
const client = new client_organizations_1.OrganizationsClient({
|
|
15
|
+
region: region
|
|
16
|
+
});
|
|
17
|
+
const request = new client_organizations_1.ListAccountsCommand({
|
|
18
|
+
MaxResults: Number("20")
|
|
19
|
+
});
|
|
20
|
+
this.ready = new Promise((resolve, reject) => {
|
|
21
|
+
client
|
|
22
|
+
.send(request)
|
|
23
|
+
.then((result) => {
|
|
24
|
+
const configString = JSON.stringify(result.Accounts);
|
|
25
|
+
fs.writeFileSync(this.configFile, configString);
|
|
26
|
+
resolve(undefined);
|
|
27
|
+
})
|
|
28
|
+
.catch(reject);
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
getAccounts() {
|
|
32
|
+
const data = fs.readFileSync(this.configFile, "utf-8");
|
|
33
|
+
return JSON.parse(data);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.default = Accounts;
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0QXN5bmMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvZ2V0QXN5bmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFJdUM7QUFDdkMseUJBQXlCO0FBRXpCOztHQUVHO0FBQ0gsTUFBcUIsUUFBUTtJQUszQixZQUFZLE1BQWM7UUFGbEIsZUFBVSxHQUFHLDRCQUE0QixDQUFDO1FBR2hELGdDQUFnQztRQUNoQyxFQUFFLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBRTNDLGdCQUFnQjtRQUNoQixNQUFNLE1BQU0sR0FBRyxJQUFJLDBDQUFtQixDQUFDO1lBQ3JDLE1BQU0sRUFBRSxNQUFNO1NBQ2YsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxPQUFPLEdBQUcsSUFBSSwwQ0FBbUIsQ0FBQztZQUN0QyxVQUFVLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQztTQUN6QixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQzNDLE1BQU07aUJBQ0gsSUFBSSxDQUFDLE9BQU8sQ0FBQztpQkFDYixJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtnQkFDZixNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDckQsRUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFlBQVksQ0FBQyxDQUFDO2dCQUNoRCxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDckIsQ0FBQyxDQUFDO2lCQUNELEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxXQUFXO1FBQ1QsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3ZELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQWMsQ0FBQztJQUN2QyxDQUFDO0NBQ0Y7QUFoQ0QsMkJBZ0NDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWNjb3VudCxcbiAgTGlzdEFjY291bnRzQ29tbWFuZCxcbiAgT3JnYW5pemF0aW9uc0NsaWVudFxufSBmcm9tIFwiQGF3cy1zZGsvY2xpZW50LW9yZ2FuaXphdGlvbnNcIjtcbmltcG9ydCAqIGFzIGZzIGZyb20gXCJmc1wiO1xuXG4vKipcbiAqIFRoaXMgaXMgYW4gZXhhbXBsZSBvZiBhbiBhc3luYyBjbGFzcyB0aGF0IHdpbGwgcmVzb2x2ZSB3aGVuIGEgc3ludGggaXMgcnVuXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEFjY291bnRzIHtcbiAgcHVibGljIHJlYWR5OiBQcm9taXNlPHZvaWQ+O1xuXG4gIHByaXZhdGUgY29uZmlnRmlsZSA9IFwiZmphbGwvYWNjb3VudHMtY29uZmlnLmpzb25cIjtcblxuICBjb25zdHJ1Y3RvcihyZWdpb246IHN0cmluZykge1xuICAgIC8vIEVuc3VyZSBmamFsbCBkaXJlY3RvcnkgZXhpc3RzXG4gICAgZnMubWtkaXJTeW5jKFwiZmphbGxcIiwgeyByZWN1cnNpdmU6IHRydWUgfSk7XG5cbiAgICAvLyBNYWtlIEFQSSBDYWxsXG4gICAgY29uc3QgY2xpZW50ID0gbmV3IE9yZ2FuaXphdGlvbnNDbGllbnQoe1xuICAgICAgcmVnaW9uOiByZWdpb25cbiAgICB9KTtcbiAgICBjb25zdCByZXF1ZXN0ID0gbmV3IExpc3RBY2NvdW50c0NvbW1hbmQoe1xuICAgICAgTWF4UmVzdWx0czogTnVtYmVyKFwiMjBcIilcbiAgICB9KTtcbiAgICB0aGlzLnJlYWR5ID0gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4ge1xuICAgICAgY2xpZW50XG4gICAgICAgIC5zZW5kKHJlcXVlc3QpXG4gICAgICAgIC50aGVuKChyZXN1bHQpID0+IHtcbiAgICAgICAgICBjb25zdCBjb25maWdTdHJpbmcgPSBKU09OLnN0cmluZ2lmeShyZXN1bHQuQWNjb3VudHMpO1xuICAgICAgICAgIGZzLndyaXRlRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBjb25maWdTdHJpbmcpO1xuICAgICAgICAgIHJlc29sdmUodW5kZWZpbmVkKTtcbiAgICAgICAgfSlcbiAgICAgICAgLmNhdGNoKHJlamVjdCk7XG4gICAgfSk7XG4gIH1cblxuICBnZXRBY2NvdW50cygpOiBBY2NvdW50W10ge1xuICAgIGNvbnN0IGRhdGEgPSBmcy5yZWFkRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBcInV0Zi04XCIpO1xuICAgIHJldHVybiBKU09OLnBhcnNlKGRhdGEpIGFzIEFjY291bnRbXTtcbiAgfVxufVxuIl19
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const fs = require("fs");
|
|
4
4
|
class CidrBlock {
|
|
5
5
|
constructor() {
|
|
6
|
-
this.configFile = "
|
|
7
|
-
// Ensure
|
|
8
|
-
fs.mkdirSync("
|
|
6
|
+
this.configFile = "fjall/cidr-config.json";
|
|
7
|
+
// Ensure fjall directory exists
|
|
8
|
+
fs.mkdirSync("fjall", { recursive: true });
|
|
9
9
|
// Import config, or create it if it doesn't exist
|
|
10
10
|
if (fs.existsSync(this.configFile)) {
|
|
11
11
|
const configString = fs.readFileSync(this.configFile, "utf-8");
|
|
@@ -39,4 +39,4 @@ class CidrBlock {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
exports.default = CidrBlock;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q2lkci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy9nZXRDaWRyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUJBQXlCO0FBTXpCLE1BQXFCLFNBQVM7SUFJNUI7UUFGUSxlQUFVLEdBQUcsd0JBQXdCLENBQUM7UUFHNUMsZ0NBQWdDO1FBQ2hDLEVBQUUsQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFM0Msa0RBQWtEO1FBQ2xELElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUU7WUFDbEMsTUFBTSxZQUFZLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQy9ELElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztTQUMzQzthQUFNO1lBQ0wsSUFBSSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7WUFDcEIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRTtnQkFDN0IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsSUFBSSxDQUFDO2FBQ3ZDO1lBQ0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztZQUM3RCxFQUFFLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsWUFBWSxDQUFDLENBQUM7U0FDakQ7SUFDSCxDQUFDO0lBRUQsVUFBVTtRQUNSLG9DQUFvQztRQUNwQyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQzdELEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsWUFBWTtRQUNWLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRTtZQUNoQyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ3ZCLE9BQU8sR0FBRyxDQUFDO2FBQ1o7U0FDRjtRQUNELE9BQU8sV0FBVyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxXQUFXLENBQUMsU0FBaUIsRUFBRSxNQUFlO1FBQzVDLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLEdBQUcsTUFBTSxDQUFDO1FBQ25DLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUF6Q0QsNEJBeUNDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZnMgZnJvbSBcImZzXCI7XG5cbmludGVyZmFjZSBjaWRyVGFibGUge1xuICBba2V5OiBzdHJpbmddOiBib29sZWFuO1xufVxuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDaWRyQmxvY2sge1xuICBwcml2YXRlIGNpZHJCbG9jazogY2lkclRhYmxlO1xuICBwcml2YXRlIGNvbmZpZ0ZpbGUgPSBcImZqYWxsL2NpZHItY29uZmlnLmpzb25cIjtcblxuICBjb25zdHJ1Y3RvcigpIHtcbiAgICAvLyBFbnN1cmUgZmphbGwgZGlyZWN0b3J5IGV4aXN0c1xuICAgIGZzLm1rZGlyU3luYyhcImZqYWxsXCIsIHsgcmVjdXJzaXZlOiB0cnVlIH0pO1xuXG4gICAgLy8gSW1wb3J0IGNvbmZpZywgb3IgY3JlYXRlIGl0IGlmIGl0IGRvZXNuJ3QgZXhpc3RcbiAgICBpZiAoZnMuZXhpc3RzU3luYyh0aGlzLmNvbmZpZ0ZpbGUpKSB7XG4gICAgICBjb25zdCBjb25maWdTdHJpbmcgPSBmcy5yZWFkRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBcInV0Zi04XCIpO1xuICAgICAgdGhpcy5jaWRyQmxvY2sgPSBKU09OLnBhcnNlKGNvbmZpZ1N0cmluZyk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuY2lkckJsb2NrID0ge307XG4gICAgICBmb3IgKGxldCBpID0gMTsgaSA8PSAyNTU7IGkrKykge1xuICAgICAgICB0aGlzLmNpZHJCbG9ja1tgJHtpfS4wLjAuMC84YF0gPSB0cnVlO1xuICAgICAgfVxuICAgICAgY29uc3QgY29uZmlnU3RyaW5nID0gSlNPTi5zdHJpbmdpZnkodGhpcy5jaWRyQmxvY2ssIG51bGwsIDIpO1xuICAgICAgZnMud3JpdGVGaWxlU3luYyh0aGlzLmNvbmZpZ0ZpbGUsIGNvbmZpZ1N0cmluZyk7XG4gICAgfVxuICB9XG5cbiAgd3JpdGVTdGF0ZSgpIHtcbiAgICAvLyBKU09OLWlmeSBjb25maWcgYW5kIHdyaXRlIHRvIGZpbGVcbiAgICBjb25zdCBjb25maWdTdHJpbmcgPSBKU09OLnN0cmluZ2lmeSh0aGlzLmNpZHJCbG9jaywgbnVsbCwgMik7XG4gICAgZnMud3JpdGVGaWxlU3luYyh0aGlzLmNvbmZpZ0ZpbGUsIGNvbmZpZ1N0cmluZyk7XG4gIH1cblxuICBnZXRDaWRyQmxvY2soKSB7XG4gICAgZm9yIChjb25zdCBrZXkgaW4gdGhpcy5jaWRyQmxvY2spIHtcbiAgICAgIGlmICh0aGlzLmNpZHJCbG9ja1trZXldKSB7XG4gICAgICAgIHJldHVybiBrZXk7XG4gICAgICB9XG4gICAgfVxuICAgIHJldHVybiBcIjAuMC4wLjAvOFwiO1xuICB9XG5cbiAgdXBkYXRlU3RhdGUoY2lkckJsb2NrOiBzdHJpbmcsIHN0YXR1czogYm9vbGVhbikge1xuICAgIHRoaXMuY2lkckJsb2NrW2NpZHJCbG9ja10gPSBzdGF0dXM7XG4gICAgdGhpcy53cml0ZVN0YXRlKCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { Account } from "@aws-sdk/client-organizations";
|
|
1
2
|
interface Config {
|
|
2
3
|
environment: string;
|
|
3
|
-
|
|
4
|
+
accountId: string;
|
|
4
5
|
accountName: string;
|
|
5
6
|
region: string;
|
|
7
|
+
existingAccounts: Account[];
|
|
6
8
|
}
|
|
7
|
-
export declare function
|
|
9
|
+
export declare function getEnvironmentConfig(accountName: string): Config;
|
|
8
10
|
export declare function getConfig(): Config;
|
|
9
11
|
export default getConfig;
|