@fjall/components-infrastructure 0.73.16 → 0.73.17
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/resources/aws/database/rdsAuroraGlobal.js +3 -3
- 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/backup/backupPlan.d.ts +0 -24
- package/dist/lib/resources/aws/backup/backupPlan.js +0 -172
- package/dist/lib/resources/aws/backup/backupVault.d.ts +0 -19
- package/dist/lib/resources/aws/backup/backupVault.js +0 -44
- package/dist/lib/resources/aws/backup/index.d.ts +0 -2
- package/dist/lib/resources/aws/backup/index.js +0 -19
- 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"]}
|
|
@@ -115,8 +115,8 @@ class RdsAuroraGlobal extends constructs_1.Construct {
|
|
|
115
115
|
});
|
|
116
116
|
// set the L1 DBCluster property so CloudFormation will join it to the global cluster
|
|
117
117
|
if (this.regionalCluster) {
|
|
118
|
-
const regionalL1 = this.regionalCluster.
|
|
119
|
-
.
|
|
118
|
+
const regionalL1 = this.regionalCluster.getCfnCluster &&
|
|
119
|
+
this.regionalCluster.getCfnCluster();
|
|
120
120
|
if (regionalL1) {
|
|
121
121
|
regionalL1.globalClusterIdentifier = this.globalId;
|
|
122
122
|
}
|
|
@@ -153,4 +153,4 @@ class RdsAuroraGlobal extends constructs_1.Construct {
|
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
155
|
exports.RdsAuroraGlobal = RdsAuroraGlobal;
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAuroraGlobal.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAuroraGlobal.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAC/C,iDAAqE;AACrE,2CAAuC;AAGvC,2CAAwC;AAcxC,MAAa,eAAgB,SAAQ,sBAAS;IAU5C,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA2B;QACnE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,aAAa,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;QAC3C,uFAAuF;QACvF,IAAI,CAAC,QAAQ;YACX,KAAK,CAAC,uBAAuB,EAAE,WAAW,EAAE;gBAC5C,GAAG,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,SAAS,CAAC;QAE/C,uDAAuD;QACvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,yBAAyB;IACzB,0BAA0B;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,2BAA2B;QACzB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACpE,CAAC;IAEO,4BAA4B;QAClC,kFAAkF;QAClF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO,mBAAmB,CAAC;QAEnD,MAAM,SAAS,GAAQ,IAAI,CAAC,KAAK,CAAC,MAAa,CAAC;QAEhD,iDAAiD;QACjD,IAAI,UAAU,GACZ,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,CAAC;QAE7D,uEAAuE;QACvE,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACjC,CAAC;QAED,gDAAgD;QAChD,IAAI,CAAC,UAAU,IAAI,OAAO,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YAC5D,IAAI,CAAC;gBACH,UAAU,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,UAAU,GAAG,SAAS,CAAC;YACzB,CAAC;QACH,CAAC;QAED,IAAI,OAAO,UAAU,KAAK,QAAQ;YAAE,OAAO,mBAAmB,CAAC;QAE/D,yGAAyG;QACzG,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAE/D,sFAAsF;QACtF,IAAI,UAAU,KAAK,QAAQ;YAAE,OAAO,mBAAmB,CAAC;QAExD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,yDAAyD;IACzD,gBAAgB;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa;YAAE,OAAO;QAE5D,gFAAgF;QAChF,4EAA4E;QAC5E,6DAA6D;QAC7D,IAAI,gBAAgB,GAAQ,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAC/D,IAAI,SAAmC,CAAC;QAExC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,gFAAgF;YAChF,oFAAoF;YACpF,SAAS;gBACP,IAAI,CAAC,cAAc,CAAC,aAAa;oBACjC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;YACtC,IAAI,SAAS,EAAE,CAAC;gBACd,gBAAgB,GAAG,SAAS,CAAC,GAAG,CAAC;YACnC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,0BAAgB,CACvC,IAAI,EACJ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,eAAe,EACzC;YACE,uBAAuB,EAAE,IAAI,CAAC,QAAQ;YACtC,yBAAyB,EAAE,gBAAgB;SAC5C,CACF,CAAC;QAEF,iFAAiF;QACjF,IAAI,SAAS,EAAE,CAAC;YACd,wFAAwF;YACxF,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC3C,gFAAgF;YAChF,kFAAkF;YAClF,4EAA4E;YAC5E,oEAAoE;YACpE,uEAAuE;YACvE,kEAAkE;YAClE,oEAAoE;YACpE,4DAA4D;YAC5D,2DAA2D;QAC7D,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,gBAAgB;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;YACpD,UAAU;YACV,IAAI,CAAC,cAAc,GAAG,IAAI,qBAAS,CACjC,IAAI,EACJ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,SAAS,EACnC;gBACE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;gBACnB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBACzB,iBAAiB,EAAE,IAAI,CAAC,2BAA2B,EAAE;aACtD,CACF,CAAC;YACF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,mBAAmB;YACnB,IAAI,CAAC,eAAe,GAAG,IAAI,qBAAS,CAClC,IAAI,EACJ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,UAAU,EACpC;gBACE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;gBACnB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBACzB,iBAAiB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,cAAc,IAAI,CAAC,aAAa,EAAE;aAChF,CACF,CAAC;YAEF,qFAAqF;YACrF,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI;qBACzC,YAA4B,CAAC;gBAChC,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,uBAAuB,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACrD,CAAC;gBACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IAED,UAAU;QACR,IAAI,uBAAS,CACX,IAAI,EACJ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,+BAA+B,EACzD;YACE,KAAK,EAAE,IAAI,CAAC,QAAQ;YACpB,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,yBAAyB;SAChE,CACF,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QACrE,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;QACtE,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;QACxE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,WAAW;QACT,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;QAClE,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;CACF;AAxLD,0CAwLC","sourcesContent":["import { CfnOutput, Stack } from \"aws-cdk-lib\";\nimport { CfnGlobalCluster, CfnDBCluster } from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { IVpc, Connections, IConnectable } from \"aws-cdk-lib/aws-ec2\";\nimport { IClusterEngine } from \"aws-cdk-lib/aws-rds\";\nimport { RdsAurora } from \"./rdsAurora\";\nimport { Secret } from \"../secrets\";\n\ninterface RdsAuroraGlobalProps {\n  vpc: IVpc;\n  databaseName: string;\n  /** primary region where the initial cluster & global cluster resource are created */\n  primaryRegion: string;\n  /** optional deterministic id for the global cluster (should be shared across stacks/regions) */\n  globalClusterIdentifier?: string;\n  /** optional engine to forward to the underlying cluster */\n  engine?: IClusterEngine;\n}\n\nexport class RdsAuroraGlobal extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private globalCluster?: CfnGlobalCluster;\n  private primaryCluster?: RdsAurora;\n  private regionalCluster?: RdsAurora;\n  private props: RdsAuroraGlobalProps;\n  private currentRegion: string;\n  private globalId: string;\n\n  constructor(scope: Construct, id: string, props: RdsAuroraGlobalProps) {\n    super(scope, id);\n\n    this.props = props;\n    this.currentRegion = Stack.of(this).region;\n    // Ensure global cluster identifier is lowercase for consistency with other identifiers\n    this.globalId =\n      props.globalClusterIdentifier?.toLowerCase() ||\n      `${props.databaseName.toLowerCase()}-global`;\n\n    // create clusters / global cluster depending on region\n    this.addAuroraCluster();\n    this.addGlobalCluster();\n    this.addOutputs();\n  }\n\n  // --- public helpers ---\n  getGlobalClusterIdentifier(): string {\n    return this.globalId;\n  }\n\n  getPrimaryClusterIdentifier(): string {\n    return `${this.props.databaseName.toLowerCase()}-primary-cluster`;\n  }\n\n  private getGlobalClusterEngineString(): string {\n    // Default to aurora-postgresql if no engine specified (matches existing behavior)\n    if (!this.props.engine) return \"aurora-postgresql\";\n\n    const engineObj: any = this.props.engine as any;\n\n    // Try common locations for the engine identifier\n    let engineType: unknown =\n      engineObj.engineType ?? engineObj.engine ?? engineObj.name;\n\n    // If the engine was provided as a raw string (unlikely but support it)\n    if (typeof this.props.engine === \"string\") {\n      engineType = this.props.engine;\n    }\n\n    // Fallback to toString() for Token-like objects\n    if (!engineType && typeof engineObj.toString === \"function\") {\n      try {\n        engineType = engineObj.toString();\n      } catch (e) {\n        engineType = undefined;\n      }\n    }\n\n    if (typeof engineType !== \"string\") return \"aurora-postgresql\";\n\n    // Normalize common forms: AURORA_POSTGRESQL -> aurora-postgresql, aurora_postgresql -> aurora-postgresql\n    const normalized = engineType.toLowerCase().replace(/_/g, \"-\");\n\n    // If the normalized value is just 'aurora', prefer the more specific postgres default\n    if (normalized === \"aurora\") return \"aurora-postgresql\";\n\n    return normalized;\n  }\n\n  // create the CfnGlobalCluster only in the primary region\n  addGlobalCluster() {\n    if (this.props.primaryRegion !== this.currentRegion) return;\n\n    // create the global cluster resource referencing the primary cluster identifier\n    // Prefer referencing the L1 DBCluster Ref so CloudFormation will create the\n    // DBCluster first and we avoid identifier-casing mismatches.\n    let sourceIdentifier: any = this.getPrimaryClusterIdentifier();\n    let primaryL1: CfnDBCluster | undefined;\n\n    if (this.primaryCluster) {\n      // Use the helper on RdsAurora to get the underlying L1 DBCluster (more reliable\n      // than relying on node.defaultChild which can vary depending on construct ordering)\n      primaryL1 =\n        this.primaryCluster.getCfnCluster &&\n        this.primaryCluster.getCfnCluster();\n      if (primaryL1) {\n        sourceIdentifier = primaryL1.ref;\n      }\n    }\n\n    this.globalCluster = new CfnGlobalCluster(\n      this,\n      `${this.props.databaseName}GlobalCluster`,\n      {\n        globalClusterIdentifier: this.globalId,\n        sourceDbClusterIdentifier: sourceIdentifier\n      }\n    );\n\n    // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set\n    if (primaryL1) {\n      // Make the CFN dependency explicit so the DBCluster is created before the GlobalCluster\n      this.globalCluster.addDependsOn(primaryL1);\n      // IMPORTANT: do NOT set the primary DBCluster's `globalClusterIdentifier` here.\n      // If we set the primary DBCluster to reference the global cluster, CloudFormation\n      // will attempt to validate that the global cluster exists when creating the\n      // DBCluster — but the global cluster is created afterward (we add a\n      // dependsOn), which causes a \"Global cluster ... not found\" error. The\n      // correct order is to create the DBCluster first, then create the\n      // CfnGlobalCluster with `sourceDbClusterIdentifier` pointing at the\n      // primary cluster's Ref. Leaving the primary L1 without the\n      // `globalClusterIdentifier` avoids the circular reference.\n    }\n  }\n\n  // create an Aurora cluster in this region (primary or secondary)\n  addAuroraCluster() {\n    if (this.props.primaryRegion === this.currentRegion) {\n      // primary\n      this.primaryCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Primary`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: this.getPrimaryClusterIdentifier()\n        }\n      );\n      this.connections = this.primaryCluster.connections;\n    } else {\n      // secondary region\n      this.regionalCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Regional`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: `${this.props.databaseName}-secondary-${this.currentRegion}`\n        }\n      );\n\n      // set the L1 DBCluster property so CloudFormation will join it to the global cluster\n      if (this.regionalCluster) {\n        const regionalL1 = this.regionalCluster.node\n          .defaultChild as CfnDBCluster;\n        if (regionalL1) {\n          regionalL1.globalClusterIdentifier = this.globalId;\n        }\n        this.connections = this.regionalCluster.connections;\n      }\n    }\n  }\n\n  addOutputs() {\n    new CfnOutput(\n      this,\n      `${this.props.databaseName}GlobalClusterIdentifierOutput`,\n      {\n        value: this.globalId,\n        exportName: `${this.props.databaseName}GlobalClusterIdentifier`\n      }\n    );\n  }\n\n  getCredentials(): Secret {\n    if (this.primaryCluster) return this.primaryCluster.getCredentials();\n    if (this.regionalCluster) return this.regionalCluster.getCredentials();\n    throw new Error(\"No Aurora cluster available to return credentials from\");\n  }\n\n  getHostEndpoint(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostEndpoint();\n    if (this.regionalCluster) return this.regionalCluster.getHostEndpoint();\n    throw new Error(\"No Aurora cluster available to return endpoint from\");\n  }\n\n  getHostPort(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostPort();\n    if (this.regionalCluster) return this.regionalCluster.getHostPort();\n    throw new Error(\"No Aurora cluster available to return port from\");\n  }\n}\n"]}
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsAuroraGlobal.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsAuroraGlobal.ts"],"names":[],"mappings":"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","sourcesContent":["import { CfnOutput, Stack } from \"aws-cdk-lib\";\nimport { CfnGlobalCluster, CfnDBCluster } from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { IVpc, Connections, IConnectable } from \"aws-cdk-lib/aws-ec2\";\nimport { IClusterEngine } from \"aws-cdk-lib/aws-rds\";\nimport { RdsAurora } from \"./rdsAurora\";\nimport { Secret } from \"../secrets\";\n\ninterface RdsAuroraGlobalProps {\n  vpc: IVpc;\n  databaseName: string;\n  /** primary region where the initial cluster & global cluster resource are created */\n  primaryRegion: string;\n  /** optional deterministic id for the global cluster (should be shared across stacks/regions) */\n  globalClusterIdentifier?: string;\n  /** optional engine to forward to the underlying cluster */\n  engine?: IClusterEngine;\n}\n\nexport class RdsAuroraGlobal extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private globalCluster?: CfnGlobalCluster;\n  private primaryCluster?: RdsAurora;\n  private regionalCluster?: RdsAurora;\n  private props: RdsAuroraGlobalProps;\n  private currentRegion: string;\n  private globalId: string;\n\n  constructor(scope: Construct, id: string, props: RdsAuroraGlobalProps) {\n    super(scope, id);\n\n    this.props = props;\n    this.currentRegion = Stack.of(this).region;\n    // Ensure global cluster identifier is lowercase for consistency with other identifiers\n    this.globalId =\n      props.globalClusterIdentifier?.toLowerCase() ||\n      `${props.databaseName.toLowerCase()}-global`;\n\n    // create clusters / global cluster depending on region\n    this.addAuroraCluster();\n    this.addGlobalCluster();\n    this.addOutputs();\n  }\n\n  // --- public helpers ---\n  getGlobalClusterIdentifier(): string {\n    return this.globalId;\n  }\n\n  getPrimaryClusterIdentifier(): string {\n    return `${this.props.databaseName.toLowerCase()}-primary-cluster`;\n  }\n\n  private getGlobalClusterEngineString(): string {\n    // Default to aurora-postgresql if no engine specified (matches existing behavior)\n    if (!this.props.engine) return \"aurora-postgresql\";\n\n    const engineObj: any = this.props.engine as any;\n\n    // Try common locations for the engine identifier\n    let engineType: unknown =\n      engineObj.engineType ?? engineObj.engine ?? engineObj.name;\n\n    // If the engine was provided as a raw string (unlikely but support it)\n    if (typeof this.props.engine === \"string\") {\n      engineType = this.props.engine;\n    }\n\n    // Fallback to toString() for Token-like objects\n    if (!engineType && typeof engineObj.toString === \"function\") {\n      try {\n        engineType = engineObj.toString();\n      } catch (e) {\n        engineType = undefined;\n      }\n    }\n\n    if (typeof engineType !== \"string\") return \"aurora-postgresql\";\n\n    // Normalize common forms: AURORA_POSTGRESQL -> aurora-postgresql, aurora_postgresql -> aurora-postgresql\n    const normalized = engineType.toLowerCase().replace(/_/g, \"-\");\n\n    // If the normalized value is just 'aurora', prefer the more specific postgres default\n    if (normalized === \"aurora\") return \"aurora-postgresql\";\n\n    return normalized;\n  }\n\n  // create the CfnGlobalCluster only in the primary region\n  addGlobalCluster() {\n    if (this.props.primaryRegion !== this.currentRegion) return;\n\n    // create the global cluster resource referencing the primary cluster identifier\n    // Prefer referencing the L1 DBCluster Ref so CloudFormation will create the\n    // DBCluster first and we avoid identifier-casing mismatches.\n    let sourceIdentifier: any = this.getPrimaryClusterIdentifier();\n    let primaryL1: CfnDBCluster | undefined;\n\n    if (this.primaryCluster) {\n      // Use the helper on RdsAurora to get the underlying L1 DBCluster (more reliable\n      // than relying on node.defaultChild which can vary depending on construct ordering)\n      primaryL1 =\n        this.primaryCluster.getCfnCluster &&\n        this.primaryCluster.getCfnCluster();\n      if (primaryL1) {\n        sourceIdentifier = primaryL1.ref;\n      }\n    }\n\n    this.globalCluster = new CfnGlobalCluster(\n      this,\n      `${this.props.databaseName}GlobalCluster`,\n      {\n        globalClusterIdentifier: this.globalId,\n        sourceDbClusterIdentifier: sourceIdentifier\n      }\n    );\n\n    // ensure the underlying primary DBCluster L1 has the globalClusterIdentifier set\n    if (primaryL1) {\n      // Make the CFN dependency explicit so the DBCluster is created before the GlobalCluster\n      this.globalCluster.addDependsOn(primaryL1);\n      // IMPORTANT: do NOT set the primary DBCluster's `globalClusterIdentifier` here.\n      // If we set the primary DBCluster to reference the global cluster, CloudFormation\n      // will attempt to validate that the global cluster exists when creating the\n      // DBCluster — but the global cluster is created afterward (we add a\n      // dependsOn), which causes a \"Global cluster ... not found\" error. The\n      // correct order is to create the DBCluster first, then create the\n      // CfnGlobalCluster with `sourceDbClusterIdentifier` pointing at the\n      // primary cluster's Ref. Leaving the primary L1 without the\n      // `globalClusterIdentifier` avoids the circular reference.\n    }\n  }\n\n  // create an Aurora cluster in this region (primary or secondary)\n  addAuroraCluster() {\n    if (this.props.primaryRegion === this.currentRegion) {\n      // primary\n      this.primaryCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Primary`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: this.getPrimaryClusterIdentifier()\n        }\n      );\n      this.connections = this.primaryCluster.connections;\n    } else {\n      // secondary region\n      this.regionalCluster = new RdsAurora(\n        this,\n        `${this.props.databaseName}Regional`,\n        {\n          vpc: this.props.vpc,\n          databaseName: this.props.databaseName,\n          engine: this.props.engine,\n          clusterIdentifier: `${this.props.databaseName}-secondary-${this.currentRegion}`\n        }\n      );\n\n      // set the L1 DBCluster property so CloudFormation will join it to the global cluster\n      if (this.regionalCluster) {\n        const regionalL1 =\n          this.regionalCluster.getCfnCluster &&\n          this.regionalCluster.getCfnCluster();\n        if (regionalL1) {\n          regionalL1.globalClusterIdentifier = this.globalId;\n        }\n        this.connections = this.regionalCluster.connections;\n      }\n    }\n  }\n\n  addOutputs() {\n    new CfnOutput(\n      this,\n      `${this.props.databaseName}GlobalClusterIdentifierOutput`,\n      {\n        value: this.globalId,\n        exportName: `${this.props.databaseName}GlobalClusterIdentifier`\n      }\n    );\n  }\n\n  getCredentials(): Secret {\n    if (this.primaryCluster) return this.primaryCluster.getCredentials();\n    if (this.regionalCluster) return this.regionalCluster.getCredentials();\n    throw new Error(\"No Aurora cluster available to return credentials from\");\n  }\n\n  getHostEndpoint(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostEndpoint();\n    if (this.regionalCluster) return this.regionalCluster.getHostEndpoint();\n    throw new Error(\"No Aurora cluster available to return endpoint from\");\n  }\n\n  getHostPort(): string {\n    if (this.primaryCluster) return this.primaryCluster.getHostPort();\n    if (this.regionalCluster) return this.regionalCluster.getHostPort();\n    throw new Error(\"No Aurora cluster available to return port from\");\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.73.
|
|
3
|
+
"version": "0.73.17",
|
|
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.73.
|
|
38
|
+
"@fjall/util": "^0.73.17",
|
|
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": "205550db96f458e2aad8d3893d77039ea4aae845",
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"aws-cdk": "^2.206.0",
|
|
50
50
|
"aws-cdk-lib": "^2.206.0",
|