@fjall/components-infrastructure 0.70.1 → 0.71.0
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/patterns/aws/ec2.d.ts +43 -0
- package/dist/lib/patterns/aws/ec2.js +123 -0
- package/dist/lib/patterns/aws/managedOrganisation.d.ts +0 -1
- package/dist/lib/patterns/aws/managedOrganisation.js +1 -34
- package/dist/lib/patterns/aws/storage.d.ts +11 -3
- package/dist/lib/patterns/aws/storage.js +11 -5
- package/dist/lib/resources/aws/database/rdsInstance.js +2 -2
- package/dist/lib/utils/getCidr.d.ts +8 -0
- package/dist/lib/utils/getCidr.js +40 -0
- package/package.json +3 -3
- package/dist/lib/__tests__/patterns/__snapshots__/compute.test.js.snap +0 -433
- package/dist/lib/__tests__/patterns/compute.test.d.ts +0 -1
- package/dist/lib/__tests__/patterns/compute.test.js +0 -137
- package/dist/lib/__tests__/simple.test.d.ts +0 -0
- package/dist/lib/__tests__/simple.test.js +0 -12
- package/dist/lib/resources/aws/organisations/account.d.ts +0 -37
- package/dist/lib/resources/aws/organisations/account.js +0 -220
- package/dist/lib/resources/aws/organisations/delegatedAdministrator.d.ts +0 -14
- package/dist/lib/resources/aws/organisations/delegatedAdministrator.js +0 -61
- package/dist/lib/resources/aws/organisations/index.d.ts +0 -8
- package/dist/lib/resources/aws/organisations/index.js +0 -22
- package/dist/lib/resources/aws/organisations/interfaces.d.ts +0 -105
- package/dist/lib/resources/aws/organisations/interfaces.js +0 -3
- package/dist/lib/resources/aws/organisations/organisation.d.ts +0 -47
- package/dist/lib/resources/aws/organisations/organisation.js +0 -263
- package/dist/lib/resources/aws/organisations/organisationalUnit.d.ts +0 -28
- package/dist/lib/resources/aws/organisations/organisationalUnit.js +0 -170
- package/dist/lib/resources/aws/organisations/policy.d.ts +0 -17
- package/dist/lib/resources/aws/organisations/policy.js +0 -93
- package/dist/lib/resources/aws/organisations/trustedServiceAccess.d.ts +0 -13
- package/dist/lib/resources/aws/organisations/trustedServiceAccess.js +0 -58
- package/dist/lib/resources/aws/organisations/types.d.ts +0 -165
- package/dist/lib/resources/aws/organisations/types.js +0 -36
- package/dist/lib/utils/directTagging.d.ts +0 -31
- package/dist/lib/utils/directTagging.js +0 -86
- package/dist/lib/utils/fjallConstruct.d.ts +0 -8
- package/dist/lib/utils/fjallConstruct.js +0 -18
- package/dist/lib/utils/fjallStackSynthesizer.d.ts +0 -9
- package/dist/lib/utils/fjallStackSynthesizer.js +0 -22
- package/dist/lib/utils/tagContext.d.ts +0 -28
- package/dist/lib/utils/tagContext.js +0 -53
- package/dist/lib/utils/tagSynthesizer.d.ts +0 -13
- package/dist/lib/utils/tagSynthesizer.js +0 -55
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { BlockDevice, IMachineImage, IVpc, SubnetType, UserData, SecurityGroup, IConnectable, Connections } from "aws-cdk-lib/aws-ec2";
|
|
2
|
+
import { Construct } from "constructs";
|
|
3
|
+
import { StackProps } from "aws-cdk-lib";
|
|
4
|
+
import { Role } from "aws-cdk-lib/aws-iam";
|
|
5
|
+
import { KeyValue } from "../../types";
|
|
6
|
+
interface ExistingVpcConfig {
|
|
7
|
+
vpcId?: string;
|
|
8
|
+
subnetType?: SubnetType;
|
|
9
|
+
}
|
|
10
|
+
interface NewVpcConfig {
|
|
11
|
+
subnetType: SubnetType;
|
|
12
|
+
}
|
|
13
|
+
export type VpcProps = ExistingVpcConfig | NewVpcConfig;
|
|
14
|
+
interface Ec2InstanceProps extends StackProps {
|
|
15
|
+
spotCapacityPercentage?: number;
|
|
16
|
+
blockDevices?: BlockDevice[];
|
|
17
|
+
accountId?: string;
|
|
18
|
+
serviceName: string;
|
|
19
|
+
vpc: VpcProps;
|
|
20
|
+
minCapcity?: number;
|
|
21
|
+
maxCapacity?: number;
|
|
22
|
+
instanceType: string;
|
|
23
|
+
machineImage?: IMachineImage;
|
|
24
|
+
userData?: UserData;
|
|
25
|
+
role?: Role;
|
|
26
|
+
enableSSH?: boolean;
|
|
27
|
+
tags: KeyValue;
|
|
28
|
+
}
|
|
29
|
+
export declare class Ec2Instance extends Construct implements IConnectable {
|
|
30
|
+
private launchTemplate;
|
|
31
|
+
vpc: IVpc;
|
|
32
|
+
asgSecurityGroup: SecurityGroup;
|
|
33
|
+
private autoScalingGroup;
|
|
34
|
+
private keyPair;
|
|
35
|
+
constructor(scope: Construct, id: string, props: Ec2InstanceProps);
|
|
36
|
+
connections: Connections;
|
|
37
|
+
addVpc(props: Ec2InstanceProps): void;
|
|
38
|
+
addKeyPair(props: Ec2InstanceProps): void;
|
|
39
|
+
addLaunchTemplate(props: Ec2InstanceProps): void;
|
|
40
|
+
addAutoScalingGroup(props: Ec2InstanceProps): void;
|
|
41
|
+
suspendAutoScaling(): void;
|
|
42
|
+
}
|
|
43
|
+
export {};
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Ec2Instance = void 0;
|
|
4
|
+
const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
5
|
+
const constructs_1 = require("constructs");
|
|
6
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
7
|
+
const tagResource_1 = require("../../utils/tagResource");
|
|
8
|
+
const aws_autoscaling_1 = require("aws-cdk-lib/aws-autoscaling");
|
|
9
|
+
const awsCustomResource_1 = require("../../resources/aws/utilities/awsCustomResource");
|
|
10
|
+
const custom_resources_1 = require("aws-cdk-lib/custom-resources");
|
|
11
|
+
const vpc_1 = require("../../resources/aws/networking/vpc");
|
|
12
|
+
class Ec2Instance extends constructs_1.Construct {
|
|
13
|
+
constructor(scope, id, props) {
|
|
14
|
+
super(scope, id);
|
|
15
|
+
this.addVpc(props);
|
|
16
|
+
if (props.enableSSH) {
|
|
17
|
+
this.addKeyPair(props);
|
|
18
|
+
}
|
|
19
|
+
this.addLaunchTemplate(props);
|
|
20
|
+
this.addAutoScalingGroup(props);
|
|
21
|
+
this.suspendAutoScaling();
|
|
22
|
+
//TODO: Add load balancer as boolean prop, then configure load balancer
|
|
23
|
+
}
|
|
24
|
+
addVpc(props) {
|
|
25
|
+
if ("vpcId" in props.vpc) {
|
|
26
|
+
this.vpc = vpc_1.Vpc.fromLookup(this, `${props.serviceName}Vpc`, {
|
|
27
|
+
vpcId: props.vpc.vpcId
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
this.vpc = new vpc_1.Vpc(this, `${props.serviceName}Vpc`, {
|
|
32
|
+
accountId: props.accountId,
|
|
33
|
+
tags: props.tags,
|
|
34
|
+
subnetConfiguration: [
|
|
35
|
+
{
|
|
36
|
+
name: `${props.serviceName}`,
|
|
37
|
+
subnetType: props.vpc.subnetType || aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS
|
|
38
|
+
}
|
|
39
|
+
]
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
addKeyPair(props) {
|
|
44
|
+
// TODO: Breakout into a seperate construct for use with better prop handling
|
|
45
|
+
this.keyPair = new aws_ec2_1.KeyPair(this, "KeyPair", {
|
|
46
|
+
keyPairName: `${props.serviceName}KeyPair`
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
addLaunchTemplate(props) {
|
|
50
|
+
this.asgSecurityGroup = new aws_ec2_1.SecurityGroup(this, `AsgSecurityGroup`, {
|
|
51
|
+
vpc: this.vpc,
|
|
52
|
+
description: `Security group for the ${props.serviceName} auto scaling group`
|
|
53
|
+
});
|
|
54
|
+
if (props.enableSSH) {
|
|
55
|
+
this.asgSecurityGroup.addIngressRule(aws_ec2_1.Peer.anyIpv4(), aws_ec2_1.Port.tcp(22), "Allow SSH");
|
|
56
|
+
}
|
|
57
|
+
this.launchTemplate = new aws_ec2_1.LaunchTemplate(this, "LaunchTemplate", {
|
|
58
|
+
launchTemplateName: `${props.serviceName}LaunchTemplate`,
|
|
59
|
+
instanceType: new aws_ec2_1.InstanceType(`${props.instanceType}`),
|
|
60
|
+
machineImage: props.machineImage || aws_ec2_1.MachineImage.latestAmazonLinux2(),
|
|
61
|
+
userData: props.userData,
|
|
62
|
+
role: props.role,
|
|
63
|
+
blockDevices: props?.blockDevices,
|
|
64
|
+
securityGroup: this.asgSecurityGroup,
|
|
65
|
+
detailedMonitoring: true,
|
|
66
|
+
requireImdsv2: true,
|
|
67
|
+
httpPutResponseHopLimit: 2,
|
|
68
|
+
httpTokens: aws_ec2_1.LaunchTemplateHttpTokens.REQUIRED,
|
|
69
|
+
instanceMetadataTags: true,
|
|
70
|
+
keyPair: this.keyPair
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
addAutoScalingGroup(props) {
|
|
74
|
+
// TODO: Support spot instances
|
|
75
|
+
// TODO: Handle terminating EC2 instances when updating, currently hangs.
|
|
76
|
+
this.autoScalingGroup = new aws_autoscaling_1.AutoScalingGroup(this, "AutoScalingGroup", {
|
|
77
|
+
vpc: this.vpc,
|
|
78
|
+
vpcSubnets: {
|
|
79
|
+
subnetType: props.enableSSH ? aws_ec2_1.SubnetType.PUBLIC : undefined
|
|
80
|
+
},
|
|
81
|
+
minCapacity: props.minCapcity,
|
|
82
|
+
maxCapacity: props.maxCapacity,
|
|
83
|
+
launchTemplate: this.launchTemplate,
|
|
84
|
+
cooldown: aws_cdk_lib_1.Duration.seconds(60),
|
|
85
|
+
groupMetrics: [aws_autoscaling_1.GroupMetrics.all()],
|
|
86
|
+
updatePolicy: aws_autoscaling_1.UpdatePolicy.replacingUpdate(),
|
|
87
|
+
newInstancesProtectedFromScaleIn: true,
|
|
88
|
+
// securityGroup: this.asgSecurityGroup,
|
|
89
|
+
terminationPolicies: [
|
|
90
|
+
aws_autoscaling_1.TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,
|
|
91
|
+
aws_autoscaling_1.TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR
|
|
92
|
+
],
|
|
93
|
+
ssmSessionPermissions: true
|
|
94
|
+
});
|
|
95
|
+
(0, tagResource_1.default)(this.autoScalingGroup, props.tags);
|
|
96
|
+
}
|
|
97
|
+
suspendAutoScaling() {
|
|
98
|
+
new awsCustomResource_1.AwsCustomResource(this, "SuspendAutoscaling", {
|
|
99
|
+
functionName: "suspendAutoScaling",
|
|
100
|
+
onCreate: {
|
|
101
|
+
service: "AutoScaling",
|
|
102
|
+
action: "suspendProcesses",
|
|
103
|
+
parameters: {
|
|
104
|
+
AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,
|
|
105
|
+
ScalingProcesses: ["AZRebalance"]
|
|
106
|
+
},
|
|
107
|
+
physicalResourceId: custom_resources_1.PhysicalResourceId.of("suspendAutoScaling")
|
|
108
|
+
},
|
|
109
|
+
onUpdate: {
|
|
110
|
+
service: "AutoScaling",
|
|
111
|
+
action: "suspendProcesses",
|
|
112
|
+
parameters: {
|
|
113
|
+
AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,
|
|
114
|
+
ScalingProcesses: ["AZRebalance"]
|
|
115
|
+
},
|
|
116
|
+
physicalResourceId: custom_resources_1.PhysicalResourceId.of("suspendAutoScaling")
|
|
117
|
+
},
|
|
118
|
+
resourceType: "Custom::suspendAutoscaling"
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
exports.Ec2Instance = Ec2Instance;
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/ec2.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  BlockDevice,\n  IMachineImage,\n  InstanceType,\n  IVpc,\n  LaunchTemplate,\n  SubnetType,\n  UserData,\n  MachineImage,\n  LaunchTemplateHttpTokens,\n  KeyPair,\n  IKeyPair,\n  SecurityGroup,\n  Peer,\n  Port,\n  IConnectable,\n  Connections\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\nimport { Duration, StackProps } from \"aws-cdk-lib\";\nimport tagResource from \"../../utils/tagResource\";\nimport { Role } from \"aws-cdk-lib/aws-iam\";\nimport {\n  AutoScalingGroup,\n  GroupMetrics,\n  TerminationPolicy,\n  UpdatePolicy\n} from \"aws-cdk-lib/aws-autoscaling\";\nimport { KeyValue } from \"../../types\";\nimport { AwsCustomResource } from \"../../resources/aws/utilities/awsCustomResource\";\nimport { PhysicalResourceId } from \"aws-cdk-lib/custom-resources\";\nimport { Vpc } from \"../../resources/aws/networking/vpc\";\n\ninterface ExistingVpcConfig {\n  vpcId?: string;\n  subnetType?: SubnetType;\n}\n\ninterface NewVpcConfig {\n  subnetType: SubnetType;\n}\n\nexport type VpcProps = ExistingVpcConfig | NewVpcConfig;\n\ninterface Ec2InstanceProps extends StackProps {\n  spotCapacityPercentage?: number;\n  blockDevices?: BlockDevice[];\n  accountId?: string;\n  serviceName: string;\n  vpc: VpcProps;\n  minCapcity?: number;\n  maxCapacity?: number;\n  instanceType: string;\n  machineImage?: IMachineImage;\n  userData?: UserData;\n  role?: Role;\n  enableSSH?: boolean;\n  tags: KeyValue;\n}\n\nexport class Ec2Instance extends Construct implements IConnectable {\n  private launchTemplate: LaunchTemplate;\n  public vpc: IVpc;\n  public asgSecurityGroup: SecurityGroup;\n  private autoScalingGroup: AutoScalingGroup;\n  private keyPair: IKeyPair;\n\n  constructor(scope: Construct, id: string, props: Ec2InstanceProps) {\n    super(scope, id);\n\n    this.addVpc(props);\n    if (props.enableSSH) {\n      this.addKeyPair(props);\n    }\n    this.addLaunchTemplate(props);\n    this.addAutoScalingGroup(props);\n    this.suspendAutoScaling();\n\n    //TODO: Add load balancer as boolean prop, then configure load balancer\n  }\n  connections: Connections;\n\n  addVpc(props: Ec2InstanceProps) {\n    if (\"vpcId\" in props.vpc) {\n      this.vpc = Vpc.fromLookup(this, `${props.serviceName}Vpc`, {\n        vpcId: props.vpc.vpcId\n      });\n    } else {\n      this.vpc = new Vpc(this, `${props.serviceName}Vpc`, {\n        accountId: props.accountId,\n        tags: props.tags,\n        subnetConfiguration: [\n          {\n            name: `${props.serviceName}`,\n            subnetType: props.vpc.subnetType || SubnetType.PRIVATE_WITH_EGRESS\n          }\n        ]\n      });\n    }\n  }\n\n  addKeyPair(props: Ec2InstanceProps) {\n    // TODO: Breakout into a seperate construct for use with better prop handling\n    this.keyPair = new KeyPair(this, \"KeyPair\", {\n      keyPairName: `${props.serviceName}KeyPair`\n    });\n  }\n\n  addLaunchTemplate(props: Ec2InstanceProps) {\n    this.asgSecurityGroup = new SecurityGroup(this, `AsgSecurityGroup`, {\n      vpc: this.vpc,\n      description: `Security group for the ${props.serviceName} auto scaling group`\n    });\n\n    if (props.enableSSH) {\n      this.asgSecurityGroup.addIngressRule(\n        Peer.anyIpv4(),\n        Port.tcp(22),\n        \"Allow SSH\"\n      );\n    }\n\n    this.launchTemplate = new LaunchTemplate(this, \"LaunchTemplate\", {\n      launchTemplateName: `${props.serviceName}LaunchTemplate`,\n      instanceType: new InstanceType(`${props.instanceType}`),\n      machineImage: props.machineImage || MachineImage.latestAmazonLinux2(),\n      userData: props.userData,\n      role: props.role,\n      blockDevices: props?.blockDevices,\n      securityGroup: this.asgSecurityGroup,\n      detailedMonitoring: true,\n      requireImdsv2: true,\n      httpPutResponseHopLimit: 2,\n      httpTokens: LaunchTemplateHttpTokens.REQUIRED,\n      instanceMetadataTags: true,\n      keyPair: this.keyPair\n    });\n  }\n\n  addAutoScalingGroup(props: Ec2InstanceProps) {\n    // TODO: Support spot instances\n    // TODO: Handle terminating EC2 instances when updating, currently hangs.\n    this.autoScalingGroup = new AutoScalingGroup(this, \"AutoScalingGroup\", {\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType: props.enableSSH ? SubnetType.PUBLIC : undefined\n      },\n      minCapacity: props.minCapcity,\n      maxCapacity: props.maxCapacity,\n      launchTemplate: this.launchTemplate,\n      cooldown: Duration.seconds(60),\n      groupMetrics: [GroupMetrics.all()],\n      updatePolicy: UpdatePolicy.replacingUpdate(),\n      newInstancesProtectedFromScaleIn: true,\n      // securityGroup: this.asgSecurityGroup,\n      terminationPolicies: [\n        TerminationPolicy.OLDEST_LAUNCH_CONFIGURATION,\n        TerminationPolicy.CLOSEST_TO_NEXT_INSTANCE_HOUR\n      ],\n      ssmSessionPermissions: true\n    });\n    tagResource(this.autoScalingGroup, props.tags);\n  }\n\n  suspendAutoScaling() {\n    new AwsCustomResource(this, \"SuspendAutoscaling\", {\n      functionName: \"suspendAutoScaling\",\n      onCreate: {\n        service: \"AutoScaling\",\n        action: \"suspendProcesses\",\n        parameters: {\n          AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n          ScalingProcesses: [\"AZRebalance\"]\n        },\n        physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n      },\n      onUpdate: {\n        service: \"AutoScaling\",\n        action: \"suspendProcesses\",\n        parameters: {\n          AutoScalingGroupName: this.autoScalingGroup.autoScalingGroupName,\n          ScalingProcesses: [\"AZRebalance\"]\n        },\n        physicalResourceId: PhysicalResourceId.of(\"suspendAutoScaling\")\n      },\n      resourceType: \"Custom::suspendAutoscaling\"\n    });\n  }\n}\n"]}
|
|
@@ -9,7 +9,6 @@ const ramSharing_1 = require("../../config/aws/ramSharing");
|
|
|
9
9
|
const costAllocationTags_1 = require("../../config/aws/costAllocationTags");
|
|
10
10
|
const organisation_1 = require("../../config/aws/organisation");
|
|
11
11
|
const organisationsAccess_1 = require("../../config/aws/organisationsAccess");
|
|
12
|
-
const util_1 = require("@fjall/util");
|
|
13
12
|
class ManagedOrganisation extends aws_cdk_lib_1.Stack {
|
|
14
13
|
constructor(id, props) {
|
|
15
14
|
super(app_1.default.getInstance(), id, props);
|
|
@@ -36,7 +35,6 @@ class ManagedOrganisation extends aws_cdk_lib_1.Stack {
|
|
|
36
35
|
this.enableTrustedAccess(props);
|
|
37
36
|
this.enableCostAllocationTags(props);
|
|
38
37
|
this.setupIdentityCenter(orgAccounts, props);
|
|
39
|
-
this.updateEnvironmentConfig(props);
|
|
40
38
|
}
|
|
41
39
|
getPlatformAccountId(orgAccounts, props) {
|
|
42
40
|
const platformEntry = Object.entries(props.accounts).find(([key]) => key.toLowerCase() === "platform");
|
|
@@ -79,37 +77,6 @@ class ManagedOrganisation extends aws_cdk_lib_1.Stack {
|
|
|
79
77
|
});
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
|
-
updateEnvironmentConfig(props) {
|
|
83
|
-
try {
|
|
84
|
-
const config = util_1.Config.loadConfig();
|
|
85
|
-
const orgAccounts = this.organisation.getAccounts();
|
|
86
|
-
const providerAccounts = [];
|
|
87
|
-
for (const [environmentType, accountList] of Object.entries(props.accounts)) {
|
|
88
|
-
const accountsArray = Array.isArray(accountList)
|
|
89
|
-
? accountList
|
|
90
|
-
: [accountList];
|
|
91
|
-
for (const accountName of accountsArray) {
|
|
92
|
-
const accountId = orgAccounts[accountName];
|
|
93
|
-
if (accountId) {
|
|
94
|
-
providerAccounts.push({
|
|
95
|
-
id: accountId,
|
|
96
|
-
name: accountName.toLowerCase(),
|
|
97
|
-
environment: environmentType
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
101
|
-
console.warn(`Warning: Account "${accountName}" not found in organisation accounts`);
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
config.rootConfig.providerAccounts = providerAccounts;
|
|
106
|
-
config.saveConfig();
|
|
107
|
-
}
|
|
108
|
-
catch (error) {
|
|
109
|
-
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
110
|
-
console.warn(`Warning: Failed to update fjall-config.json with environment mappings: ${errorMessage}`);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
80
|
}
|
|
114
81
|
exports.ManagedOrganisation = ManagedOrganisation;
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"managedOrganisation.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/managedOrganisation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Environment, Stack, StackProps } from \"aws-cdk-lib\";\n\nimport App from \"../../app\";\n\nimport { IdentityCenter } from \"../../config/aws/identityCenter\";\nimport { IpamDelegateAdmin } from \"../../config/aws/ipamDelegateAdmin\";\nimport { RamSharing } from \"../../config/aws/ramSharing\";\nimport {\n  CostAllocationTags,\n  ICostAllocationTags\n} from \"../../config/aws/costAllocationTags\";\nimport Organisation from \"../../config/aws/organisation\";\nimport { Account } from \"@aws-sdk/client-organizations\";\nimport { ActivateOrganisationsAccess } from \"../../config/aws/organisationsAccess\";\nimport { Config, ProviderAccount } from \"@fjall/util\";\n\ntype ExtendedStackProps = Omit<StackProps, \"env\"> & {\n  env: Required<Pick<Environment, \"region\" | \"account\">> &\n    Partial<Omit<Environment, \"region\" | \"account\">>;\n};\n\ntype AccountsConfig = {\n  readonly [key: string]: readonly string[] | string;\n};\n\ninterface ManagedOrganisationProps extends ExtendedStackProps {\n  organisationName: string;\n  accounts: AccountsConfig;\n  orgEmail: string;\n  existingAccounts?: Account[];\n  costAllocationTags: ICostAllocationTags[];\n  identityCenter?: boolean;\n}\n\nexport class ManagedOrganisation extends Stack {\n  private organisation: Organisation;\n\n  constructor(id: string, props: ManagedOrganisationProps) {\n    super(App.getInstance(), id, props);\n    this.createOrganisation(props);\n    this.setupOrganisationFeatures({\n      ...props,\n      identityCenter: props.identityCenter ?? true\n    });\n  }\n\n  private createOrganisation(props: ManagedOrganisationProps) {\n    this.organisation = new Organisation(this, \"ManagedOrganisation\", {\n      organisationName: props.organisationName,\n      accounts: props.accounts,\n      orgEmail: props.orgEmail,\n      env: props.env,\n      existingAccounts: props.existingAccounts\n    });\n  }\n\n  private setupOrganisationFeatures(props: ManagedOrganisationProps) {\n    const orgAccounts = this.organisation.getAccounts();\n    const platformAccountId = this.getPlatformAccountId(orgAccounts, props);\n\n    this.setupIpamDelegation(platformAccountId);\n    this.enableRamSharing();\n    this.enableTrustedAccess(props);\n    this.enableCostAllocationTags(props);\n    this.setupIdentityCenter(orgAccounts, props);\n    this.updateEnvironmentConfig(props);\n  }\n\n  private getPlatformAccountId(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    const platformEntry = Object.entries(props.accounts).find(\n      ([key]) => key.toLowerCase() === \"platform\"\n    );\n\n    if (!platformEntry) {\n      throw new Error(\n        'No platform account found. Please include a \"platform\" key in your accounts configuration.'\n      );\n    }\n\n    const account = platformEntry[1];\n    const platformAccount = Array.isArray(account) ? account[0] : account;\n\n    const platformAccountId = orgAccounts[platformAccount];\n\n    if (!platformAccountId) {\n      throw new Error(\n        `Platform account ID not found for account name: ${platformAccount}`\n      );\n    }\n\n    return platformAccountId;\n  }\n\n  private setupIpamDelegation(platformAccountId: string) {\n    new IpamDelegateAdmin(this, \"IpamDelegateAdmin\", {\n      accountId: platformAccountId\n    });\n  }\n\n  private enableRamSharing() {\n    new RamSharing(this, \"RamSharing\");\n  }\n\n  private enableTrustedAccess(props: ManagedOrganisationProps) {\n    new ActivateOrganisationsAccess(this, \"ActivateOrganisationsAccess\", {\n      account: props.env.account,\n      region: props.env.region\n    });\n  }\n\n  private enableCostAllocationTags(props: ManagedOrganisationProps) {\n    if (props.costAllocationTags.length > 0) {\n      new CostAllocationTags(this, \"CostAllocationTags\", {\n        costAllocationTags: props.costAllocationTags\n      });\n    }\n  }\n\n  private setupIdentityCenter(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    if (props.identityCenter) {\n      new IdentityCenter(this, \"IdentityCenter\", {\n        accounts: orgAccounts\n      });\n    }\n  }\n\n  private updateEnvironmentConfig(props: ManagedOrganisationProps) {\n    try {\n      const config = Config.loadConfig();\n      const orgAccounts = this.organisation.getAccounts();\n      const providerAccounts: ProviderAccount[] = [];\n\n      for (const [environmentType, accountList] of Object.entries(\n        props.accounts\n      )) {\n        const accountsArray = Array.isArray(accountList)\n          ? accountList\n          : [accountList];\n\n        for (const accountName of accountsArray) {\n          const accountId = orgAccounts[accountName];\n          if (accountId) {\n            providerAccounts.push({\n              id: accountId,\n              name: accountName.toLowerCase(),\n              environment: environmentType\n            });\n          } else {\n            console.warn(\n              `Warning: Account \"${accountName}\" not found in organisation accounts`\n            );\n          }\n        }\n      }\n      config.rootConfig.providerAccounts = providerAccounts;\n      config.saveConfig();\n    } catch (error) {\n      const errorMessage = error instanceof Error ? error.message : String(error);\n      console.warn(\n        `Warning: Failed to update fjall-config.json with environment mappings: ${errorMessage}`\n      );\n    }\n  }\n}\n"]}
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"managedOrganisation.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/managedOrganisation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Environment, Stack, StackProps } from \"aws-cdk-lib\";\n\nimport App from \"../../app\";\n\nimport { IdentityCenter } from \"../../config/aws/identityCenter\";\nimport { IpamDelegateAdmin } from \"../../config/aws/ipamDelegateAdmin\";\nimport { RamSharing } from \"../../config/aws/ramSharing\";\nimport {\n  CostAllocationTags,\n  ICostAllocationTags\n} from \"../../config/aws/costAllocationTags\";\nimport Organisation from \"../../config/aws/organisation\";\nimport { Account } from \"@aws-sdk/client-organizations\";\nimport { ActivateOrganisationsAccess } from \"../../config/aws/organisationsAccess\";\n\ntype ExtendedStackProps = Omit<StackProps, \"env\"> & {\n  env: Required<Pick<Environment, \"region\" | \"account\">> &\n    Partial<Omit<Environment, \"region\" | \"account\">>;\n};\n\ntype AccountsConfig = {\n  readonly [key: string]: readonly string[] | string;\n};\n\ninterface ManagedOrganisationProps extends ExtendedStackProps {\n  organisationName: string;\n  accounts: AccountsConfig;\n  orgEmail: string;\n  existingAccounts?: Account[];\n  costAllocationTags: ICostAllocationTags[];\n  identityCenter?: boolean;\n}\n\nexport class ManagedOrganisation extends Stack {\n  private organisation: Organisation;\n\n  constructor(id: string, props: ManagedOrganisationProps) {\n    super(App.getInstance(), id, props);\n    this.createOrganisation(props);\n    this.setupOrganisationFeatures({\n      ...props,\n      identityCenter: props.identityCenter ?? true\n    });\n  }\n\n  private createOrganisation(props: ManagedOrganisationProps) {\n    this.organisation = new Organisation(this, \"ManagedOrganisation\", {\n      organisationName: props.organisationName,\n      accounts: props.accounts,\n      orgEmail: props.orgEmail,\n      env: props.env,\n      existingAccounts: props.existingAccounts\n    });\n  }\n\n  private setupOrganisationFeatures(props: ManagedOrganisationProps) {\n    const orgAccounts = this.organisation.getAccounts();\n    const platformAccountId = this.getPlatformAccountId(orgAccounts, props);\n\n    this.setupIpamDelegation(platformAccountId);\n    this.enableRamSharing();\n    this.enableTrustedAccess(props);\n    this.enableCostAllocationTags(props);\n    this.setupIdentityCenter(orgAccounts, props);\n  }\n\n  private getPlatformAccountId(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    const platformEntry = Object.entries(props.accounts).find(\n      ([key]) => key.toLowerCase() === \"platform\"\n    );\n\n    if (!platformEntry) {\n      throw new Error(\n        'No platform account found. Please include a \"platform\" key in your accounts configuration.'\n      );\n    }\n\n    const account = platformEntry[1];\n    const platformAccount = Array.isArray(account) ? account[0] : account;\n\n    const platformAccountId = orgAccounts[platformAccount];\n\n    if (!platformAccountId) {\n      throw new Error(\n        `Platform account ID not found for account name: ${platformAccount}`\n      );\n    }\n\n    return platformAccountId;\n  }\n\n  private setupIpamDelegation(platformAccountId: string) {\n    new IpamDelegateAdmin(this, \"IpamDelegateAdmin\", {\n      accountId: platformAccountId\n    });\n  }\n\n  private enableRamSharing() {\n    new RamSharing(this, \"RamSharing\");\n  }\n\n  private enableTrustedAccess(props: ManagedOrganisationProps) {\n    new ActivateOrganisationsAccess(this, \"ActivateOrganisationsAccess\", {\n      account: props.env.account,\n      region: props.env.region\n    });\n  }\n\n  private enableCostAllocationTags(props: ManagedOrganisationProps) {\n    if (props.costAllocationTags.length > 0) {\n      new CostAllocationTags(this, \"CostAllocationTags\", {\n        costAllocationTags: props.costAllocationTags\n      });\n    }\n  }\n\n  private setupIdentityCenter(\n    orgAccounts: Record<string, string>,\n    props: ManagedOrganisationProps\n  ) {\n    if (props.identityCenter) {\n      new IdentityCenter(this, \"IdentityCenter\", {\n        accounts: orgAccounts\n      });\n    }\n  }\n}\n"]}
|
|
@@ -2,13 +2,21 @@ import { Construct } from "constructs";
|
|
|
2
2
|
import App from "../../app";
|
|
3
3
|
import { Secret } from "../../resources/aws/secrets";
|
|
4
4
|
import { Connections, IConnectable, IVpc } from "aws-cdk-lib/aws-ec2";
|
|
5
|
+
import { IInstanceEngine } from "aws-cdk-lib/aws-rds";
|
|
5
6
|
type StorageType = "Aurora" | "Instance" | "FreeTier";
|
|
6
|
-
export
|
|
7
|
+
export type CommonStorageProps = {
|
|
8
|
+
vpc?: IVpc;
|
|
7
9
|
type: StorageType;
|
|
8
10
|
databaseName: string;
|
|
9
|
-
vpc?: IVpc;
|
|
10
11
|
instanceType?: string;
|
|
11
|
-
}
|
|
12
|
+
};
|
|
13
|
+
export type AuroraStorageProps = {} & CommonStorageProps;
|
|
14
|
+
export type InstanceStorageProps = {
|
|
15
|
+
engine?: IInstanceEngine;
|
|
16
|
+
allocatedStorage?: number;
|
|
17
|
+
port?: number;
|
|
18
|
+
} & CommonStorageProps;
|
|
19
|
+
export type IStorageProps = AuroraStorageProps | InstanceStorageProps;
|
|
12
20
|
export declare class StorageFactory {
|
|
13
21
|
static build(id: string, props: IStorageProps): (app: App, scope: Construct) => Storage;
|
|
14
22
|
}
|
|
@@ -36,10 +36,16 @@ class Storage extends constructs_1.Construct {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
else if (props.type === "Instance") {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
const iProps = props;
|
|
40
|
+
this.database = new database_1.RdsInstance(this, `${iProps.databaseName}Rds`, {
|
|
41
|
+
// Common props
|
|
42
|
+
vpc: iProps.vpc,
|
|
43
|
+
databaseName: iProps.databaseName,
|
|
44
|
+
instanceType: iProps.instanceType,
|
|
45
|
+
// Instance specific props
|
|
46
|
+
allocatedStorage: iProps.allocatedStorage,
|
|
47
|
+
port: iProps.port,
|
|
48
|
+
engine: iProps.engine
|
|
43
49
|
});
|
|
44
50
|
}
|
|
45
51
|
else if (props.type === "FreeTier") {
|
|
@@ -67,4 +73,4 @@ class Storage extends constructs_1.Construct {
|
|
|
67
73
|
}
|
|
68
74
|
}
|
|
69
75
|
exports.Storage = Storage;
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2xpYi9wYXR0ZXJucy9hd3Mvc3RvcmFnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBdUM7QUFHdkMsMkRBSXNDO0FBeUJ0QyxNQUFhLGNBQWM7SUFDekIsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFVLEVBQUUsS0FBb0I7UUFDM0MsT0FBTyxDQUFDLEdBQVEsRUFBRSxLQUFnQixFQUFFLEVBQUU7WUFDcEMsTUFBTSxZQUFZLEdBQUc7Z0JBQ25CLEdBQUc7b0JBQ0QsR0FBRyxFQUFFLEtBQUssQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLGFBQWEsRUFBRTtpQkFDdEM7Z0JBQ0QsR0FBRyxLQUFLO2FBQ1QsQ0FBQztZQUNGLE9BQU8sSUFBSSxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUM5QyxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFaRCx3Q0FZQztBQUVELE1BQWEsT0FBUSxTQUFRLHNCQUFTO0lBVXBDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNiLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBRW5CLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQztRQUN2QyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxVQUFVLENBQUMsS0FBb0I7UUFDN0IsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQzVCLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO1lBQ3pELENBQUM7WUFDRCxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksb0JBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxLQUFLLENBQUMsWUFBWSxLQUFLLEVBQUU7Z0JBQzlELEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRztnQkFDZCxZQUFZLEVBQUUsS0FBSyxDQUFDLFlBQVk7YUFDakMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQzthQUFNLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNyQyxNQUFNLE1BQU0sR0FBRyxLQUE2QixDQUFDO1lBRTdDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxzQkFBVyxDQUFDLElBQUksRUFBRSxHQUFHLE1BQU0sQ0FBQyxZQUFZLEtBQUssRUFBRTtnQkFDakUsZUFBZTtnQkFDZixHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUc7Z0JBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQyxZQUFZO2dCQUNqQyxZQUFZLEVBQUUsTUFBTSxDQUFDLFlBQVk7Z0JBQ2pDLDBCQUEwQjtnQkFDMUIsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDLGdCQUFnQjtnQkFDekMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJO2dCQUNqQixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07YUFDdEIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQzthQUFNLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUNyQyxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksc0JBQVcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxLQUFLLENBQUMsWUFBWSxLQUFLLEVBQUU7Z0JBQ2hFLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRztnQkFDZCxZQUFZLEVBQUUsS0FBSyxDQUFDLFlBQVk7YUFDakMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7UUFDM0MsQ0FBQztRQUVELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUM7SUFDL0MsQ0FBQztJQUVELGNBQWM7UUFDWixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsY0FBYyxFQUFFLENBQUM7SUFDeEMsQ0FBQztJQUVELGVBQWU7UUFDYixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekMsQ0FBQztJQUVELFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDckMsQ0FBQztJQUVELGVBQWU7UUFDYixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztDQUNGO0FBcEVELDBCQW9FQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG5pbXBvcnQgQXBwIGZyb20gXCIuLi8uLi9hcHBcIjtcbmltcG9ydCB7XG4gIFJkc0F1cm9yYSxcbiAgUmRzRnJlZVRpZXIsXG4gIFJkc0luc3RhbmNlXG59IGZyb20gXCIuLi8uLi9yZXNvdXJjZXMvYXdzL2RhdGFiYXNlXCI7XG5pbXBvcnQgeyBTZWNyZXQgfSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy9zZWNyZXRzXCI7XG5cbmltcG9ydCB7IENvbm5lY3Rpb25zLCBJQ29ubmVjdGFibGUsIElWcGMgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWVjMlwiO1xuaW1wb3J0IHsgSUluc3RhbmNlRW5naW5lIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1yZHNcIjtcblxudHlwZSBTdG9yYWdlVHlwZSA9IFwiQXVyb3JhXCIgfCBcIkluc3RhbmNlXCIgfCBcIkZyZWVUaWVyXCI7XG5cbmV4cG9ydCB0eXBlIENvbW1vblN0b3JhZ2VQcm9wcyA9IHtcbiAgdnBjPzogSVZwYztcbiAgdHlwZTogU3RvcmFnZVR5cGU7XG4gIGRhdGFiYXNlTmFtZTogc3RyaW5nO1xuICBpbnN0YW5jZVR5cGU/OiBzdHJpbmc7XG59O1xuXG5leHBvcnQgdHlwZSBBdXJvcmFTdG9yYWdlUHJvcHMgPSB7fSAmIENvbW1vblN0b3JhZ2VQcm9wcztcblxuZXhwb3J0IHR5cGUgSW5zdGFuY2VTdG9yYWdlUHJvcHMgPSB7XG4gIGVuZ2luZT86IElJbnN0YW5jZUVuZ2luZTtcbiAgYWxsb2NhdGVkU3RvcmFnZT86IG51bWJlcjtcbiAgcG9ydD86IG51bWJlcjtcbn0gJiBDb21tb25TdG9yYWdlUHJvcHM7XG5cbmV4cG9ydCB0eXBlIElTdG9yYWdlUHJvcHMgPSBBdXJvcmFTdG9yYWdlUHJvcHMgfCBJbnN0YW5jZVN0b3JhZ2VQcm9wcztcblxuZXhwb3J0IGNsYXNzIFN0b3JhZ2VGYWN0b3J5IHtcbiAgc3RhdGljIGJ1aWxkKGlkOiBzdHJpbmcsIHByb3BzOiBJU3RvcmFnZVByb3BzKSB7XG4gICAgcmV0dXJuIChhcHA6IEFwcCwgc2NvcGU6IENvbnN0cnVjdCkgPT4ge1xuICAgICAgY29uc3Qgc3RvcmFnZVByb3BzID0ge1xuICAgICAgICAuLi57XG4gICAgICAgICAgdnBjOiBwcm9wcy52cGMgfHwgYXBwLmdldERlZmF1bHRWcGMoKVxuICAgICAgICB9LFxuICAgICAgICAuLi5wcm9wc1xuICAgICAgfTtcbiAgICAgIHJldHVybiBuZXcgU3RvcmFnZShzY29wZSwgaWQsIHN0b3JhZ2VQcm9wcyk7XG4gICAgfTtcbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgU3RvcmFnZSBleHRlbmRzIENvbnN0cnVjdCBpbXBsZW1lbnRzIElDb25uZWN0YWJsZSB7XG4gIHB1YmxpYyBpZDogc3RyaW5nO1xuICBwdWJsaWMgc2NvcGU6IENvbnN0cnVjdDtcbiAgcHVibGljIHZwYzogSVZwYztcblxuICBwdWJsaWMgY29ubmVjdGlvbnM6IENvbm5lY3Rpb25zO1xuXG4gIHByaXZhdGUgZGF0YWJhc2VOYW1lOiBzdHJpbmc7XG4gIHByaXZhdGUgZGF0YWJhc2U6IFJkc0F1cm9yYSB8IFJkc0luc3RhbmNlIHwgUmRzRnJlZVRpZXI7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IElTdG9yYWdlUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIHRoaXMuaWQgPSBpZDtcbiAgICB0aGlzLnNjb3BlID0gc2NvcGU7XG5cbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZTtcbiAgICB0aGlzLmFkZFN0b3JhZ2UocHJvcHMpO1xuICB9XG5cbiAgYWRkU3RvcmFnZShwcm9wczogSVN0b3JhZ2VQcm9wcykge1xuICAgIGlmIChwcm9wcy50eXBlID09PSBcIkF1cm9yYVwiKSB7XG4gICAgICBpZiAoIXByb3BzLnZwYykge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoXCJWUEMgaXMgcmVxdWlyZWQgZm9yIEF1cm9yYSBkYXRhYmFzZVwiKTtcbiAgICAgIH1cbiAgICAgIHRoaXMuZGF0YWJhc2UgPSBuZXcgUmRzQXVyb3JhKHRoaXMsIGAke3Byb3BzLmRhdGFiYXNlTmFtZX1SZHNgLCB7XG4gICAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgICBkYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlTmFtZVxuICAgICAgfSk7XG4gICAgfSBlbHNlIGlmIChwcm9wcy50eXBlID09PSBcIkluc3RhbmNlXCIpIHtcbiAgICAgIGNvbnN0IGlQcm9wcyA9IHByb3BzIGFzIEluc3RhbmNlU3RvcmFnZVByb3BzO1xuXG4gICAgICB0aGlzLmRhdGFiYXNlID0gbmV3IFJkc0luc3RhbmNlKHRoaXMsIGAke2lQcm9wcy5kYXRhYmFzZU5hbWV9UmRzYCwge1xuICAgICAgICAvLyBDb21tb24gcHJvcHNcbiAgICAgICAgdnBjOiBpUHJvcHMudnBjLFxuICAgICAgICBkYXRhYmFzZU5hbWU6IGlQcm9wcy5kYXRhYmFzZU5hbWUsXG4gICAgICAgIGluc3RhbmNlVHlwZTogaVByb3BzLmluc3RhbmNlVHlwZSxcbiAgICAgICAgLy8gSW5zdGFuY2Ugc3BlY2lmaWMgcHJvcHNcbiAgICAgICAgYWxsb2NhdGVkU3RvcmFnZTogaVByb3BzLmFsbG9jYXRlZFN0b3JhZ2UsXG4gICAgICAgIHBvcnQ6IGlQcm9wcy5wb3J0LFxuICAgICAgICBlbmdpbmU6IGlQcm9wcy5lbmdpbmVcbiAgICAgIH0pO1xuICAgIH0gZWxzZSBpZiAocHJvcHMudHlwZSA9PT0gXCJGcmVlVGllclwiKSB7XG4gICAgICB0aGlzLmRhdGFiYXNlID0gbmV3IFJkc0ZyZWVUaWVyKHRoaXMsIGAke3Byb3BzLmRhdGFiYXNlTmFtZX1SZHNgLCB7XG4gICAgICAgIHZwYzogcHJvcHMudnBjLFxuICAgICAgICBkYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlTmFtZVxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcIkludmFsaWQgZGF0YWJhc2UgdHlwZVwiKTtcbiAgICB9XG5cbiAgICB0aGlzLmNvbm5lY3Rpb25zID0gdGhpcy5kYXRhYmFzZS5jb25uZWN0aW9ucztcbiAgfVxuXG4gIGdldENyZWRlbnRpYWxzKCk6IFNlY3JldCB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2UuZ2V0Q3JlZGVudGlhbHMoKTtcbiAgfVxuXG4gIGdldEhvc3RFbmRwb2ludCgpOiBzdHJpbmcge1xuICAgIHJldHVybiB0aGlzLmRhdGFiYXNlLmdldEhvc3RFbmRwb2ludCgpO1xuICB9XG5cbiAgZ2V0SG9zdFBvcnQoKTogc3RyaW5nIHtcbiAgICByZXR1cm4gdGhpcy5kYXRhYmFzZS5nZXRIb3N0UG9ydCgpO1xuICB9XG5cbiAgZ2V0RGF0YWJhc2VOYW1lKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuZGF0YWJhc2VOYW1lO1xuICB9XG59XG4iXX0=
|
|
@@ -66,7 +66,7 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
66
66
|
securityGroups: [this.databaseSecurityGroup],
|
|
67
67
|
engine: props.engine ||
|
|
68
68
|
aws_rds_1.DatabaseInstanceEngine.postgres({
|
|
69
|
-
version: aws_rds_1.PostgresEngineVersion.
|
|
69
|
+
version: aws_rds_1.PostgresEngineVersion.VER_17_5
|
|
70
70
|
}),
|
|
71
71
|
allocatedStorage: props.allocatedStorage,
|
|
72
72
|
backupRetention: props.backupRetention || aws_cdk_lib_1.Duration.days(14),
|
|
@@ -188,4 +188,4 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
exports.RdsInstance = RdsInstance;
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsInstance.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsInstance.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  InstanceClass,\n  InstanceSize,\n  InstanceType,\n  IVpc,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceEngine,\n  DatabaseInstanceReadReplica,\n  DatabaseProxy,\n  IInstanceEngine,\n  PostgresEngineVersion,\n  ProxyTarget,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport {\n  SecretRotation,\n  SecretRotationApplication\n} from \"aws-cdk-lib/aws-secretsmanager\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\nimport { StackBuilder } from \"../base/awsStack\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface RdsProps {\n  vpc?: IVpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  instanceType?: string;\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  securityGroupIds?: string[];\n}\n\nexport class RdsInstance extends Construct implements IConnectable {\n  public connections: Connections;\n  public databaseSecurityGroup: SecurityGroup;\n  public vpc: IVpc;\n\n  private port: number;\n  private databaseCredentials: Secret;\n  private encryptionKey: CustomerManagedKey;\n  private databasePerformanceInsightsKey: CustomerManagedKey;\n  private database: DatabaseInstance;\n  private masterSecret: Secret;\n  private databaseProxy: DatabaseProxy;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n\n    this.port = props.port || 5432;\n\n    this.addVpc(props);\n    this.addDatabase(props);\n    this.rotateSecret(props);\n\n    if (props.databaseProxy) {\n      this.addProxy(props);\n    }\n\n    if (props.readReplica) {\n      this.addReadReplica(props);\n    }\n  }\n\n  addVpc(props: RdsProps) {\n    this.vpc = props.vpc\n      ? props.vpc\n      : new Vpc(this, `${props.databaseName}Vpc`, {});\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      }\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      }\n    );\n\n    if (props.enablePerformanceInsights) {\n      this.databasePerformanceInsightsKey = new CustomerManagedKey(\n        this,\n        `${props.databaseName}PerformanceInsightsKey`,\n        {\n          aliasName: `cmk/rds/${props.databaseName}/InsightsKey`\n        }\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    //TODO: Remove this line, that allows the proxy to connect to the database. Replace with seperated security groups\n    this.databaseSecurityGroup.addIngressRule(\n      this.databaseSecurityGroup,\n      Port.tcp(5432)\n    );\n\n    this.connections = this.databaseSecurityGroup.connections;\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        enablePerformanceInsights: props.enablePerformanceInsights,\n        performanceInsightEncryptionKey: props.enablePerformanceInsights\n          ? this.databasePerformanceInsightsKey.key\n          : undefined,\n        databaseName: props.databaseName,\n        instanceIdentifier: props.databaseName,\n        instanceType: props.instanceType\n          ? new InstanceType(props.instanceType)\n          : new InstanceType(\"r6g.large\"),\n        maxAllocatedStorage: props.maxAllocatedStorage || 500,\n        monitoringInterval: props.monitoringInterval || Duration.minutes(1),\n        multiAz: true,\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  }\n\n  rotateSecret(props: RdsProps) {\n    // Rotate the Secret every 30 days\n    this.masterSecret = new Secret(this, `${props.databaseName}MasterSecret`, {\n      secretName: `${props.databaseName}MasterSecret`\n    });\n\n    new SecretRotation(this, `${props.databaseName}SecretRotation`, {\n      application: new SecretRotationApplication(\n        \"SecretsManagerRDSPostgreSQLRotationMultiUser\",\n        \"1.1.367\",\n        {\n          isMultiUser: true\n        }\n      ),\n      secret: this.databaseCredentials.secret,\n      masterSecret: this.masterSecret.secret,\n      target: this.database,\n      vpc: this.database.vpc\n    });\n  }\n\n  addProxy(props: RdsProps) {\n    this.databaseProxy = new DatabaseProxy(\n      this,\n      `${props.databaseName}DatabaseProxy`,\n      {\n        proxyTarget: ProxyTarget.fromInstance(this.database),\n        secrets: [this.databaseCredentials.secret],\n        // TODO: Create a new security group, and remove the line that allows the proxy to connect to the database\n        securityGroups: [this.databaseSecurityGroup],\n        vpc: this.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PUBLIC\n        }\n      }\n    );\n\n    new CfnOutput(this, `${props.databaseName}ProxyEndpointOutput`, {\n      key: `${props.databaseName}ProxyEndpoint`,\n      exportName: `${props.databaseName}ProxyEndpoint`,\n      value: this.databaseProxy.endpoint\n    });\n  }\n\n  addReadReplica(props: RdsProps) {\n    const readReplicaPerformanceInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ReadReplicaReaderInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/ReadReplicaInsightsKey`\n      }\n    );\n\n    new DatabaseInstanceReadReplica(this, `${props.databaseName}ReadReplica`, {\n      sourceDatabaseInstance: this.database,\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType: SubnetType.PRIVATE_WITH_EGRESS\n      },\n      securityGroups: [this.databaseSecurityGroup],\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      enablePerformanceInsights: props.enablePerformanceInsights,\n      performanceInsightEncryptionKey: props.enablePerformanceInsights\n        ? readReplicaPerformanceInsightsKey.key\n        : undefined,\n      instanceIdentifier: `${props.databaseName}`,\n      instanceType: props.instanceType\n        ? new InstanceType(props.instanceType)\n        : new InstanceType(\"r6g.large\"),\n      maxAllocatedStorage: props.maxAllocatedStorage || 500,\n      monitoringInterval: props.monitoringInterval || Duration.minutes(1),\n      multiAz: true,\n      port: props.port,\n      preferredMaintenanceWindow:\n        props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\"\n    });\n  }\n\n  getHostEndpoint() {\n    if (this.databaseProxy) {\n      return this.databaseProxy.endpoint;\n    } else {\n      return this.database.dbInstanceEndpointAddress;\n    }\n  }\n\n  getHostPort(): string {\n    return String(this.port);\n  }\n\n  getCredentials(): Secret {\n    return this.databaseCredentials;\n  }\n\n  static build(id: string, props: RdsProps): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      const newProps: RdsProps = {\n        ...props,\n        ...{\n          vpc: (sb.getNetwork() as Vpc) || props?.vpc,\n          securityGroupIds: props?.securityGroupIds ?? [],\n          databaseName: props.databaseName || `${id.replace(\"Rds\", \"\")}`\n        }\n      };\n\n      return new this(sb.getStack(), id, newProps);\n    };\n  }\n}\n"]}
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsInstance.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsInstance.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  InstanceClass,\n  InstanceSize,\n  InstanceType,\n  IVpc,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceEngine,\n  DatabaseInstanceReadReplica,\n  DatabaseProxy,\n  IInstanceEngine,\n  PostgresEngineVersion,\n  ProxyTarget,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport {\n  SecretRotation,\n  SecretRotationApplication\n} from \"aws-cdk-lib/aws-secretsmanager\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\nimport { StackBuilder } from \"../base/awsStack\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface RdsProps {\n  vpc?: IVpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  instanceType?: string;\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  securityGroupIds?: string[];\n}\n\nexport class RdsInstance extends Construct implements IConnectable {\n  public connections: Connections;\n  public databaseSecurityGroup: SecurityGroup;\n  public vpc: IVpc;\n\n  private port: number;\n  private databaseCredentials: Secret;\n  private encryptionKey: CustomerManagedKey;\n  private databasePerformanceInsightsKey: CustomerManagedKey;\n  private database: DatabaseInstance;\n  private masterSecret: Secret;\n  private databaseProxy: DatabaseProxy;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n\n    this.port = props.port || 5432;\n\n    this.addVpc(props);\n    this.addDatabase(props);\n    this.rotateSecret(props);\n\n    if (props.databaseProxy) {\n      this.addProxy(props);\n    }\n\n    if (props.readReplica) {\n      this.addReadReplica(props);\n    }\n  }\n\n  addVpc(props: RdsProps) {\n    this.vpc = props.vpc\n      ? props.vpc\n      : new Vpc(this, `${props.databaseName}Vpc`, {});\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      }\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      }\n    );\n\n    if (props.enablePerformanceInsights) {\n      this.databasePerformanceInsightsKey = new CustomerManagedKey(\n        this,\n        `${props.databaseName}PerformanceInsightsKey`,\n        {\n          aliasName: `cmk/rds/${props.databaseName}/InsightsKey`\n        }\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    //TODO: Remove this line, that allows the proxy to connect to the database. Replace with seperated security groups\n    this.databaseSecurityGroup.addIngressRule(\n      this.databaseSecurityGroup,\n      Port.tcp(5432)\n    );\n\n    this.connections = this.databaseSecurityGroup.connections;\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_17_5\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        enablePerformanceInsights: props.enablePerformanceInsights,\n        performanceInsightEncryptionKey: props.enablePerformanceInsights\n          ? this.databasePerformanceInsightsKey.key\n          : undefined,\n        databaseName: props.databaseName,\n        instanceIdentifier: props.databaseName,\n        instanceType: props.instanceType\n          ? new InstanceType(props.instanceType)\n          : new InstanceType(\"r6g.large\"),\n        maxAllocatedStorage: props.maxAllocatedStorage || 500,\n        monitoringInterval: props.monitoringInterval || Duration.minutes(1),\n        multiAz: true,\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  }\n\n  rotateSecret(props: RdsProps) {\n    // Rotate the Secret every 30 days\n    this.masterSecret = new Secret(this, `${props.databaseName}MasterSecret`, {\n      secretName: `${props.databaseName}MasterSecret`\n    });\n\n    new SecretRotation(this, `${props.databaseName}SecretRotation`, {\n      application: new SecretRotationApplication(\n        \"SecretsManagerRDSPostgreSQLRotationMultiUser\",\n        \"1.1.367\",\n        {\n          isMultiUser: true\n        }\n      ),\n      secret: this.databaseCredentials.secret,\n      masterSecret: this.masterSecret.secret,\n      target: this.database,\n      vpc: this.database.vpc\n    });\n  }\n\n  addProxy(props: RdsProps) {\n    this.databaseProxy = new DatabaseProxy(\n      this,\n      `${props.databaseName}DatabaseProxy`,\n      {\n        proxyTarget: ProxyTarget.fromInstance(this.database),\n        secrets: [this.databaseCredentials.secret],\n        // TODO: Create a new security group, and remove the line that allows the proxy to connect to the database\n        securityGroups: [this.databaseSecurityGroup],\n        vpc: this.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PUBLIC\n        }\n      }\n    );\n\n    new CfnOutput(this, `${props.databaseName}ProxyEndpointOutput`, {\n      key: `${props.databaseName}ProxyEndpoint`,\n      exportName: `${props.databaseName}ProxyEndpoint`,\n      value: this.databaseProxy.endpoint\n    });\n  }\n\n  addReadReplica(props: RdsProps) {\n    const readReplicaPerformanceInsightsKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ReadReplicaReaderInsightsKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/ReadReplicaInsightsKey`\n      }\n    );\n\n    new DatabaseInstanceReadReplica(this, `${props.databaseName}ReadReplica`, {\n      sourceDatabaseInstance: this.database,\n      vpc: this.vpc,\n      vpcSubnets: {\n        subnetType: SubnetType.PRIVATE_WITH_EGRESS\n      },\n      securityGroups: [this.databaseSecurityGroup],\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      enablePerformanceInsights: props.enablePerformanceInsights,\n      performanceInsightEncryptionKey: props.enablePerformanceInsights\n        ? readReplicaPerformanceInsightsKey.key\n        : undefined,\n      instanceIdentifier: `${props.databaseName}`,\n      instanceType: props.instanceType\n        ? new InstanceType(props.instanceType)\n        : new InstanceType(\"r6g.large\"),\n      maxAllocatedStorage: props.maxAllocatedStorage || 500,\n      monitoringInterval: props.monitoringInterval || Duration.minutes(1),\n      multiAz: true,\n      port: props.port,\n      preferredMaintenanceWindow:\n        props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\"\n    });\n  }\n\n  getHostEndpoint() {\n    if (this.databaseProxy) {\n      return this.databaseProxy.endpoint;\n    } else {\n      return this.database.dbInstanceEndpointAddress;\n    }\n  }\n\n  getHostPort(): string {\n    return String(this.port);\n  }\n\n  getCredentials(): Secret {\n    return this.databaseCredentials;\n  }\n\n  static build(id: string, props: RdsProps): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      const newProps: RdsProps = {\n        ...props,\n        ...{\n          vpc: (sb.getNetwork() as Vpc) || props?.vpc,\n          securityGroupIds: props?.securityGroupIds ?? [],\n          databaseName: props.databaseName || `${id.replace(\"Rds\", \"\")}`\n        }\n      };\n\n      return new this(sb.getStack(), id, newProps);\n    };\n  }\n}\n"]}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const fs = require("fs");
|
|
4
|
+
class CidrBlock {
|
|
5
|
+
constructor() {
|
|
6
|
+
this.configFile = "../cidr-config.json";
|
|
7
|
+
// Import config, or create it if it doesn't exist
|
|
8
|
+
if (fs.existsSync(this.configFile)) {
|
|
9
|
+
const configString = fs.readFileSync(this.configFile, "utf-8");
|
|
10
|
+
this.cidrBlock = JSON.parse(configString);
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
this.cidrBlock = {};
|
|
14
|
+
for (let i = 1; i <= 255; i++) {
|
|
15
|
+
this.cidrBlock[`${i}.0.0.0/8`] = true;
|
|
16
|
+
}
|
|
17
|
+
const configString = JSON.stringify(this.cidrBlock, null, 2);
|
|
18
|
+
fs.writeFileSync(this.configFile, configString);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
writeState() {
|
|
22
|
+
// JSON-ify config and write to file
|
|
23
|
+
const configString = JSON.stringify(this.cidrBlock, null, 2);
|
|
24
|
+
fs.writeFileSync(this.configFile, configString);
|
|
25
|
+
}
|
|
26
|
+
getCidrBlock() {
|
|
27
|
+
for (const key in this.cidrBlock) {
|
|
28
|
+
if (this.cidrBlock[key]) {
|
|
29
|
+
return key;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return "0.0.0.0/8";
|
|
33
|
+
}
|
|
34
|
+
updateState(cidrBlock, status) {
|
|
35
|
+
this.cidrBlock[cidrBlock] = status;
|
|
36
|
+
this.writeState();
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
exports.default = CidrBlock;
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q2lkci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy9nZXRDaWRyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUJBQXlCO0FBTXpCLE1BQXFCLFNBQVM7SUFJNUI7UUFGUSxlQUFVLEdBQUcscUJBQXFCLENBQUM7UUFHekMsa0RBQWtEO1FBQ2xELElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUNuQyxNQUFNLFlBQVksR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDL0QsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzVDLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7WUFDcEIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUM5QixJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUM7WUFDeEMsQ0FBQztZQUNELE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDN0QsRUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ2xELENBQUM7SUFDSCxDQUFDO0lBRUQsVUFBVTtRQUNSLG9DQUFvQztRQUNwQyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQzdELEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsWUFBWTtRQUNWLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2pDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUN4QixPQUFPLEdBQUcsQ0FBQztZQUNiLENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxXQUFXLENBQUM7SUFDckIsQ0FBQztJQUVELFdBQVcsQ0FBQyxTQUFpQixFQUFFLE1BQWU7UUFDNUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsR0FBRyxNQUFNLENBQUM7UUFDbkMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO0lBQ3BCLENBQUM7Q0FDRjtBQXRDRCw0QkFzQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBmcyBmcm9tIFwiZnNcIjtcblxuaW50ZXJmYWNlIGNpZHJUYWJsZSB7XG4gIFtrZXk6IHN0cmluZ106IGJvb2xlYW47XG59XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENpZHJCbG9jayB7XG4gIHByaXZhdGUgY2lkckJsb2NrOiBjaWRyVGFibGU7XG4gIHByaXZhdGUgY29uZmlnRmlsZSA9IFwiLi4vY2lkci1jb25maWcuanNvblwiO1xuXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIC8vIEltcG9ydCBjb25maWcsIG9yIGNyZWF0ZSBpdCBpZiBpdCBkb2Vzbid0IGV4aXN0XG4gICAgaWYgKGZzLmV4aXN0c1N5bmModGhpcy5jb25maWdGaWxlKSkge1xuICAgICAgY29uc3QgY29uZmlnU3RyaW5nID0gZnMucmVhZEZpbGVTeW5jKHRoaXMuY29uZmlnRmlsZSwgXCJ1dGYtOFwiKTtcbiAgICAgIHRoaXMuY2lkckJsb2NrID0gSlNPTi5wYXJzZShjb25maWdTdHJpbmcpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aGlzLmNpZHJCbG9jayA9IHt9O1xuICAgICAgZm9yIChsZXQgaSA9IDE7IGkgPD0gMjU1OyBpKyspIHtcbiAgICAgICAgdGhpcy5jaWRyQmxvY2tbYCR7aX0uMC4wLjAvOGBdID0gdHJ1ZTtcbiAgICAgIH1cbiAgICAgIGNvbnN0IGNvbmZpZ1N0cmluZyA9IEpTT04uc3RyaW5naWZ5KHRoaXMuY2lkckJsb2NrLCBudWxsLCAyKTtcbiAgICAgIGZzLndyaXRlRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBjb25maWdTdHJpbmcpO1xuICAgIH1cbiAgfVxuXG4gIHdyaXRlU3RhdGUoKSB7XG4gICAgLy8gSlNPTi1pZnkgY29uZmlnIGFuZCB3cml0ZSB0byBmaWxlXG4gICAgY29uc3QgY29uZmlnU3RyaW5nID0gSlNPTi5zdHJpbmdpZnkodGhpcy5jaWRyQmxvY2ssIG51bGwsIDIpO1xuICAgIGZzLndyaXRlRmlsZVN5bmModGhpcy5jb25maWdGaWxlLCBjb25maWdTdHJpbmcpO1xuICB9XG5cbiAgZ2V0Q2lkckJsb2NrKCkge1xuICAgIGZvciAoY29uc3Qga2V5IGluIHRoaXMuY2lkckJsb2NrKSB7XG4gICAgICBpZiAodGhpcy5jaWRyQmxvY2tba2V5XSkge1xuICAgICAgICByZXR1cm4ga2V5O1xuICAgICAgfVxuICAgIH1cbiAgICByZXR1cm4gXCIwLjAuMC4wLzhcIjtcbiAgfVxuXG4gIHVwZGF0ZVN0YXRlKGNpZHJCbG9jazogc3RyaW5nLCBzdGF0dXM6IGJvb2xlYW4pIHtcbiAgICB0aGlzLmNpZHJCbG9ja1tjaWRyQmxvY2tdID0gc3RhdHVzO1xuICAgIHRoaXMud3JpdGVTdGF0ZSgpO1xuICB9XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.71.0",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@aws-sdk/client-organizations": "^3.716.0",
|
|
38
|
-
"@fjall/util": "^0.
|
|
38
|
+
"@fjall/util": "^0.71.0",
|
|
39
39
|
"@pepperize/cdk-organizations": "^0.7.135",
|
|
40
40
|
"cdk-time-sleep": "^1.0.0",
|
|
41
41
|
"constructs": "^10.0.0",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"overrides": {
|
|
45
45
|
"@smithy/core": "2.5.5"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "f28dc46ee9861f333f120bd719a675f6a5365d82",
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"aws-cdk": "^2.206.0",
|
|
50
50
|
"aws-cdk-lib": "^2.206.0",
|