@fjall/components-infrastructure 0.41.1 → 0.43.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/app.d.ts +25 -2
- package/dist/lib/app.js +53 -6
- package/dist/lib/config/aws/cloudTrail.js +2 -7
- package/dist/lib/config/aws/ecrDefaultImage.js +2 -7
- package/dist/lib/patterns/aws/buildkite.js +2 -10
- package/dist/lib/patterns/aws/compute.d.ts +0 -2
- package/dist/lib/patterns/aws/compute.js +3 -5
- package/dist/lib/patterns/aws/database.js +4 -7
- package/dist/lib/patterns/aws/freeTierApp.d.ts +0 -2
- package/dist/lib/patterns/aws/freeTierApp.js +5 -15
- package/dist/lib/patterns/aws/hostedZone.js +2 -7
- package/dist/lib/patterns/aws/spotInstanceApp.d.ts +0 -2
- package/dist/lib/patterns/aws/spotInstanceApp.js +5 -15
- package/dist/lib/patterns/aws/storage.d.ts +0 -3
- package/dist/lib/patterns/aws/storage.js +4 -7
- package/dist/lib/resources/aws/compute/ec2.d.ts +0 -2
- package/dist/lib/resources/aws/compute/ec2.js +1 -4
- package/dist/lib/resources/aws/compute/ecs.d.ts +0 -1
- package/dist/lib/resources/aws/compute/ecs.js +1 -8
- package/dist/lib/resources/aws/compute/ecsFreeTier.d.ts +0 -1
- package/dist/lib/resources/aws/compute/ecsFreeTier.js +1 -10
- package/dist/lib/resources/aws/compute/ecsSpot.d.ts +0 -1
- package/dist/lib/resources/aws/compute/ecsSpot.js +1 -10
- package/dist/lib/resources/aws/compute/lambda.d.ts +1 -0
- package/dist/lib/resources/aws/compute/lambda.js +3 -7
- package/dist/lib/resources/aws/database/database.d.ts +0 -2
- package/dist/lib/resources/aws/database/database.js +3 -5
- package/dist/lib/resources/aws/database/databaseFreeTier.d.ts +0 -2
- package/dist/lib/resources/aws/database/databaseFreeTier.js +3 -5
- package/dist/lib/resources/aws/database/databaseInstance.d.ts +0 -2
- package/dist/lib/resources/aws/database/databaseInstance.js +3 -5
- package/dist/lib/resources/aws/database/rdsAurora.d.ts +0 -2
- package/dist/lib/resources/aws/database/rdsAurora.js +7 -13
- package/dist/lib/resources/aws/database/rdsFreeTier.d.ts +0 -2
- package/dist/lib/resources/aws/database/rdsFreeTier.js +4 -10
- package/dist/lib/resources/aws/database/rdsInstance.d.ts +0 -2
- package/dist/lib/resources/aws/database/rdsInstance.js +8 -18
- package/dist/lib/resources/aws/logging/cloudTrail.d.ts +0 -2
- package/dist/lib/resources/aws/logging/cloudTrail.js +2 -6
- package/dist/lib/resources/aws/networking/vpc.d.ts +0 -2
- package/dist/lib/resources/aws/networking/vpc.js +6 -3
- package/dist/lib/resources/aws/secrets/kms.d.ts +0 -2
- package/dist/lib/resources/aws/secrets/kms.js +1 -4
- package/dist/lib/resources/aws/secrets/parameter.js +2 -3
- package/dist/lib/resources/aws/secrets/secret.d.ts +0 -2
- package/dist/lib/resources/aws/secrets/secret.js +2 -5
- package/dist/lib/resources/aws/utilities/codeBuild.d.ts +0 -2
- package/dist/lib/resources/aws/utilities/codeBuild.js +1 -3
- package/dist/lib/utils/directTagging.d.ts +31 -0
- package/dist/lib/utils/directTagging.js +86 -0
- package/dist/lib/utils/fjallConstruct.d.ts +8 -0
- package/dist/lib/utils/fjallConstruct.js +18 -0
- package/dist/lib/utils/fjallStackSynthesizer.d.ts +9 -0
- package/dist/lib/utils/fjallStackSynthesizer.js +22 -0
- package/dist/lib/utils/getConfig.js +10 -1
- package/dist/lib/utils/standardTagsAspect.d.ts +6 -29
- package/dist/lib/utils/standardTagsAspect.js +72 -33
- package/dist/lib/utils/tagContext.d.ts +28 -0
- package/dist/lib/utils/tagContext.js +53 -0
- package/dist/lib/utils/tagResource.d.ts +5 -0
- package/dist/lib/utils/tagResource.js +8 -5
- package/dist/lib/utils/tagSynthesizer.d.ts +13 -0
- package/dist/lib/utils/tagSynthesizer.js +55 -0
- package/package.json +3 -3
|
@@ -7,7 +7,6 @@ const aws_rds_1 = require("aws-cdk-lib/aws-rds");
|
|
|
7
7
|
const constructs_1 = require("constructs");
|
|
8
8
|
const iam_1 = require("../iam");
|
|
9
9
|
const secrets_1 = require("../secrets");
|
|
10
|
-
const tagResource_1 = require("../../../utils/tagResource");
|
|
11
10
|
const vpc_1 = require("../networking/vpc");
|
|
12
11
|
class RdsFreeTier extends constructs_1.Construct {
|
|
13
12
|
constructor(scope, id, props) {
|
|
@@ -18,9 +17,7 @@ class RdsFreeTier extends constructs_1.Construct {
|
|
|
18
17
|
addVpc(props) {
|
|
19
18
|
this.vpc = props.vpc
|
|
20
19
|
? props.vpc
|
|
21
|
-
: new vpc_1.Vpc(this, `${props.databaseName}Vpc
|
|
22
|
-
tags: props.tags
|
|
23
|
-
});
|
|
20
|
+
: new vpc_1.Vpc(this, `${props.databaseName}Vpc`);
|
|
24
21
|
}
|
|
25
22
|
addDatabase(props) {
|
|
26
23
|
// Database Credentials
|
|
@@ -33,13 +30,11 @@ class RdsFreeTier extends constructs_1.Construct {
|
|
|
33
30
|
excludePunctuation: true,
|
|
34
31
|
includeSpace: false,
|
|
35
32
|
generateStringKey: "password"
|
|
36
|
-
}
|
|
37
|
-
tags: props.tags
|
|
33
|
+
}
|
|
38
34
|
});
|
|
39
35
|
// Customer Managed Keys
|
|
40
36
|
this.encryptionKey = new secrets_1.CustomerManagedKey(this, `${props.databaseName}ClusterEncryptionKey`, {
|
|
41
|
-
aliasName: `cmk/rds/${props.databaseName}/encryptionKey
|
|
42
|
-
tags: props.tags
|
|
37
|
+
aliasName: `cmk/rds/${props.databaseName}/encryptionKey`
|
|
43
38
|
});
|
|
44
39
|
this.databaseSecurityGroup = new iam_1.SecurityGroup(this, `${props.databaseName}SecurityGroup`, {
|
|
45
40
|
vpc: this.vpc,
|
|
@@ -74,7 +69,6 @@ class RdsFreeTier extends constructs_1.Construct {
|
|
|
74
69
|
preferredMaintenanceWindow: props.preferredMaintenanceWindow || "Sat:12:30-Sat:20:30",
|
|
75
70
|
credentials: aws_rds_1.Credentials.fromSecret(this.databaseCredentials.secret)
|
|
76
71
|
});
|
|
77
|
-
(0, tagResource_1.default)(this.database, props.tags);
|
|
78
72
|
}
|
|
79
73
|
getCredentials() {
|
|
80
74
|
return this.databaseCredentials;
|
|
@@ -87,4 +81,4 @@ class RdsFreeTier extends constructs_1.Construct {
|
|
|
87
81
|
}
|
|
88
82
|
}
|
|
89
83
|
exports.RdsFreeTier = RdsFreeTier;
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsFreeTier.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsFreeTier.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration, RemovalPolicy, StackProps } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  InstanceClass,\n  InstanceSize,\n  InstanceType,\n  IVpc,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceEngine,\n  IInstanceEngine,\n  PostgresEngineVersion,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\nimport tagResource from \"../../../utils/tagResource\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface RdsProps extends StackProps {\n  vpc?: IVpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  instanceType?: InstanceType;\n  maxAllocatedStorage?: number;\n  allocatedStorage?: number;\n  backupRetention?: Duration;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  enablePerformanceInsights?: boolean;\n  databaseProxy?: boolean;\n  // TODO: The below could be a number, then it scales based on the amount\n  readReplica?: boolean;\n  tags: KeyValue;\n}\n\nexport class RdsFreeTier extends Construct implements IConnectable {\n  public connections: Connections;\n  public databaseSecurityGroup: SecurityGroup;\n  public vpc: IVpc;\n\n  private databaseCredentials: Secret;\n  private encryptionKey: CustomerManagedKey;\n  // private databaseSecurityGroup: SecurityGroup;\n  private database: DatabaseInstance;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n    this.addVpc(props);\n    this.addDatabase(props);\n  }\n\n  addVpc(props: RdsProps) {\n    this.vpc = props.vpc\n      ? props.vpc\n      : new Vpc(this, `${props.databaseName}Vpc`, {\n          tags: props.tags\n        });\n  }\n\n  addDatabase(props: RdsProps) {\n    // Database Credentials\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: `${props.databaseName}Credentials`,\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username: \"postgres\"\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        },\n        tags: props.tags\n      }\n    );\n\n    // Customer Managed Keys\n    this.encryptionKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ClusterEncryptionKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/encryptionKey`,\n        tags: props.tags\n      }\n    );\n\n    this.databaseSecurityGroup = new SecurityGroup(\n      this,\n      `${props.databaseName}SecurityGroup`,\n      {\n        vpc: this.vpc,\n        description: `Security group that allows inbound access to the postgres cluster for ${props.databaseName}`\n      }\n    );\n\n    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        databaseName:\n          props.databaseName || `${this.node.id.replace(\"Rds\", \"\")}`,\n        instanceIdentifier: props.databaseName,\n        instanceType:\n          props.instanceType ||\n          InstanceType.of(InstanceClass.BURSTABLE3, InstanceSize.MICRO),\n        multiAz: false,\n        port: props.port,\n        preferredMaintenanceWindow:\n          props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\",\n        credentials: Credentials.fromSecret(this.databaseCredentials.secret)\n      }\n    );\n    tagResource(this.database, props.tags);\n  }\n\n  getCredentials() {\n    return this.databaseCredentials;\n  }\n\n  getHostEndpoint() {\n    return this.database.dbInstanceEndpointAddress;\n  }\n\n  getHostPort() {\n    return this.database.dbInstanceEndpointPort;\n  }\n}\n"]}
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsFreeTier.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsFreeTier.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration, RemovalPolicy, StackProps } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  InstanceClass,\n  InstanceSize,\n  InstanceType,\n  IVpc,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceEngine,\n  IInstanceEngine,\n  PostgresEngineVersion,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface RdsProps extends StackProps {\n  vpc?: IVpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  instanceType?: InstanceType;\n  maxAllocatedStorage?: number;\n  allocatedStorage?: number;\n  backupRetention?: Duration;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  enablePerformanceInsights?: boolean;\n  databaseProxy?: boolean;\n  // TODO: The below could be a number, then it scales based on the amount\n  readReplica?: boolean;\n}\n\nexport class RdsFreeTier extends Construct implements IConnectable {\n  public connections: Connections;\n  public databaseSecurityGroup: SecurityGroup;\n  public vpc: IVpc;\n\n  private databaseCredentials: Secret;\n  private encryptionKey: CustomerManagedKey;\n  // private databaseSecurityGroup: SecurityGroup;\n  private database: DatabaseInstance;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n    this.addVpc(props);\n    this.addDatabase(props);\n  }\n\n  addVpc(props: RdsProps) {\n    this.vpc = props.vpc\n      ? props.vpc\n      : new Vpc(this, `${props.databaseName}Vpc`);\n  }\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    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    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        databaseName:\n          props.databaseName || `${this.node.id.replace(\"Rds\", \"\")}`,\n        instanceIdentifier: props.databaseName,\n        instanceType:\n          props.instanceType ||\n          InstanceType.of(InstanceClass.BURSTABLE3, InstanceSize.MICRO),\n        multiAz: false,\n        port: props.port,\n        preferredMaintenanceWindow:\n          props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\",\n        credentials: Credentials.fromSecret(this.databaseCredentials.secret)\n      }\n    );\n  }\n\n  getCredentials() {\n    return this.databaseCredentials;\n  }\n\n  getHostEndpoint() {\n    return this.database.dbInstanceEndpointAddress;\n  }\n\n  getHostPort() {\n    return this.database.dbInstanceEndpointPort;\n  }\n}\n"]}
|
|
@@ -4,7 +4,6 @@ import { IInstanceEngine } from "aws-cdk-lib/aws-rds";
|
|
|
4
4
|
import { Construct } from "constructs";
|
|
5
5
|
import { SecurityGroup } from "../iam";
|
|
6
6
|
import { Secret } from "../secrets";
|
|
7
|
-
import { KeyValue } from "../../../types";
|
|
8
7
|
import { StackBuilder } from "../base/awsStack";
|
|
9
8
|
interface RdsProps {
|
|
10
9
|
vpc?: IVpc;
|
|
@@ -21,7 +20,6 @@ interface RdsProps {
|
|
|
21
20
|
enablePerformanceInsights?: boolean;
|
|
22
21
|
databaseProxy?: boolean;
|
|
23
22
|
readReplica?: boolean;
|
|
24
|
-
tags: KeyValue;
|
|
25
23
|
securityGroupIds?: string[];
|
|
26
24
|
}
|
|
27
25
|
export declare class RdsInstance extends Construct implements IConnectable {
|
|
@@ -8,7 +8,6 @@ const aws_secretsmanager_1 = require("aws-cdk-lib/aws-secretsmanager");
|
|
|
8
8
|
const constructs_1 = require("constructs");
|
|
9
9
|
const iam_1 = require("../iam");
|
|
10
10
|
const secrets_1 = require("../secrets");
|
|
11
|
-
const tagResource_1 = require("../../../utils/tagResource");
|
|
12
11
|
const vpc_1 = require("../networking/vpc");
|
|
13
12
|
class RdsInstance extends constructs_1.Construct {
|
|
14
13
|
constructor(scope, id, props) {
|
|
@@ -27,9 +26,7 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
27
26
|
addVpc(props) {
|
|
28
27
|
this.vpc = props.vpc
|
|
29
28
|
? props.vpc
|
|
30
|
-
: new vpc_1.Vpc(this, `${props.databaseName}Vpc`, {
|
|
31
|
-
tags: props.tags
|
|
32
|
-
});
|
|
29
|
+
: new vpc_1.Vpc(this, `${props.databaseName}Vpc`, {});
|
|
33
30
|
}
|
|
34
31
|
addDatabase(props) {
|
|
35
32
|
// Database Credentials
|
|
@@ -42,18 +39,15 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
42
39
|
excludePunctuation: true,
|
|
43
40
|
includeSpace: false,
|
|
44
41
|
generateStringKey: "password"
|
|
45
|
-
}
|
|
46
|
-
tags: props.tags
|
|
42
|
+
}
|
|
47
43
|
});
|
|
48
44
|
// Customer Managed Keys
|
|
49
45
|
this.encryptionKey = new secrets_1.CustomerManagedKey(this, `${props.databaseName}ClusterEncryptionKey`, {
|
|
50
|
-
aliasName: `cmk/rds/${props.databaseName}/encryptionKey
|
|
51
|
-
tags: props.tags
|
|
46
|
+
aliasName: `cmk/rds/${props.databaseName}/encryptionKey`
|
|
52
47
|
});
|
|
53
48
|
if (props.enablePerformanceInsights) {
|
|
54
49
|
this.databasePerformanceInsightsKey = new secrets_1.CustomerManagedKey(this, `${props.databaseName}PerformanceInsightsKey`, {
|
|
55
|
-
aliasName: `cmk/rds/${props.databaseName}/InsightsKey
|
|
56
|
-
tags: props.tags
|
|
50
|
+
aliasName: `cmk/rds/${props.databaseName}/InsightsKey`
|
|
57
51
|
});
|
|
58
52
|
}
|
|
59
53
|
this.databaseSecurityGroup = new iam_1.SecurityGroup(this, `${props.databaseName}SecurityGroup`, {
|
|
@@ -98,13 +92,11 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
98
92
|
preferredMaintenanceWindow: props.preferredMaintenanceWindow || "Sat:12:30-Sat:20:30",
|
|
99
93
|
credentials: aws_rds_1.Credentials.fromSecret(this.databaseCredentials.secret)
|
|
100
94
|
});
|
|
101
|
-
(0, tagResource_1.default)(this.database, props.tags);
|
|
102
95
|
}
|
|
103
96
|
rotateSecret(props) {
|
|
104
97
|
// Rotate the Secret every 30 days
|
|
105
98
|
this.masterSecret = new secrets_1.Secret(this, `${props.databaseName}MasterSecret`, {
|
|
106
|
-
secretName: `${props.databaseName}MasterSecret
|
|
107
|
-
tags: props.tags
|
|
99
|
+
secretName: `${props.databaseName}MasterSecret`
|
|
108
100
|
});
|
|
109
101
|
new aws_secretsmanager_1.SecretRotation(this, `${props.databaseName}SecretRotation`, {
|
|
110
102
|
application: new aws_secretsmanager_1.SecretRotationApplication("SecretsManagerRDSPostgreSQLRotationMultiUser", "1.1.367", {
|
|
@@ -135,8 +127,7 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
135
127
|
}
|
|
136
128
|
addReadReplica(props) {
|
|
137
129
|
const readReplicaPerformanceInsightsKey = new secrets_1.CustomerManagedKey(this, `${props.databaseName}ReadReplicaReaderInsightsKey`, {
|
|
138
|
-
aliasName: `cmk/rds/${props.databaseName}/ReadReplicaInsightsKey
|
|
139
|
-
tags: props.tags
|
|
130
|
+
aliasName: `cmk/rds/${props.databaseName}/ReadReplicaInsightsKey`
|
|
140
131
|
});
|
|
141
132
|
new aws_rds_1.DatabaseInstanceReadReplica(this, `${props.databaseName}ReadReplica`, {
|
|
142
133
|
sourceDatabaseInstance: this.database,
|
|
@@ -189,8 +180,7 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
189
180
|
...{
|
|
190
181
|
vpc: sb.getNetwork() || props?.vpc,
|
|
191
182
|
securityGroupIds: props?.securityGroupIds ?? [],
|
|
192
|
-
databaseName: props.databaseName || `${id.replace("Rds", "")}
|
|
193
|
-
tags: props.tags
|
|
183
|
+
databaseName: props.databaseName || `${id.replace("Rds", "")}`
|
|
194
184
|
}
|
|
195
185
|
};
|
|
196
186
|
return new this(sb.getStack(), id, newProps);
|
|
@@ -198,4 +188,4 @@ class RdsInstance extends constructs_1.Construct {
|
|
|
198
188
|
}
|
|
199
189
|
}
|
|
200
190
|
exports.RdsInstance = RdsInstance;
|
|
201
|
-
//# 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 tagResource from \"../../../utils/tagResource\";\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  tags: KeyValue;\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          tags: props.tags\n        });\n  }\n\n  addDatabase(props: RdsProps) {\n    // Database Credentials\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: `${props.databaseName}Credentials`,\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username: \"postgres\"\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        },\n        tags: props.tags\n      }\n    );\n\n    // Customer Managed Keys\n    this.encryptionKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ClusterEncryptionKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/encryptionKey`,\n        tags: props.tags\n      }\n    );\n\n    if (props.enablePerformanceInsights) {\n      this.databasePerformanceInsightsKey = new CustomerManagedKey(\n        this,\n        `${props.databaseName}PerformanceInsightsKey`,\n        {\n          aliasName: `cmk/rds/${props.databaseName}/InsightsKey`,\n          tags: props.tags\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    tagResource(this.database, props.tags);\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      tags: props.tags\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        tags: props.tags\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() {\n    return 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          tags: props.tags\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_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() {\n    return 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"]}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { Stack } from "aws-cdk-lib";
|
|
2
2
|
import * as CloudTrail from "aws-cdk-lib/aws-cloudtrail";
|
|
3
3
|
import { Construct } from "constructs";
|
|
4
|
-
import { KeyValue } from "../../../types";
|
|
5
4
|
import { S3Bucket } from "../storage";
|
|
6
5
|
interface CloudTrailProps extends CloudTrail.TrailProps {
|
|
7
6
|
bucketName: string;
|
|
8
|
-
tags: KeyValue;
|
|
9
7
|
}
|
|
10
8
|
export declare class Trail extends Construct {
|
|
11
9
|
readonly trail: CloudTrail.Trail;
|
|
@@ -5,7 +5,6 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
|
5
5
|
const CloudTrail = require("aws-cdk-lib/aws-cloudtrail");
|
|
6
6
|
const constructs_1 = require("constructs");
|
|
7
7
|
const secrets_1 = require("../secrets");
|
|
8
|
-
const tagResource_1 = require("../../../utils/tagResource");
|
|
9
8
|
const storage_1 = require("../storage");
|
|
10
9
|
const aws_s3_1 = require("aws-cdk-lib/aws-s3");
|
|
11
10
|
const aws_iam_1 = require("aws-cdk-lib/aws-iam");
|
|
@@ -13,8 +12,7 @@ class Trail extends constructs_1.Construct {
|
|
|
13
12
|
constructor(scope, id, props) {
|
|
14
13
|
super(scope, id);
|
|
15
14
|
const encryptionKey = new secrets_1.CustomerManagedKey(this, `${id}CloudTrailEncryptionKey`, {
|
|
16
|
-
aliasName: `cmk/cloudtrail/${id}/encryptionKey
|
|
17
|
-
tags: props.tags
|
|
15
|
+
aliasName: `cmk/cloudtrail/${id}/encryptionKey`
|
|
18
16
|
});
|
|
19
17
|
this.bucket = new storage_1.S3Bucket(this, `${id}cloudTrailBucket`, {
|
|
20
18
|
bucketName: props.bucketName,
|
|
@@ -22,7 +20,6 @@ class Trail extends constructs_1.Construct {
|
|
|
22
20
|
encryption: aws_s3_1.BucketEncryption.KMS,
|
|
23
21
|
encryptionKey: encryptionKey.key
|
|
24
22
|
});
|
|
25
|
-
(0, tagResource_1.default)(this.bucket, props.tags);
|
|
26
23
|
this.bucket.grantReadWrite(new aws_iam_1.ServicePrincipal("cloudtrail.amazonaws.com"));
|
|
27
24
|
this.trail = new CloudTrail.Trail(this, `${id}cloudTrail`, {
|
|
28
25
|
...props,
|
|
@@ -30,7 +27,6 @@ class Trail extends constructs_1.Construct {
|
|
|
30
27
|
trailName: props.trailName || `${id}Trail`,
|
|
31
28
|
encryptionKey: encryptionKey.key
|
|
32
29
|
});
|
|
33
|
-
(0, tagResource_1.default)(this.trail, props.tags);
|
|
34
30
|
}
|
|
35
31
|
}
|
|
36
32
|
exports.Trail = Trail;
|
|
@@ -43,4 +39,4 @@ class TrailStack extends aws_cdk_lib_1.Stack {
|
|
|
43
39
|
}
|
|
44
40
|
}
|
|
45
41
|
exports.TrailStack = TrailStack;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvdWRUcmFpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2xpYi9yZXNvdXJjZXMvYXdzL2xvZ2dpbmcvY2xvdWRUcmFpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBb0M7QUFDcEMseURBQXlEO0FBQ3pELDJDQUF1QztBQUN2Qyx3Q0FBZ0Q7QUFFaEQsd0NBQXNDO0FBQ3RDLCtDQUFzRDtBQUN0RCxpREFBdUQ7QUFNdkQsTUFBYSxLQUFNLFNBQVEsc0JBQVM7SUFJbEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFzQjtRQUM5RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLE1BQU0sYUFBYSxHQUFHLElBQUksNEJBQWtCLENBQzFDLElBQUksRUFDSixHQUFHLEVBQUUseUJBQXlCLEVBQzlCO1lBQ0UsU0FBUyxFQUFFLGtCQUFrQixFQUFFLGdCQUFnQjtTQUNoRCxDQUNGLENBQUM7UUFFRixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksa0JBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLGtCQUFrQixFQUFFO1lBQ3hELFVBQVUsRUFBRSxLQUFLLENBQUMsVUFBVTtZQUM1QixnQkFBZ0IsRUFBRSxJQUFJO1lBQ3RCLFVBQVUsRUFBRSx5QkFBZ0IsQ0FBQyxHQUFHO1lBQ2hDLGFBQWEsRUFBRSxhQUFhLENBQUMsR0FBRztTQUNqQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FDeEIsSUFBSSwwQkFBZ0IsQ0FBQywwQkFBMEIsQ0FBQyxDQUNqRCxDQUFDO1FBRUYsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxZQUFZLEVBQUU7WUFDekQsR0FBRyxLQUFLO1lBQ1IsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUyxJQUFJLEdBQUcsRUFBRSxPQUFPO1lBQzFDLGFBQWEsRUFBRSxhQUFhLENBQUMsR0FBRztTQUNqQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFoQ0Qsc0JBZ0NDO0FBRUQsTUFBYSxVQUFXLFNBQVEsbUJBQUs7SUFDbkMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFzQjtRQUM5RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLElBQUksS0FBSyxDQUFDLElBQUksRUFBRSxFQUFFLEVBQUU7WUFDbEIsR0FBRyxLQUFLO1NBQ1QsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBUkQsZ0NBUUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0ICogYXMgQ2xvdWRUcmFpbCBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWNsb3VkdHJhaWxcIjtcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBDdXN0b21lck1hbmFnZWRLZXkgfSBmcm9tIFwiLi4vc2VjcmV0c1wiO1xuaW1wb3J0IHsgS2V5VmFsdWUgfSBmcm9tIFwiLi4vLi4vLi4vdHlwZXNcIjtcbmltcG9ydCB7IFMzQnVja2V0IH0gZnJvbSBcIi4uL3N0b3JhZ2VcIjtcbmltcG9ydCB7IEJ1Y2tldEVuY3J5cHRpb24gfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLXMzXCI7XG5pbXBvcnQgeyBTZXJ2aWNlUHJpbmNpcGFsIH0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1pYW1cIjtcblxuaW50ZXJmYWNlIENsb3VkVHJhaWxQcm9wcyBleHRlbmRzIENsb3VkVHJhaWwuVHJhaWxQcm9wcyB7XG4gIGJ1Y2tldE5hbWU6IHN0cmluZztcbn1cblxuZXhwb3J0IGNsYXNzIFRyYWlsIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IHRyYWlsOiBDbG91ZFRyYWlsLlRyYWlsO1xuICBwdWJsaWMgcmVhZG9ubHkgYnVja2V0OiBTM0J1Y2tldDtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogQ2xvdWRUcmFpbFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIGNvbnN0IGVuY3J5cHRpb25LZXkgPSBuZXcgQ3VzdG9tZXJNYW5hZ2VkS2V5KFxuICAgICAgdGhpcyxcbiAgICAgIGAke2lkfUNsb3VkVHJhaWxFbmNyeXB0aW9uS2V5YCxcbiAgICAgIHtcbiAgICAgICAgYWxpYXNOYW1lOiBgY21rL2Nsb3VkdHJhaWwvJHtpZH0vZW5jcnlwdGlvbktleWBcbiAgICAgIH1cbiAgICApO1xuXG4gICAgdGhpcy5idWNrZXQgPSBuZXcgUzNCdWNrZXQodGhpcywgYCR7aWR9Y2xvdWRUcmFpbEJ1Y2tldGAsIHtcbiAgICAgIGJ1Y2tldE5hbWU6IHByb3BzLmJ1Y2tldE5hbWUsXG4gICAgICBidWNrZXRLZXlFbmFibGVkOiB0cnVlLFxuICAgICAgZW5jcnlwdGlvbjogQnVja2V0RW5jcnlwdGlvbi5LTVMsXG4gICAgICBlbmNyeXB0aW9uS2V5OiBlbmNyeXB0aW9uS2V5LmtleVxuICAgIH0pO1xuICAgIHRoaXMuYnVja2V0LmdyYW50UmVhZFdyaXRlKFxuICAgICAgbmV3IFNlcnZpY2VQcmluY2lwYWwoXCJjbG91ZHRyYWlsLmFtYXpvbmF3cy5jb21cIilcbiAgICApO1xuXG4gICAgdGhpcy50cmFpbCA9IG5ldyBDbG91ZFRyYWlsLlRyYWlsKHRoaXMsIGAke2lkfWNsb3VkVHJhaWxgLCB7XG4gICAgICAuLi5wcm9wcyxcbiAgICAgIGJ1Y2tldDogdGhpcy5idWNrZXQsXG4gICAgICB0cmFpbE5hbWU6IHByb3BzLnRyYWlsTmFtZSB8fCBgJHtpZH1UcmFpbGAsXG4gICAgICBlbmNyeXB0aW9uS2V5OiBlbmNyeXB0aW9uS2V5LmtleVxuICAgIH0pO1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBUcmFpbFN0YWNrIGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogQ2xvdWRUcmFpbFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIG5ldyBUcmFpbCh0aGlzLCBpZCwge1xuICAgICAgLi4ucHJvcHNcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -2,13 +2,11 @@ import { Construct } from "constructs";
|
|
|
2
2
|
import * as ec2 from "aws-cdk-lib/aws-ec2";
|
|
3
3
|
import App from "../../../app";
|
|
4
4
|
import { StackBuilder } from "../base/awsStack";
|
|
5
|
-
import { KeyValue } from "../../../types";
|
|
6
5
|
interface VpcProps extends ec2.VpcProps {
|
|
7
6
|
region?: string;
|
|
8
7
|
accountId?: string;
|
|
9
8
|
availabilityZones?: string[];
|
|
10
9
|
ipv4IpamPoolId?: string;
|
|
11
|
-
tags: KeyValue;
|
|
12
10
|
}
|
|
13
11
|
export declare class VpcFactory {
|
|
14
12
|
static build(id: string, props: VpcProps): (app: App, scope: Construct) => Vpc;
|
|
@@ -4,6 +4,7 @@ exports.Vpc = exports.VpcFactory = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const ec2 = require("aws-cdk-lib/aws-ec2");
|
|
6
6
|
const logGroup_1 = require("../logging/logGroup");
|
|
7
|
+
const tagResource_1 = require("../../../utils/tagResource");
|
|
7
8
|
class VpcFactory {
|
|
8
9
|
static build(id, props) {
|
|
9
10
|
return (app, scope) => {
|
|
@@ -28,8 +29,10 @@ class Vpc extends ec2.Vpc {
|
|
|
28
29
|
ipAddresses: Vpc.ipAddresses(scope, id, props)
|
|
29
30
|
});
|
|
30
31
|
if (!!props?.accountId) {
|
|
31
|
-
// Required for the VPC to use the IPAM Pool to
|
|
32
|
-
|
|
32
|
+
// Required for the VPC to use the IPAM Pool to provision IP addresses
|
|
33
|
+
(0, tagResource_1.default)(this, {
|
|
34
|
+
"fjall:operations:pool": props?.accountId || "noPool"
|
|
35
|
+
});
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
38
|
static availabilityZones(scope) {
|
|
@@ -81,4 +84,4 @@ class Vpc extends ec2.Vpc {
|
|
|
81
84
|
}
|
|
82
85
|
}
|
|
83
86
|
exports.Vpc = Vpc;
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3MvbmV0d29ya2luZy92cGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQW1EO0FBQ25ELDJDQUEyQztBQUkzQyxrREFBK0M7QUFFL0MsNERBQXFEO0FBU3JELE1BQWEsVUFBVTtJQUNyQixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFlO1FBQ3RDLE9BQU8sQ0FBQyxHQUFRLEVBQUUsS0FBZ0IsRUFBRSxFQUFFO1lBQ3BDLE1BQU0sUUFBUSxHQUFHO2dCQUNmLEdBQUcsS0FBSztnQkFDUixHQUFHO29CQUNELE9BQU8sRUFBRSxHQUFHLEdBQUcsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDLFlBQVksRUFBRSxJQUFJLEVBQUUsRUFBRTtpQkFDaEU7YUFDRixDQUFDO1lBQ0YsT0FBTyxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3RDLENBQUMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQVpELGdDQVlDO0FBRUQsTUFBYSxHQUFJLFNBQVEsR0FBRyxDQUFDLEdBQUc7SUFDOUIsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFnQjtRQUN4RCxLQUFLLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7WUFDeEIsR0FBRyxLQUFLO1lBQ1IsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ3BCLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUM7WUFDL0MsUUFBUSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUM7WUFDeEMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUM7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDO1lBQ3ZCLHNFQUFzRTtZQUN0RSxJQUFBLHFCQUFXLEVBQUMsSUFBSSxFQUFFO2dCQUNoQix1QkFBdUIsRUFBRSxLQUFLLEVBQUUsU0FBUyxJQUFJLFFBQVE7YUFDdEQsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztJQUNILENBQUM7SUFFRCxNQUFNLENBQUMsaUJBQWlCLENBQUMsS0FBZ0I7UUFDdkMsT0FBTyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWdCO1FBQzVELElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBRWpELE9BQU87WUFDTCxDQUFDLEdBQUcsRUFBRSxhQUFhLENBQUMsRUFBRTtnQkFDcEIsV0FBVyxFQUFFLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FDbEQsSUFBSSxtQkFBUSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsY0FBYyxFQUFFO29CQUN2QyxZQUFZLEVBQUUscUJBQXFCLEVBQUUsR0FBRztvQkFDeEMsYUFBYSxFQUFFLDJCQUFhLENBQUMsT0FBTztpQkFDckMsQ0FBQyxDQUNIO2FBQ0Y7U0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZ0I7UUFDL0QsSUFBSSxDQUFDLEtBQUssRUFBRSxTQUFTLElBQUksQ0FBQyxLQUFLLEVBQUUsY0FBYyxFQUFFLENBQUM7WUFDaEQsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztRQUVELE9BQU8sR0FBRyxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQztZQUN2QyxjQUFjLEVBQUUsS0FBSyxDQUFDLGNBQWM7WUFDcEMsaUJBQWlCLEVBQUUsRUFBRTtZQUNyQiw4QkFBOEIsRUFBRSxFQUFFO1NBQ25DLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFnQjtRQUN2QyxPQUFPLENBQUMsRUFBZ0IsRUFBRSxFQUFFO1lBQzFCLE9BQU8sSUFBSSxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM1QyxDQUFDLENBQUM7SUFDSixDQUFDO0lBQ0Q7Ozs7Ozs7OztPQVNHO0lBQ0gsTUFBTSxDQUFDLE1BQU0sQ0FDWCxFQUFVLEVBQ1YsWUFBb0I7UUFFcEIsT0FBTyxDQUFDLEVBQWdCLEVBQUUsRUFBRTtZQUMxQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQUU7Z0JBQzNDLE9BQU8sRUFBRSxHQUFHLFlBQVksSUFBSSxFQUFFLEVBQUU7YUFDakMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBMUVELGtCQTBFQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBSZW1vdmFsUG9saWN5LCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0ICogYXMgZWMyIGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5cbmltcG9ydCBBcHAgZnJvbSBcIi4uLy4uLy4uL2FwcFwiO1xuaW1wb3J0IHsgU3RhY2tCdWlsZGVyIH0gZnJvbSBcIi4uL2Jhc2UvYXdzU3RhY2tcIjtcbmltcG9ydCB7IExvZ0dyb3VwIH0gZnJvbSBcIi4uL2xvZ2dpbmcvbG9nR3JvdXBcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uLy4uL3R5cGVzXCI7XG5pbXBvcnQgdGFnUmVzb3VyY2UgZnJvbSBcIi4uLy4uLy4uL3V0aWxzL3RhZ1Jlc291cmNlXCI7XG5cbmludGVyZmFjZSBWcGNQcm9wcyBleHRlbmRzIGVjMi5WcGNQcm9wcyB7XG4gIHJlZ2lvbj86IHN0cmluZztcbiAgYWNjb3VudElkPzogc3RyaW5nO1xuICBhdmFpbGFiaWxpdHlab25lcz86IHN0cmluZ1tdO1xuICBpcHY0SXBhbVBvb2xJZD86IHN0cmluZztcbn1cblxuZXhwb3J0IGNsYXNzIFZwY0ZhY3Rvcnkge1xuICBzdGF0aWMgYnVpbGQoaWQ6IHN0cmluZywgcHJvcHM6IFZwY1Byb3BzKSB7XG4gICAgcmV0dXJuIChhcHA6IEFwcCwgc2NvcGU6IENvbnN0cnVjdCkgPT4ge1xuICAgICAgY29uc3QgdnBjUHJvcHMgPSB7XG4gICAgICAgIC4uLnByb3BzLFxuICAgICAgICAuLi57XG4gICAgICAgICAgdnBjTmFtZTogYCR7YXBwLmdldERlZmF1bHROZXR3b3JrU3RhY2soKS5nZXRTdGFja05hbWUoKX0vJHtpZH1gXG4gICAgICAgIH1cbiAgICAgIH07XG4gICAgICByZXR1cm4gbmV3IFZwYyhzY29wZSwgaWQsIHZwY1Byb3BzKTtcbiAgICB9O1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBWcGMgZXh0ZW5kcyBlYzIuVnBjIHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM/OiBWcGNQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBgdnBjLSR7aWR9YCwge1xuICAgICAgLi4ucHJvcHMsXG4gICAgICB2cGNOYW1lOiBgdnBjLSR7aWR9YCxcbiAgICAgIGF2YWlsYWJpbGl0eVpvbmVzOiBWcGMuYXZhaWxhYmlsaXR5Wm9uZXMoc2NvcGUpLFxuICAgICAgZmxvd0xvZ3M6IFZwYy5mbG93TG9ncyhzY29wZSwgaWQsIHByb3BzKSxcbiAgICAgIGlwQWRkcmVzc2VzOiBWcGMuaXBBZGRyZXNzZXMoc2NvcGUsIGlkLCBwcm9wcylcbiAgICB9KTtcblxuICAgIGlmICghIXByb3BzPy5hY2NvdW50SWQpIHtcbiAgICAgIC8vIFJlcXVpcmVkIGZvciB0aGUgVlBDIHRvIHVzZSB0aGUgSVBBTSBQb29sIHRvIHByb3Zpc2lvbiBJUCBhZGRyZXNzZXNcbiAgICAgIHRhZ1Jlc291cmNlKHRoaXMsIHtcbiAgICAgICAgXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIjogcHJvcHM/LmFjY291bnRJZCB8fCBcIm5vUG9vbFwiXG4gICAgICB9KTtcbiAgICB9XG4gIH1cblxuICBzdGF0aWMgYXZhaWxhYmlsaXR5Wm9uZXMoc2NvcGU6IENvbnN0cnVjdCkge1xuICAgIHJldHVybiBTdGFjay5vZihzY29wZSkuYXZhaWxhYmlsaXR5Wm9uZXMuc2xpY2UoMCwgMyk7XG4gIH1cblxuICBzdGF0aWMgZmxvd0xvZ3Moc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM/OiBWcGNQcm9wcykge1xuICAgIGlmICghcHJvcHMgfHwgIXByb3BzLmFjY291bnRJZCkgcmV0dXJuIHVuZGVmaW5lZDtcblxuICAgIHJldHVybiB7XG4gICAgICBbYCR7aWR9VnBjRmxvd0xvZ3NgXToge1xuICAgICAgICBkZXN0aW5hdGlvbjogZWMyLkZsb3dMb2dEZXN0aW5hdGlvbi50b0Nsb3VkV2F0Y2hMb2dzKFxuICAgICAgICAgIG5ldyBMb2dHcm91cChzY29wZSwgYCR7aWR9Rmxvd0xvZ0dyb3VwYCwge1xuICAgICAgICAgICAgbG9nR3JvdXBOYW1lOiBgL3ZwYy9mbG93bG9ncy92cGMtJHtpZH0vYCxcbiAgICAgICAgICAgIHJlbW92YWxQb2xpY3k6IFJlbW92YWxQb2xpY3kuREVTVFJPWVxuICAgICAgICAgIH0pXG4gICAgICAgIClcbiAgICAgIH1cbiAgICB9O1xuICB9XG5cbiAgc3RhdGljIGlwQWRkcmVzc2VzKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzPzogVnBjUHJvcHMpIHtcbiAgICBpZiAoIXByb3BzPy5hY2NvdW50SWQgfHwgIXByb3BzPy5pcHY0SXBhbVBvb2xJZCkge1xuICAgICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICB9XG5cbiAgICByZXR1cm4gZWMyLklwQWRkcmVzc2VzLmF3c0lwYW1BbGxvY2F0aW9uKHtcbiAgICAgIGlwdjRJcGFtUG9vbElkOiBwcm9wcy5pcHY0SXBhbVBvb2xJZCxcbiAgICAgIGlwdjROZXRtYXNrTGVuZ3RoOiAyMCxcbiAgICAgIGRlZmF1bHRTdWJuZXRJcHY0TmV0bWFza0xlbmd0aDogMjNcbiAgICB9KTtcbiAgfVxuXG4gIHN0YXRpYyBidWlsZChpZDogc3RyaW5nLCBwcm9wcz86IFZwY1Byb3BzKTogKHNiOiBTdGFja0J1aWxkZXIpID0+IENvbnN0cnVjdCB7XG4gICAgcmV0dXJuIChzYjogU3RhY2tCdWlsZGVyKSA9PiB7XG4gICAgICByZXR1cm4gbmV3IHRoaXMoc2IuZ2V0U3RhY2soKSwgaWQsIHByb3BzKTtcbiAgICB9O1xuICB9XG4gIC8qKlxuICAgKiBJbXBvcnRzIGEgcHJlLWV4aXN0aW5nIFZQQyBSZXNvdXJjZSBpbnRvIHlvdXIgU3RhY2tcbiAgICpcbiAgICogQmVmb3JlIHVzaW5nIGFuIGltcG9ydCBtZXRob2QgZW5zdXJlIHlvdSBoYXZlIHNldCB0aGUgYWNjb3VudCBhbmQgcmVnaW9uIHByb3BzXG4gICAqICB3aGVuIGNyZWF0aW5nIHlvdXIgQXdzU3RhY2suXG4gICAqXG4gICAqIEBwYXJhbSBpZFxuICAgKiBAcGFyYW0gdnBjU3RhY2tOYW1lXG4gICAqIEByZXR1cm5zXG4gICAqL1xuICBzdGF0aWMgaW1wb3J0KFxuICAgIGlkOiBzdHJpbmcsXG4gICAgdnBjU3RhY2tOYW1lOiBzdHJpbmdcbiAgKTogKHNiOiBTdGFja0J1aWxkZXIpID0+IENvbnN0cnVjdCB7XG4gICAgcmV0dXJuIChzYjogU3RhY2tCdWlsZGVyKSA9PiB7XG4gICAgICByZXR1cm4gZWMyLlZwYy5mcm9tTG9va3VwKHNiLmdldFN0YWNrKCksIGlkLCB7XG4gICAgICAgIHZwY05hbWU6IGAke3ZwY1N0YWNrTmFtZX0vJHtpZH1gXG4gICAgICB9KTtcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { Alias, Key } from "aws-cdk-lib/aws-kms";
|
|
2
2
|
import { Construct } from "constructs";
|
|
3
|
-
import { KeyValue } from "../../../types";
|
|
4
3
|
interface CustomerManagedKeyProps {
|
|
5
4
|
description?: string;
|
|
6
5
|
aliasName?: string;
|
|
7
|
-
tags: KeyValue;
|
|
8
6
|
}
|
|
9
7
|
export declare class CustomerManagedKey extends Construct {
|
|
10
8
|
readonly key: Key;
|
|
@@ -4,7 +4,6 @@ exports.CustomerManagedKey = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const aws_kms_1 = require("aws-cdk-lib/aws-kms");
|
|
6
6
|
const constructs_1 = require("constructs");
|
|
7
|
-
const tagResource_1 = require("../../../utils/tagResource");
|
|
8
7
|
class CustomerManagedKey extends constructs_1.Construct {
|
|
9
8
|
constructor(scope, id, props) {
|
|
10
9
|
super(scope, id);
|
|
@@ -17,7 +16,6 @@ class CustomerManagedKey extends constructs_1.Construct {
|
|
|
17
16
|
value: this.key.keyArn,
|
|
18
17
|
exportName: `${id}KeyArn`
|
|
19
18
|
});
|
|
20
|
-
(0, tagResource_1.default)(this.key, props.tags);
|
|
21
19
|
this.alias = new aws_kms_1.Alias(this, `${id}KeyAlias`, {
|
|
22
20
|
aliasName: props.aliasName || `cmk/${id}`,
|
|
23
21
|
targetKey: this.key
|
|
@@ -27,8 +25,7 @@ class CustomerManagedKey extends constructs_1.Construct {
|
|
|
27
25
|
value: this.alias.aliasArn,
|
|
28
26
|
exportName: `${id}KeyAliasArn`
|
|
29
27
|
});
|
|
30
|
-
(0, tagResource_1.default)(this.alias, props.tags);
|
|
31
28
|
}
|
|
32
29
|
}
|
|
33
30
|
exports.CustomerManagedKey = CustomerManagedKey;
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3Mvc2VjcmV0cy9rbXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQXVEO0FBQ3ZELGlEQUFpRDtBQUNqRCwyQ0FBdUM7QUFRdkMsTUFBYSxrQkFBbUIsU0FBUSxzQkFBUztJQUkvQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQThCO1FBQ3RFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLGFBQUcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRTtZQUNuQyxXQUFXLEVBQUUsS0FBSyxDQUFDLFdBQVcsSUFBSSxHQUFHLEVBQUUsVUFBVTtZQUNqRCxhQUFhLEVBQUUsMkJBQWEsQ0FBQyxNQUFNO1NBQ3BDLENBQUMsQ0FBQztRQUNILElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRTtZQUNqQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEtBQUs7WUFDZixLQUFLLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNO1lBQ3RCLFVBQVUsRUFBRSxHQUFHLEVBQUUsUUFBUTtTQUMxQixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksZUFBSyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFO1lBQzVDLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUyxJQUFJLE9BQU8sRUFBRSxFQUFFO1lBQ3pDLFNBQVMsRUFBRSxJQUFJLENBQUMsR0FBRztTQUNwQixDQUFDLENBQUM7UUFDSCxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUU7WUFDdEMsR0FBRyxFQUFFLEdBQUcsRUFBRSxVQUFVO1lBQ3BCLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVE7WUFDMUIsVUFBVSxFQUFFLEdBQUcsRUFBRSxhQUFhO1NBQy9CLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQTNCRCxnREEyQkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDZm5PdXRwdXQsIFJlbW92YWxQb2xpY3kgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IEFsaWFzLCBLZXkgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWttc1wiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uLy4uL3R5cGVzXCI7XG5cbmludGVyZmFjZSBDdXN0b21lck1hbmFnZWRLZXlQcm9wcyB7XG4gIGRlc2NyaXB0aW9uPzogc3RyaW5nO1xuICBhbGlhc05hbWU/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBDdXN0b21lck1hbmFnZWRLZXkgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBwdWJsaWMgcmVhZG9ubHkga2V5OiBLZXk7XG4gIHB1YmxpYyByZWFkb25seSBhbGlhczogQWxpYXM7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IEN1c3RvbWVyTWFuYWdlZEtleVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIHRoaXMua2V5ID0gbmV3IEtleSh0aGlzLCBgJHtpZH1LZXlgLCB7XG4gICAgICBkZXNjcmlwdGlvbjogcHJvcHMuZGVzY3JpcHRpb24gfHwgYCR7aWR9IEtNUyBLZXlgLFxuICAgICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5SRVRBSU5cbiAgICB9KTtcbiAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIGAke2lkfUtleUFybmAsIHtcbiAgICAgIGtleTogYCR7aWR9QXJuYCxcbiAgICAgIHZhbHVlOiB0aGlzLmtleS5rZXlBcm4sXG4gICAgICBleHBvcnROYW1lOiBgJHtpZH1LZXlBcm5gXG4gICAgfSk7XG5cbiAgICB0aGlzLmFsaWFzID0gbmV3IEFsaWFzKHRoaXMsIGAke2lkfUtleUFsaWFzYCwge1xuICAgICAgYWxpYXNOYW1lOiBwcm9wcy5hbGlhc05hbWUgfHwgYGNtay8ke2lkfWAsXG4gICAgICB0YXJnZXRLZXk6IHRoaXMua2V5XG4gICAgfSk7XG4gICAgbmV3IENmbk91dHB1dCh0aGlzLCBgJHtpZH1LZXlBbGlhc0FybmAsIHtcbiAgICAgIGtleTogYCR7aWR9QWxpYXNBcm5gLFxuICAgICAgdmFsdWU6IHRoaXMuYWxpYXMuYWxpYXNBcm4sXG4gICAgICBleHBvcnROYW1lOiBgJHtpZH1LZXlBbGlhc0FybmBcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -27,8 +27,7 @@ class SecureStringParameter extends constructs_1.Construct {
|
|
|
27
27
|
else {
|
|
28
28
|
this.cmk = new _1.CustomerManagedKey(this, `${id}Key`, {
|
|
29
29
|
description: props.description || `${id} KMS Key`,
|
|
30
|
-
aliasName: props.aliasName
|
|
31
|
-
tags: props.tags
|
|
30
|
+
aliasName: props.aliasName
|
|
32
31
|
});
|
|
33
32
|
}
|
|
34
33
|
this.parameter = new awsCustomResource_1.AwsCustomResource(this, `${id}SecureStringParameter`, {
|
|
@@ -97,4 +96,4 @@ class SecureStringParameter extends constructs_1.Construct {
|
|
|
97
96
|
}
|
|
98
97
|
}
|
|
99
98
|
exports.SecureStringParameter = SecureStringParameter;
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/secrets/parameter.ts"],"names":[],"mappings":"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","sourcesContent":["import { aws_ssm as ssm } from \"aws-cdk-lib\";\nimport { PolicyStatement } from \"aws-cdk-lib/aws-iam\";\nimport {\n  AwsCustomResourcePolicy,\n  PhysicalResourceId\n} from \"aws-cdk-lib/custom-resources\";\nimport { Construct } from \"constructs\";\nimport { KeyValue } from \"../../../types\";\nimport { CustomerManagedKey } from \"./\";\nimport { AwsCustomResource } from \"../utilities/awsCustomResource\";\n\nexport class StringParameter extends ssm.StringParameter {\n  constructor(scope: Construct, id: string, props: ssm.StringParameterProps) {\n    super(scope, id, {\n      ...props,\n      description: props.description || `${id} SSM Parameter`,\n      tier: ssm.ParameterTier.INTELLIGENT_TIERING\n    });\n  }\n}\n\ninterface SecureStringParameterProps {\n  accountId: string;\n  aliasName?: string;\n  description?: string;\n  name: string;\n  overwrite?: boolean;\n  region: string;\n  tags: KeyValue;\n  value?: string;\n  cmk?: CustomerManagedKey;\n}\n\nexport class SecureStringParameter extends Construct {\n  public readonly cmk: CustomerManagedKey;\n  public readonly name: string;\n  public readonly parameter: AwsCustomResource;\n\n  constructor(scope: Construct, id: string, props: SecureStringParameterProps) {\n    super(scope, id);\n\n    this.name = props.name;\n\n    if (props.cmk) {\n      this.cmk = props.cmk;\n    } else {\n      this.cmk = new CustomerManagedKey(this, `${id}Key`, {\n        description: props.description || `${id} KMS Key`,\n        aliasName: props.aliasName\n      });\n    }\n\n    this.parameter = new AwsCustomResource(this, `${id}SecureStringParameter`, {\n      resourceType: \"Custom::SecureStringParameter\",\n      functionName: `${id}SecureStringParameter`,\n      onCreate: {\n        service: \"@aws-sdk/client-ssm\",\n        action: \"PutParameter\",\n        parameters: {\n          Name: props.name,\n          Description: props.description || `${id} secure parameter`,\n          Value:\n            props.value || process.env.CDK_SECURE_STRING || \"placeholderValue\",\n          Type: \"SecureString\",\n          KeyId: this.cmk.alias.keyId\n          // TODO: Add tags to the parameter\n        },\n        physicalResourceId: PhysicalResourceId.of(\"createSecureStringParameter\")\n      },\n      onUpdate: {\n        service: \"@aws-sdk/client-ssm\",\n        action: \"PutParameter\",\n        parameters: {\n          Name: props.name,\n          Description: props.description || `${id} secure parameter`,\n          Value:\n            props.value ||\n            `process.env.CDK_SECURE_STRING_${id}` ||\n            \"placeholderValue\",\n          Overwrite: props.overwrite,\n          Type: \"SecureString\",\n          KeyId: this.cmk.alias.keyId\n          // TODO: Add tags to the parameter\n        },\n        physicalResourceId: PhysicalResourceId.of(\"updateSecureStringParameter\")\n      },\n      onDelete: {\n        service: \"@aws-sdk/client-ssm\",\n        action: \"DeleteParameter\",\n        parameters: {\n          Name: props.name\n        }\n      },\n      policy: AwsCustomResourcePolicy.fromStatements([\n        new PolicyStatement({\n          actions: [\"kms:Encrypt\"],\n          resources: [\n            `arn:aws:kms:${props.region}:${props.accountId}:key/${this.cmk.key.keyId}`\n          ]\n        }),\n        new PolicyStatement({\n          actions: [\n            \"ssm:DeleteParameter\",\n            \"ssm:PutParameter\",\n            \"ssm:AddTagsToResource\",\n            \"logs:DeleteRetentionPolicy\",\n            \"logs:PutRetentionPolicy\"\n          ],\n          resources: [\n            `arn:aws:ssm:${props.region}:${props.accountId}:parameter${props.name}`\n          ]\n        })\n      ])\n    });\n\n    if (!props.cmk) {\n      this.parameter.node.addDependency(this.cmk);\n    }\n  }\n}\n"]}
|
|
@@ -3,7 +3,6 @@ import { Secret as CdkSecret, SecretStringGenerator } from "aws-cdk-lib/aws-secr
|
|
|
3
3
|
import { Construct } from "constructs";
|
|
4
4
|
import { StackBuilder } from "../base/awsStack";
|
|
5
5
|
import { CustomerManagedKey } from "./kms";
|
|
6
|
-
import { KeyValue } from "../../../types";
|
|
7
6
|
interface SecretProps {
|
|
8
7
|
secretName: string;
|
|
9
8
|
secretObjectValue?: {
|
|
@@ -13,7 +12,6 @@ interface SecretProps {
|
|
|
13
12
|
description?: string;
|
|
14
13
|
aliasName?: string;
|
|
15
14
|
generateSecretString?: SecretStringGenerator;
|
|
16
|
-
tags: KeyValue;
|
|
17
15
|
}
|
|
18
16
|
export type SecretImport = {
|
|
19
17
|
/**
|
|
@@ -4,15 +4,13 @@ exports.Secret = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const aws_secretsmanager_1 = require("aws-cdk-lib/aws-secretsmanager");
|
|
6
6
|
const constructs_1 = require("constructs");
|
|
7
|
-
const tagResource_1 = require("../../../utils/tagResource");
|
|
8
7
|
const kms_1 = require("./kms");
|
|
9
8
|
class Secret extends constructs_1.Construct {
|
|
10
9
|
constructor(scope, id, props) {
|
|
11
10
|
super(scope, id);
|
|
12
11
|
this.id = id;
|
|
13
12
|
this.secretsCustomerManagedKey = new kms_1.CustomerManagedKey(this, `${id}CustomerManagedKey`, {
|
|
14
|
-
aliasName: `cmk/${id}
|
|
15
|
-
tags: props.tags
|
|
13
|
+
aliasName: `cmk/${id}`
|
|
16
14
|
});
|
|
17
15
|
/**
|
|
18
16
|
* If a secretStringValue is provided, use it to create the secret.
|
|
@@ -39,7 +37,6 @@ class Secret extends constructs_1.Construct {
|
|
|
39
37
|
...generateSecretString
|
|
40
38
|
};
|
|
41
39
|
this.secret = new aws_secretsmanager_1.Secret(this, `${id}Secret`, secretOptions);
|
|
42
|
-
(0, tagResource_1.default)(this.secret, props.tags);
|
|
43
40
|
}
|
|
44
41
|
getImport(secretField) {
|
|
45
42
|
return {
|
|
@@ -58,4 +55,4 @@ class Secret extends constructs_1.Construct {
|
|
|
58
55
|
}
|
|
59
56
|
}
|
|
60
57
|
exports.Secret = Secret;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjcmV0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3Mvc2VjcmV0cy9zZWNyZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQTBDO0FBQzFDLHVFQUd3QztBQUN4QywyQ0FBdUM7QUFHdkMsK0JBQTJDO0FBOEIzQyxNQUFhLE1BQU8sU0FBUSxzQkFBUztJQUtuQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWtCO1FBQzFELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFakIsSUFBSSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7UUFFYixJQUFJLENBQUMseUJBQXlCLEdBQUcsSUFBSSx3QkFBa0IsQ0FDckQsSUFBSSxFQUNKLEdBQUcsRUFBRSxvQkFBb0IsRUFDekI7WUFDRSxTQUFTLEVBQUUsT0FBTyxFQUFFLEVBQUU7U0FDdkIsQ0FDRixDQUFDO1FBRUY7O1dBRUc7UUFDSCxNQUFNLGlCQUFpQixHQUFHLEtBQUssQ0FBQyxpQkFBaUI7WUFDL0MsQ0FBQyxDQUFDO2dCQUNFLGlCQUFpQixFQUFFLHlCQUFXLENBQUMsZUFBZSxDQUM1QyxLQUFLLENBQUMsaUJBQWlCLElBQUksRUFBRSxDQUM5QjthQUNGO1lBQ0gsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUVQOzs7V0FHRztRQUNILE1BQU0sb0JBQW9CLEdBQ3hCLENBQUMsS0FBSyxDQUFDLGlCQUFpQixJQUFJLEtBQUssQ0FBQyxvQkFBb0I7WUFDcEQsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLEVBQUUsS0FBSyxDQUFDLG9CQUFvQixFQUFFO1lBQ3RELENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFVCwyQ0FBMkM7UUFDM0MsTUFBTSxhQUFhLEdBQUc7WUFDcEIsVUFBVSxFQUFFLEtBQUssQ0FBQyxVQUFVO1lBQzVCLGlCQUFpQixFQUFFLEtBQUssQ0FBQyxpQkFBaUI7WUFDMUMsYUFBYSxFQUFFLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHO1lBQ2pELFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVztZQUM5QixHQUFHLGlCQUFpQjtZQUNwQixHQUFHLG9CQUFvQjtTQUN4QixDQUFDO1FBRUYsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLDJCQUFTLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFFbEUsQ0FBQztJQUVELFNBQVMsQ0FBQyxXQUFvQjtRQUM1QixPQUFPO1lBQ0wsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLEVBQUUsUUFBUTtZQUN0QixJQUFJLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVO1lBQzVCLEtBQUssRUFBRSxXQUFXO1NBQ25CLENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQUssQ0FDVixFQUFVLEVBQ1YsS0FBa0I7UUFFbEIsT0FBTyxDQUFDLEVBQWdCLEVBQUUsRUFBRTtZQUMxQixNQUFNLFFBQVEsR0FBZ0I7Z0JBQzVCLEdBQUcsS0FBSzthQUNULENBQUM7WUFDRixPQUFPLElBQUksSUFBSSxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDL0MsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBdkVELHdCQXVFQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFNlY3JldFZhbHVlIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQge1xuICBTZWNyZXQgYXMgQ2RrU2VjcmV0LFxuICBTZWNyZXRTdHJpbmdHZW5lcmF0b3Jcbn0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1zZWNyZXRzbWFuYWdlclwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB0YWdSZXNvdXJjZSBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvdGFnUmVzb3VyY2VcIjtcbmltcG9ydCB7IFN0YWNrQnVpbGRlciB9IGZyb20gXCIuLi9iYXNlL2F3c1N0YWNrXCI7XG5pbXBvcnQgeyBDdXN0b21lck1hbmFnZWRLZXkgfSBmcm9tIFwiLi9rbXNcIjtcbmltcG9ydCB7IEtleVZhbHVlIH0gZnJvbSBcIi4uLy4uLy4uL3R5cGVzXCI7XG5cbmludGVyZmFjZSBTZWNyZXRQcm9wcyB7XG4gIHNlY3JldE5hbWU6IHN0cmluZztcbiAgc2VjcmV0T2JqZWN0VmFsdWU/OiB7XG4gICAgW2tleTogc3RyaW5nXTogU2VjcmV0VmFsdWU7XG4gIH07XG4gIHNlY3JldFN0cmluZ1ZhbHVlPzogc3RyaW5nO1xuICBkZXNjcmlwdGlvbj86IHN0cmluZztcbiAgYWxpYXNOYW1lPzogc3RyaW5nO1xuICBnZW5lcmF0ZVNlY3JldFN0cmluZz86IFNlY3JldFN0cmluZ0dlbmVyYXRvcjtcbn1cblxuZXhwb3J0IHR5cGUgU2VjcmV0SW1wb3J0ID0ge1xuICAvKipcbiAgICogU2VjcmV0IElEXG4gICAqL1xuICBpZDogc3RyaW5nO1xuICAvKipcbiAgICogU2VjcmV0IG5hbWVcbiAgICovXG4gIG5hbWU6IHN0cmluZztcblxuICAvKipcbiAgICogT3B0aW9uYWwgLSBtYXkgYmUgdXNlZCB0byBpbXBvcnQgYSBzcGVjaWZpYyBmaWVsZCBmcm9tIHRoZSBzZWNyZXRcbiAgICovXG4gIGZpZWxkPzogc3RyaW5nO1xufTtcblxuZXhwb3J0IGNsYXNzIFNlY3JldCBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyBpZDogc3RyaW5nO1xuICBwdWJsaWMgcmVhZG9ubHkgc2VjcmV0OiBDZGtTZWNyZXQ7XG4gIHB1YmxpYyByZWFkb25seSBzZWNyZXRzQ3VzdG9tZXJNYW5hZ2VkS2V5OiBDdXN0b21lck1hbmFnZWRLZXk7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFNlY3JldFByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIHRoaXMuaWQgPSBpZDtcblxuICAgIHRoaXMuc2VjcmV0c0N1c3RvbWVyTWFuYWdlZEtleSA9IG5ldyBDdXN0b21lck1hbmFnZWRLZXkoXG4gICAgICB0aGlzLFxuICAgICAgYCR7aWR9Q3VzdG9tZXJNYW5hZ2VkS2V5YCxcbiAgICAgIHtcbiAgICAgICAgYWxpYXNOYW1lOiBgY21rLyR7aWR9YFxuICAgICAgfVxuICAgICk7XG5cbiAgICAvKipcbiAgICAgKiBJZiBhIHNlY3JldFN0cmluZ1ZhbHVlIGlzIHByb3ZpZGVkLCB1c2UgaXQgdG8gY3JlYXRlIHRoZSBzZWNyZXQuXG4gICAgICovXG4gICAgY29uc3Qgc2VjcmV0U3RyaW5nVmFsdWUgPSBwcm9wcy5zZWNyZXRTdHJpbmdWYWx1ZVxuICAgICAgPyB7XG4gICAgICAgICAgc2VjcmV0U3RyaW5nVmFsdWU6IFNlY3JldFZhbHVlLnVuc2FmZVBsYWluVGV4dChcbiAgICAgICAgICAgIHByb3BzLnNlY3JldFN0cmluZ1ZhbHVlIHx8IFwiXCJcbiAgICAgICAgICApXG4gICAgICAgIH1cbiAgICAgIDoge307XG5cbiAgICAvKipcbiAgICAgKiBJZiBhIGdlbmVyYXRlU2VjcmV0U3RyaW5nIGlzIHByb3ZpZGVkLCB1c2UgaXQgdG8gY3JlYXRlIHRoZSBzZWNyZXQuXG4gICAgICogSWYgYSBzZWNyZXRTdHJpbmdWYWx1ZSBpcyBwcm92aWRlZCwgaWdub3JlIHRoZSBnZW5lcmF0ZVNlY3JldFN0cmluZy5cbiAgICAgKi9cbiAgICBjb25zdCBnZW5lcmF0ZVNlY3JldFN0cmluZyA9XG4gICAgICAhcHJvcHMuc2VjcmV0U3RyaW5nVmFsdWUgJiYgcHJvcHMuZ2VuZXJhdGVTZWNyZXRTdHJpbmdcbiAgICAgICAgPyB7IGdlbmVyYXRlU2VjcmV0U3RyaW5nOiBwcm9wcy5nZW5lcmF0ZVNlY3JldFN0cmluZyB9XG4gICAgICAgIDoge307XG5cbiAgICAvLyBDb25zdHJ1Y3QgdGhlIGJhc2Ugb3B0aW9ucyBmb3IgQ2RrU2VjcmV0XG4gICAgY29uc3Qgc2VjcmV0T3B0aW9ucyA9IHtcbiAgICAgIHNlY3JldE5hbWU6IHByb3BzLnNlY3JldE5hbWUsXG4gICAgICBzZWNyZXRPYmplY3RWYWx1ZTogcHJvcHMuc2VjcmV0T2JqZWN0VmFsdWUsXG4gICAgICBlbmNyeXB0aW9uS2V5OiB0aGlzLnNlY3JldHNDdXN0b21lck1hbmFnZWRLZXkua2V5LFxuICAgICAgZGVzY3JpcHRpb246IHByb3BzLmRlc2NyaXB0aW9uLFxuICAgICAgLi4uc2VjcmV0U3RyaW5nVmFsdWUsXG4gICAgICAuLi5nZW5lcmF0ZVNlY3JldFN0cmluZ1xuICAgIH07XG5cbiAgICB0aGlzLnNlY3JldCA9IG5ldyBDZGtTZWNyZXQodGhpcywgYCR7aWR9U2VjcmV0YCwgc2VjcmV0T3B0aW9ucyk7XG5cbiAgfVxuXG4gIGdldEltcG9ydChzZWNyZXRGaWVsZD86IHN0cmluZyk6IFNlY3JldEltcG9ydCB7XG4gICAgcmV0dXJuIHtcbiAgICAgIGlkOiBgJHt0aGlzLmlkfVNlY3JldGAsXG4gICAgICBuYW1lOiB0aGlzLnNlY3JldC5zZWNyZXROYW1lLFxuICAgICAgZmllbGQ6IHNlY3JldEZpZWxkXG4gICAgfTtcbiAgfVxuXG4gIHN0YXRpYyBidWlsZChcbiAgICBpZDogc3RyaW5nLFxuICAgIHByb3BzOiBTZWNyZXRQcm9wc1xuICApOiAoc2I6IFN0YWNrQnVpbGRlcikgPT4gQ29uc3RydWN0IHtcbiAgICByZXR1cm4gKHNiOiBTdGFja0J1aWxkZXIpID0+IHtcbiAgICAgIGNvbnN0IG5ld1Byb3BzOiBTZWNyZXRQcm9wcyA9IHtcbiAgICAgICAgLi4ucHJvcHNcbiAgICAgIH07XG4gICAgICByZXR1cm4gbmV3IHRoaXMoc2IuZ2V0U3RhY2soKSwgaWQsIG5ld1Byb3BzKTtcbiAgICB9O1xuICB9XG59XG4iXX0=
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { Stack } from "aws-cdk-lib";
|
|
2
2
|
import { Project, ProjectProps } from "aws-cdk-lib/aws-codebuild";
|
|
3
3
|
import { Construct } from "constructs";
|
|
4
|
-
import { KeyValue } from "../../../types";
|
|
5
4
|
interface CodeBuildProps extends ProjectProps {
|
|
6
|
-
tags: KeyValue;
|
|
7
5
|
}
|
|
8
6
|
export declare class CodeBuildProject extends Construct {
|
|
9
7
|
readonly project: Project;
|