@fjall/components-infrastructure 0.77.4 → 0.78.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/app.d.ts +8 -5
- package/dist/lib/app.js +19 -7
- package/dist/lib/patterns/aws/buildkite.js +4 -7
- package/dist/lib/patterns/aws/compute.d.ts +479 -48
- package/dist/lib/patterns/aws/compute.js +307 -94
- package/dist/lib/patterns/aws/database.d.ts +1 -0
- package/dist/lib/patterns/aws/database.js +4 -1
- package/dist/lib/patterns/aws/hostedZone.js +4 -7
- package/dist/lib/patterns/aws/loadBalancer.d.ts +163 -0
- package/dist/lib/patterns/aws/loadBalancer.js +278 -0
- package/dist/lib/patterns/aws/network.d.ts +1 -0
- package/dist/lib/patterns/aws/network.js +2 -1
- package/dist/lib/resources/aws/compute/capacityProviderDrainWaiter.d.ts +20 -0
- package/dist/lib/resources/aws/compute/capacityProviderDrainWaiter.js +180 -0
- package/dist/lib/resources/aws/compute/ecs.d.ts +294 -57
- package/dist/lib/resources/aws/compute/ecs.js +745 -261
- package/dist/lib/resources/aws/compute/ecsFreeTier.js +1 -1
- package/dist/lib/resources/aws/compute/ecsSpot.js +1 -1
- package/dist/lib/resources/aws/compute/utilities/capacityProviderDrainWaiter.d.ts +20 -0
- package/dist/lib/resources/aws/compute/utilities/capacityProviderDrainWaiter.js +180 -0
- package/dist/lib/resources/aws/database/rdsAurora.d.ts +1 -0
- package/dist/lib/resources/aws/database/rdsAurora.js +2 -2
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.d.ts +1 -0
- package/dist/lib/resources/aws/database/rdsAuroraGlobal.js +2 -1
- package/dist/lib/resources/aws/database/rdsDeletionWaiter.d.ts +33 -0
- package/dist/lib/resources/aws/database/rdsDeletionWaiter.js +74 -0
- package/dist/lib/resources/aws/database/rdsInstance.d.ts +1 -0
- package/dist/lib/resources/aws/database/rdsInstance.js +3 -3
- package/dist/lib/resources/aws/networking/vpc.d.ts +1 -0
- package/dist/lib/resources/aws/networking/vpc.js +4 -3
- package/dist/lib/resources/aws/networking/vpcEndpoint.d.ts +2 -2
- package/dist/lib/resources/aws/networking/vpcEndpoint.js +1 -1
- package/dist/lib/resources/aws/networking/vpcEndpoints.d.ts +71 -0
- package/dist/lib/resources/aws/networking/vpcEndpoints.js +125 -0
- package/dist/lib/resources/aws/secrets/kms.d.ts +14 -0
- package/dist/lib/resources/aws/secrets/kms.js +5 -2
- package/dist/lib/resources/aws/secrets/secret.js +1 -1
- package/dist/lib/utils/standardTagsAspect.d.ts +26 -12
- package/dist/lib/utils/standardTagsAspect.js +67 -477
- package/dist/lib/utils/tagResource.d.ts +18 -3
- package/dist/lib/utils/tagResource.js +23 -6
- package/package.json +3 -3
- package/dist/lib/aspects/resourceInventory.d.ts +0 -41
- package/dist/lib/aspects/resourceInventory.js +0 -56
- package/dist/lib/config/audit.d.ts +0 -18
- package/dist/lib/config/audit.js +0 -22
- package/dist/lib/patterns/aws/auditRole.d.ts +0 -44
- package/dist/lib/patterns/aws/auditRole.js +0 -58
- package/dist/lib/patterns/aws/basicApp.d.ts +0 -0
- package/dist/lib/patterns/aws/basicApp.js +0 -150
- package/dist/lib/patterns/aws/ec2.d.ts +0 -43
- package/dist/lib/patterns/aws/ec2.js +0 -123
- package/dist/lib/patterns/aws/freeTierApp.d.ts +0 -44
- package/dist/lib/patterns/aws/freeTierApp.js +0 -83
- package/dist/lib/patterns/aws/spotInstanceApp.d.ts +0 -45
- package/dist/lib/patterns/aws/spotInstanceApp.js +0 -85
- package/dist/lib/resources/aws/audit/auditRole.d.ts +0 -32
- package/dist/lib/resources/aws/audit/auditRole.js +0 -46
- package/dist/lib/resources/aws/database/databaseFreeTier.d.ts +0 -15
- package/dist/lib/resources/aws/database/databaseFreeTier.js +0 -29
- package/dist/lib/resources/aws/database/rdsFreeTier.d.ts +0 -37
- package/dist/lib/resources/aws/database/rdsFreeTier.js +0 -84
- package/dist/lib/utils/getCidr.d.ts +0 -8
- package/dist/lib/utils/getCidr.js +0 -40
|
@@ -1,8 +1,23 @@
|
|
|
1
1
|
import { type IConstruct } from "constructs";
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
* Apply tags directly to a specific resource.
|
|
4
|
+
*
|
|
5
|
+
* This uses CDK's native Tags.of().add() API which:
|
|
6
|
+
* - Properly merges with existing tags from L2 constructs
|
|
7
|
+
* - Works regardless of when it's called during construction
|
|
8
|
+
* - Applies tags to the resource and all its children
|
|
9
|
+
*
|
|
10
|
+
* Use this for resources that need specific tags beyond the standard Fjall tags,
|
|
11
|
+
* like VPC IPAM pool tags or resource-specific metadata.
|
|
12
|
+
*
|
|
13
|
+
* @param resource - The construct to tag
|
|
14
|
+
* @param tags - Key-value pairs of tags to apply
|
|
15
|
+
*
|
|
16
|
+
* @example
|
|
17
|
+
* // Apply specific tags to a resource
|
|
18
|
+
* tagResource(myVpc, {
|
|
19
|
+
* "fjall:operations:pool": "pool-123"
|
|
20
|
+
* });
|
|
6
21
|
*/
|
|
7
22
|
export default function tagResource(resource: IConstruct, tags: {
|
|
8
23
|
[key: string]: string;
|
|
@@ -1,13 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = tagResource;
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
4
5
|
/**
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
6
|
+
* Apply tags directly to a specific resource.
|
|
7
|
+
*
|
|
8
|
+
* This uses CDK's native Tags.of().add() API which:
|
|
9
|
+
* - Properly merges with existing tags from L2 constructs
|
|
10
|
+
* - Works regardless of when it's called during construction
|
|
11
|
+
* - Applies tags to the resource and all its children
|
|
12
|
+
*
|
|
13
|
+
* Use this for resources that need specific tags beyond the standard Fjall tags,
|
|
14
|
+
* like VPC IPAM pool tags or resource-specific metadata.
|
|
15
|
+
*
|
|
16
|
+
* @param resource - The construct to tag
|
|
17
|
+
* @param tags - Key-value pairs of tags to apply
|
|
18
|
+
*
|
|
19
|
+
* @example
|
|
20
|
+
* // Apply specific tags to a resource
|
|
21
|
+
* tagResource(myVpc, {
|
|
22
|
+
* "fjall:operations:pool": "pool-123"
|
|
23
|
+
* });
|
|
8
24
|
*/
|
|
9
25
|
function tagResource(resource, tags) {
|
|
10
|
-
|
|
11
|
-
|
|
26
|
+
Object.entries(tags).forEach(([key, value]) => {
|
|
27
|
+
aws_cdk_lib_1.Tags.of(resource).add(key, value);
|
|
28
|
+
});
|
|
12
29
|
}
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnUmVzb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvdGFnUmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUF1QkEsOEJBT0M7QUE5QkQsNkNBQW1DO0FBR25DOzs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBbUJHO0FBQ0gsU0FBd0IsV0FBVyxDQUNqQyxRQUFvQixFQUNwQixJQUErQjtJQUUvQixNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7UUFDNUMsa0JBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNwQyxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUYWdzIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyB0eXBlIElDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG4vKipcbiAqIEFwcGx5IHRhZ3MgZGlyZWN0bHkgdG8gYSBzcGVjaWZpYyByZXNvdXJjZS5cbiAqXG4gKiBUaGlzIHVzZXMgQ0RLJ3MgbmF0aXZlIFRhZ3Mub2YoKS5hZGQoKSBBUEkgd2hpY2g6XG4gKiAtIFByb3Blcmx5IG1lcmdlcyB3aXRoIGV4aXN0aW5nIHRhZ3MgZnJvbSBMMiBjb25zdHJ1Y3RzXG4gKiAtIFdvcmtzIHJlZ2FyZGxlc3Mgb2Ygd2hlbiBpdCdzIGNhbGxlZCBkdXJpbmcgY29uc3RydWN0aW9uXG4gKiAtIEFwcGxpZXMgdGFncyB0byB0aGUgcmVzb3VyY2UgYW5kIGFsbCBpdHMgY2hpbGRyZW5cbiAqXG4gKiBVc2UgdGhpcyBmb3IgcmVzb3VyY2VzIHRoYXQgbmVlZCBzcGVjaWZpYyB0YWdzIGJleW9uZCB0aGUgc3RhbmRhcmQgRmphbGwgdGFncyxcbiAqIGxpa2UgVlBDIElQQU0gcG9vbCB0YWdzIG9yIHJlc291cmNlLXNwZWNpZmljIG1ldGFkYXRhLlxuICpcbiAqIEBwYXJhbSByZXNvdXJjZSAtIFRoZSBjb25zdHJ1Y3QgdG8gdGFnXG4gKiBAcGFyYW0gdGFncyAtIEtleS12YWx1ZSBwYWlycyBvZiB0YWdzIHRvIGFwcGx5XG4gKlxuICogQGV4YW1wbGVcbiAqIC8vIEFwcGx5IHNwZWNpZmljIHRhZ3MgdG8gYSByZXNvdXJjZVxuICogdGFnUmVzb3VyY2UobXlWcGMsIHtcbiAqICAgXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIjogXCJwb29sLTEyM1wiXG4gKiB9KTtcbiAqL1xuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdGFnUmVzb3VyY2UoXG4gIHJlc291cmNlOiBJQ29uc3RydWN0LFxuICB0YWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9XG4pOiB2b2lkIHtcbiAgT2JqZWN0LmVudHJpZXModGFncykuZm9yRWFjaCgoW2tleSwgdmFsdWVdKSA9PiB7XG4gICAgVGFncy5vZihyZXNvdXJjZSkuYWRkKGtleSwgdmFsdWUpO1xuICB9KTtcbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.78.5",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@aws-sdk/client-organizations": "^3.716.0",
|
|
38
|
-
"@fjall/util": "^0.
|
|
38
|
+
"@fjall/util": "^0.78.5",
|
|
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": "d8d1590fa29c852b5d26ebc4cc1da21ab86b686a",
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"aws-cdk": "^2.206.0",
|
|
50
50
|
"aws-cdk-lib": "^2.206.0",
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
import { IAspect } from "aws-cdk-lib";
|
|
2
|
-
import { IConstruct } from "constructs";
|
|
3
|
-
/**
|
|
4
|
-
* Resource metadata extracted from CDK constructs
|
|
5
|
-
*/
|
|
6
|
-
export interface ResourceMetadata {
|
|
7
|
-
resource_type: string;
|
|
8
|
-
name: string;
|
|
9
|
-
stack_name: string;
|
|
10
|
-
}
|
|
11
|
-
/**
|
|
12
|
-
* Complete resource inventory for an application
|
|
13
|
-
*/
|
|
14
|
-
export interface ResourceInventory {
|
|
15
|
-
resources: ResourceMetadata[];
|
|
16
|
-
generated_at: string;
|
|
17
|
-
app_name: string;
|
|
18
|
-
}
|
|
19
|
-
/**
|
|
20
|
-
* Aspect to collect resource metadata during CDK synthesis.
|
|
21
|
-
* Visits all constructs in the tree and extracts metadata for AWS resources.
|
|
22
|
-
*
|
|
23
|
-
* Usage:
|
|
24
|
-
* const aspect = new ResourceInventoryAspect();
|
|
25
|
-
* Aspects.of(app).add(aspect);
|
|
26
|
-
* app.synth();
|
|
27
|
-
* const inventory = aspect.getInventory();
|
|
28
|
-
*/
|
|
29
|
-
export declare class ResourceInventoryAspect implements IAspect {
|
|
30
|
-
private resources;
|
|
31
|
-
private processedResources;
|
|
32
|
-
visit(node: IConstruct): void;
|
|
33
|
-
/**
|
|
34
|
-
* Extract metadata from a CloudFormation resource
|
|
35
|
-
*/
|
|
36
|
-
private extractMetadata;
|
|
37
|
-
/**
|
|
38
|
-
* Get collected resource inventory
|
|
39
|
-
*/
|
|
40
|
-
getInventory(): ResourceMetadata[];
|
|
41
|
-
}
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ResourceInventoryAspect = void 0;
|
|
4
|
-
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
-
/**
|
|
6
|
-
* Aspect to collect resource metadata during CDK synthesis.
|
|
7
|
-
* Visits all constructs in the tree and extracts metadata for AWS resources.
|
|
8
|
-
*
|
|
9
|
-
* Usage:
|
|
10
|
-
* const aspect = new ResourceInventoryAspect();
|
|
11
|
-
* Aspects.of(app).add(aspect);
|
|
12
|
-
* app.synth();
|
|
13
|
-
* const inventory = aspect.getInventory();
|
|
14
|
-
*/
|
|
15
|
-
class ResourceInventoryAspect {
|
|
16
|
-
constructor() {
|
|
17
|
-
this.resources = [];
|
|
18
|
-
this.processedResources = new WeakSet();
|
|
19
|
-
}
|
|
20
|
-
visit(node) {
|
|
21
|
-
// Skip if already processed
|
|
22
|
-
if (this.processedResources.has(node)) {
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
// Only process L1 (CFN) resources
|
|
26
|
-
if (aws_cdk_lib_1.CfnResource.isCfnResource(node)) {
|
|
27
|
-
const metadata = this.extractMetadata(node);
|
|
28
|
-
if (metadata) {
|
|
29
|
-
this.resources.push(metadata);
|
|
30
|
-
}
|
|
31
|
-
this.processedResources.add(node);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
/**
|
|
35
|
-
* Extract metadata from a CloudFormation resource
|
|
36
|
-
*/
|
|
37
|
-
extractMetadata(resource) {
|
|
38
|
-
const resourceType = resource.cfnResourceType;
|
|
39
|
-
const stack = aws_cdk_lib_1.Stack.of(resource);
|
|
40
|
-
const logicalId = stack.getLogicalId(resource);
|
|
41
|
-
const stackName = stack.stackName;
|
|
42
|
-
return {
|
|
43
|
-
resource_type: resourceType,
|
|
44
|
-
name: logicalId,
|
|
45
|
-
stack_name: stackName
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
/**
|
|
49
|
-
* Get collected resource inventory
|
|
50
|
-
*/
|
|
51
|
-
getInventory() {
|
|
52
|
-
return this.resources;
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
exports.ResourceInventoryAspect = ResourceInventoryAspect;
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb3VyY2VJbnZlbnRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvYXNwZWN0cy9yZXNvdXJjZUludmVudG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBMEQ7QUFxQjFEOzs7Ozs7Ozs7R0FTRztBQUNILE1BQWEsdUJBQXVCO0lBQXBDO1FBQ1UsY0FBUyxHQUF1QixFQUFFLENBQUM7UUFDbkMsdUJBQWtCLEdBQUcsSUFBSSxPQUFPLEVBQWMsQ0FBQztJQXdDekQsQ0FBQztJQXRDQyxLQUFLLENBQUMsSUFBZ0I7UUFDcEIsNEJBQTRCO1FBQzVCLElBQUksSUFBSSxDQUFDLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3RDLE9BQU87UUFDVCxDQUFDO1FBRUQsa0NBQWtDO1FBQ2xDLElBQUkseUJBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQW1CLENBQUMsQ0FBQztZQUMzRCxJQUFJLFFBQVEsRUFBRSxDQUFDO2dCQUNiLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ2hDLENBQUM7WUFDRCxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BDLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSyxlQUFlLENBQUMsUUFBcUI7UUFDM0MsTUFBTSxZQUFZLEdBQUcsUUFBUSxDQUFDLGVBQWUsQ0FBQztRQUM5QyxNQUFNLEtBQUssR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNqQyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQyxTQUFTLENBQUM7UUFFbEMsT0FBTztZQUNMLGFBQWEsRUFBRSxZQUFZO1lBQzNCLElBQUksRUFBRSxTQUFTO1lBQ2YsVUFBVSxFQUFFLFNBQVM7U0FDdEIsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3hCLENBQUM7Q0FDRjtBQTFDRCwwREEwQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJQXNwZWN0LCBDZm5SZXNvdXJjZSwgU3RhY2sgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7IElDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG4vKipcbiAqIFJlc291cmNlIG1ldGFkYXRhIGV4dHJhY3RlZCBmcm9tIENESyBjb25zdHJ1Y3RzXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgUmVzb3VyY2VNZXRhZGF0YSB7XG4gIHJlc291cmNlX3R5cGU6IHN0cmluZzsgLy8gZS5nLiwgQVdTOjpTMzo6QnVja2V0LCBBV1M6OkVDUzo6U2VydmljZSwgQ3VzdG9tOjpDb21wdXRlXG4gIG5hbWU6IHN0cmluZzsgLy8gTG9naWNhbCBJRCBmcm9tIGNvbnN0cnVjdFxuICBzdGFja19uYW1lOiBzdHJpbmc7IC8vIFdoaWNoIHN0YWNrIChOZXR3b3JrL1N0b3JhZ2UvQ29tcHV0ZSlcbn1cblxuLyoqXG4gKiBDb21wbGV0ZSByZXNvdXJjZSBpbnZlbnRvcnkgZm9yIGFuIGFwcGxpY2F0aW9uXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgUmVzb3VyY2VJbnZlbnRvcnkge1xuICByZXNvdXJjZXM6IFJlc291cmNlTWV0YWRhdGFbXTtcbiAgZ2VuZXJhdGVkX2F0OiBzdHJpbmc7XG4gIGFwcF9uYW1lOiBzdHJpbmc7XG59XG5cbi8qKlxuICogQXNwZWN0IHRvIGNvbGxlY3QgcmVzb3VyY2UgbWV0YWRhdGEgZHVyaW5nIENESyBzeW50aGVzaXMuXG4gKiBWaXNpdHMgYWxsIGNvbnN0cnVjdHMgaW4gdGhlIHRyZWUgYW5kIGV4dHJhY3RzIG1ldGFkYXRhIGZvciBBV1MgcmVzb3VyY2VzLlxuICpcbiAqIFVzYWdlOlxuICogICBjb25zdCBhc3BlY3QgPSBuZXcgUmVzb3VyY2VJbnZlbnRvcnlBc3BlY3QoKTtcbiAqICAgQXNwZWN0cy5vZihhcHApLmFkZChhc3BlY3QpO1xuICogICBhcHAuc3ludGgoKTtcbiAqICAgY29uc3QgaW52ZW50b3J5ID0gYXNwZWN0LmdldEludmVudG9yeSgpO1xuICovXG5leHBvcnQgY2xhc3MgUmVzb3VyY2VJbnZlbnRvcnlBc3BlY3QgaW1wbGVtZW50cyBJQXNwZWN0IHtcbiAgcHJpdmF0ZSByZXNvdXJjZXM6IFJlc291cmNlTWV0YWRhdGFbXSA9IFtdO1xuICBwcml2YXRlIHByb2Nlc3NlZFJlc291cmNlcyA9IG5ldyBXZWFrU2V0PElDb25zdHJ1Y3Q+KCk7XG5cbiAgdmlzaXQobm9kZTogSUNvbnN0cnVjdCk6IHZvaWQge1xuICAgIC8vIFNraXAgaWYgYWxyZWFkeSBwcm9jZXNzZWRcbiAgICBpZiAodGhpcy5wcm9jZXNzZWRSZXNvdXJjZXMuaGFzKG5vZGUpKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgLy8gT25seSBwcm9jZXNzIEwxIChDRk4pIHJlc291cmNlc1xuICAgIGlmIChDZm5SZXNvdXJjZS5pc0NmblJlc291cmNlKG5vZGUpKSB7XG4gICAgICBjb25zdCBtZXRhZGF0YSA9IHRoaXMuZXh0cmFjdE1ldGFkYXRhKG5vZGUgYXMgQ2ZuUmVzb3VyY2UpO1xuICAgICAgaWYgKG1ldGFkYXRhKSB7XG4gICAgICAgIHRoaXMucmVzb3VyY2VzLnB1c2gobWV0YWRhdGEpO1xuICAgICAgfVxuICAgICAgdGhpcy5wcm9jZXNzZWRSZXNvdXJjZXMuYWRkKG5vZGUpO1xuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBFeHRyYWN0IG1ldGFkYXRhIGZyb20gYSBDbG91ZEZvcm1hdGlvbiByZXNvdXJjZVxuICAgKi9cbiAgcHJpdmF0ZSBleHRyYWN0TWV0YWRhdGEocmVzb3VyY2U6IENmblJlc291cmNlKTogUmVzb3VyY2VNZXRhZGF0YSB8IG51bGwge1xuICAgIGNvbnN0IHJlc291cmNlVHlwZSA9IHJlc291cmNlLmNmblJlc291cmNlVHlwZTtcbiAgICBjb25zdCBzdGFjayA9IFN0YWNrLm9mKHJlc291cmNlKTtcbiAgICBjb25zdCBsb2dpY2FsSWQgPSBzdGFjay5nZXRMb2dpY2FsSWQocmVzb3VyY2UpO1xuICAgIGNvbnN0IHN0YWNrTmFtZSA9IHN0YWNrLnN0YWNrTmFtZTtcblxuICAgIHJldHVybiB7XG4gICAgICByZXNvdXJjZV90eXBlOiByZXNvdXJjZVR5cGUsXG4gICAgICBuYW1lOiBsb2dpY2FsSWQsXG4gICAgICBzdGFja19uYW1lOiBzdGFja05hbWVcbiAgICB9O1xuICB9XG5cbiAgLyoqXG4gICAqIEdldCBjb2xsZWN0ZWQgcmVzb3VyY2UgaW52ZW50b3J5XG4gICAqL1xuICBwdWJsaWMgZ2V0SW52ZW50b3J5KCk6IFJlc291cmNlTWV0YWRhdGFbXSB7XG4gICAgcmV0dXJuIHRoaXMucmVzb3VyY2VzO1xuICB9XG59XG4iXX0=
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Audit configuration for cross-account CloudQuery access
|
|
3
|
-
*/
|
|
4
|
-
export declare const FJALL_AUDIT_CONFIG: {
|
|
5
|
-
/**
|
|
6
|
-
* Fjall webapp AWS account ID
|
|
7
|
-
* This account will be granted permission to assume audit roles for CloudQuery
|
|
8
|
-
*/
|
|
9
|
-
readonly webappAwsAccountId: "985539798308";
|
|
10
|
-
/**
|
|
11
|
-
* IAM role naming convention
|
|
12
|
-
*/
|
|
13
|
-
readonly roleNamePrefix: "FjallAudit";
|
|
14
|
-
/**
|
|
15
|
-
* IAM role path (for organizational structure)
|
|
16
|
-
*/
|
|
17
|
-
readonly rolePath: "/";
|
|
18
|
-
};
|
package/dist/lib/config/audit.js
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FJALL_AUDIT_CONFIG = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Audit configuration for cross-account CloudQuery access
|
|
6
|
-
*/
|
|
7
|
-
exports.FJALL_AUDIT_CONFIG = {
|
|
8
|
-
/**
|
|
9
|
-
* Fjall webapp AWS account ID
|
|
10
|
-
* This account will be granted permission to assume audit roles for CloudQuery
|
|
11
|
-
*/
|
|
12
|
-
webappAwsAccountId: "985539798308", // Fjall platform account
|
|
13
|
-
/**
|
|
14
|
-
* IAM role naming convention
|
|
15
|
-
*/
|
|
16
|
-
roleNamePrefix: "FjallAudit",
|
|
17
|
-
/**
|
|
18
|
-
* IAM role path (for organizational structure)
|
|
19
|
-
*/
|
|
20
|
-
rolePath: "/"
|
|
21
|
-
};
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXVkaXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvY29uZmlnL2F1ZGl0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOztHQUVHO0FBQ1UsUUFBQSxrQkFBa0IsR0FBRztJQUNoQzs7O09BR0c7SUFDSCxrQkFBa0IsRUFBRSxjQUFjLEVBQUUseUJBQXlCO0lBRTdEOztPQUVHO0lBQ0gsY0FBYyxFQUFFLFlBQVk7SUFFNUI7O09BRUc7SUFDSCxRQUFRLEVBQUUsR0FBRztDQUNMLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEF1ZGl0IGNvbmZpZ3VyYXRpb24gZm9yIGNyb3NzLWFjY291bnQgQ2xvdWRRdWVyeSBhY2Nlc3NcbiAqL1xuZXhwb3J0IGNvbnN0IEZKQUxMX0FVRElUX0NPTkZJRyA9IHtcbiAgLyoqXG4gICAqIEZqYWxsIHdlYmFwcCBBV1MgYWNjb3VudCBJRFxuICAgKiBUaGlzIGFjY291bnQgd2lsbCBiZSBncmFudGVkIHBlcm1pc3Npb24gdG8gYXNzdW1lIGF1ZGl0IHJvbGVzIGZvciBDbG91ZFF1ZXJ5XG4gICAqL1xuICB3ZWJhcHBBd3NBY2NvdW50SWQ6IFwiOTg1NTM5Nzk4MzA4XCIsIC8vIEZqYWxsIHBsYXRmb3JtIGFjY291bnRcblxuICAvKipcbiAgICogSUFNIHJvbGUgbmFtaW5nIGNvbnZlbnRpb25cbiAgICovXG4gIHJvbGVOYW1lUHJlZml4OiBcIkZqYWxsQXVkaXRcIixcblxuICAvKipcbiAgICogSUFNIHJvbGUgcGF0aCAoZm9yIG9yZ2FuaXphdGlvbmFsIHN0cnVjdHVyZSlcbiAgICovXG4gIHJvbGVQYXRoOiBcIi9cIlxufSBhcyBjb25zdDtcbiJdfQ==
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
import { Construct } from "constructs";
|
|
2
|
-
import { Role } from "aws-cdk-lib/aws-iam";
|
|
3
|
-
export interface AuditRoleProps {
|
|
4
|
-
/**
|
|
5
|
-
* Override the default Fjall webapp account ID
|
|
6
|
-
* Defaults to the account ID specified in FJALL_AUDIT_CONFIG
|
|
7
|
-
*/
|
|
8
|
-
webappAccountId?: string;
|
|
9
|
-
/**
|
|
10
|
-
* External ID for additional security when assuming the role
|
|
11
|
-
* If not provided, a unique external ID will be generated
|
|
12
|
-
*/
|
|
13
|
-
externalId?: string;
|
|
14
|
-
}
|
|
15
|
-
/**
|
|
16
|
-
* High-level pattern for adding CloudQuery audit capabilities to an application.
|
|
17
|
-
*
|
|
18
|
-
* This creates a cross-account IAM role that grants the Fjall platform read-only
|
|
19
|
-
* access to all AWS resources for security auditing via CloudQuery.
|
|
20
|
-
*
|
|
21
|
-
* @example
|
|
22
|
-
* ```typescript
|
|
23
|
-
* import { App, AuditRole } from "@fjall/components-infrastructure";
|
|
24
|
-
*
|
|
25
|
-
* const app = App.getApp("MyApp");
|
|
26
|
-
*
|
|
27
|
-
* // Explicit opt-in to audit capabilities
|
|
28
|
-
* const auditRole = new AuditRole(app, "AuditRole");
|
|
29
|
-
*
|
|
30
|
-
* // Continue with normal application setup
|
|
31
|
-
* app.addCompute(/* ... *\/);
|
|
32
|
-
* ```
|
|
33
|
-
*/
|
|
34
|
-
export declare class AuditRole extends Construct {
|
|
35
|
-
readonly role: Role;
|
|
36
|
-
readonly externalId: string;
|
|
37
|
-
constructor(scope: Construct, id: string, props?: AuditRoleProps);
|
|
38
|
-
/**
|
|
39
|
-
* Generate a unique external ID for this application
|
|
40
|
-
* Format: fjall-audit-{appName}-{timestamp}
|
|
41
|
-
*/
|
|
42
|
-
private generateExternalId;
|
|
43
|
-
}
|
|
44
|
-
export default AuditRole;
|
|
@@ -1,58 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AuditRole = void 0;
|
|
4
|
-
const constructs_1 = require("constructs");
|
|
5
|
-
const app_1 = require("../../app");
|
|
6
|
-
const auditRole_1 = require("../../resources/aws/audit/auditRole");
|
|
7
|
-
const audit_1 = require("../../config/audit");
|
|
8
|
-
/**
|
|
9
|
-
* High-level pattern for adding CloudQuery audit capabilities to an application.
|
|
10
|
-
*
|
|
11
|
-
* This creates a cross-account IAM role that grants the Fjall platform read-only
|
|
12
|
-
* access to all AWS resources for security auditing via CloudQuery.
|
|
13
|
-
*
|
|
14
|
-
* @example
|
|
15
|
-
* ```typescript
|
|
16
|
-
* import { App, AuditRole } from "@fjall/components-infrastructure";
|
|
17
|
-
*
|
|
18
|
-
* const app = App.getApp("MyApp");
|
|
19
|
-
*
|
|
20
|
-
* // Explicit opt-in to audit capabilities
|
|
21
|
-
* const auditRole = new AuditRole(app, "AuditRole");
|
|
22
|
-
*
|
|
23
|
-
* // Continue with normal application setup
|
|
24
|
-
* app.addCompute(/* ... *\/);
|
|
25
|
-
* ```
|
|
26
|
-
*/
|
|
27
|
-
class AuditRole extends constructs_1.Construct {
|
|
28
|
-
constructor(scope, id, props) {
|
|
29
|
-
super(scope, id);
|
|
30
|
-
// Get the App instance to access the network stack
|
|
31
|
-
const app = scope instanceof app_1.default ? scope : app_1.default.getInstance();
|
|
32
|
-
const networkStack = app.getDefaultNetworkStack();
|
|
33
|
-
// Generate or use provided external ID
|
|
34
|
-
this.externalId = props?.externalId || this.generateExternalId(app);
|
|
35
|
-
// Create the audit role using the factory
|
|
36
|
-
this.role = auditRole_1.default.build(`${app["name"]}AuditRole`, {
|
|
37
|
-
webappAccountId: props?.webappAccountId || audit_1.FJALL_AUDIT_CONFIG.webappAwsAccountId,
|
|
38
|
-
appName: app["name"],
|
|
39
|
-
externalId: this.externalId,
|
|
40
|
-
roleNamePrefix: audit_1.FJALL_AUDIT_CONFIG.roleNamePrefix,
|
|
41
|
-
rolePath: audit_1.FJALL_AUDIT_CONFIG.rolePath
|
|
42
|
-
})(app, networkStack.getStack());
|
|
43
|
-
// Register the role with the network stack
|
|
44
|
-
networkStack.addConstruct(this.role);
|
|
45
|
-
}
|
|
46
|
-
/**
|
|
47
|
-
* Generate a unique external ID for this application
|
|
48
|
-
* Format: fjall-audit-{appName}-{timestamp}
|
|
49
|
-
*/
|
|
50
|
-
generateExternalId(app) {
|
|
51
|
-
const appName = app["name"];
|
|
52
|
-
const timestamp = Date.now();
|
|
53
|
-
return `fjall-audit-${appName.toLowerCase()}-${timestamp}`;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
exports.AuditRole = AuditRole;
|
|
57
|
-
exports.default = AuditRole;
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXVkaXRSb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vbGliL3BhdHRlcm5zL2F3cy9hdWRpdFJvbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBRXZDLG1DQUE0QjtBQUM1QixtRUFBbUU7QUFDbkUsOENBQXdEO0FBZ0J4RDs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBa0JHO0FBQ0gsTUFBYSxTQUFVLFNBQVEsc0JBQVM7SUFJdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFzQjtRQUM5RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLG1EQUFtRDtRQUNuRCxNQUFNLEdBQUcsR0FBRyxLQUFLLFlBQVksYUFBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLGFBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUM3RCxNQUFNLFlBQVksR0FBRyxHQUFHLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUVsRCx1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLEVBQUUsVUFBVSxJQUFJLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUVwRSwwQ0FBMEM7UUFDMUMsSUFBSSxDQUFDLElBQUksR0FBRyxtQkFBZ0IsQ0FBQyxLQUFLLENBQUMsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRTtZQUM1RCxlQUFlLEVBQ2IsS0FBSyxFQUFFLGVBQWUsSUFBSSwwQkFBa0IsQ0FBQyxrQkFBa0I7WUFDakUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUM7WUFDcEIsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVO1lBQzNCLGNBQWMsRUFBRSwwQkFBa0IsQ0FBQyxjQUFjO1lBQ2pELFFBQVEsRUFBRSwwQkFBa0IsQ0FBQyxRQUFRO1NBQ3RDLENBQUMsQ0FBQyxHQUFHLEVBQUUsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFFakMsMkNBQTJDO1FBQzNDLFlBQVksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRDs7O09BR0c7SUFDSyxrQkFBa0IsQ0FBQyxHQUFRO1FBQ2pDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDN0IsT0FBTyxlQUFlLE9BQU8sQ0FBQyxXQUFXLEVBQUUsSUFBSSxTQUFTLEVBQUUsQ0FBQztJQUM3RCxDQUFDO0NBQ0Y7QUFyQ0QsOEJBcUNDO0FBRUQsa0JBQWUsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IFJvbGUgfSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWlhbVwiO1xuaW1wb3J0IEFwcCBmcm9tIFwiLi4vLi4vYXBwXCI7XG5pbXBvcnQgQXVkaXRSb2xlRmFjdG9yeSBmcm9tIFwiLi4vLi4vcmVzb3VyY2VzL2F3cy9hdWRpdC9hdWRpdFJvbGVcIjtcbmltcG9ydCB7IEZKQUxMX0FVRElUX0NPTkZJRyB9IGZyb20gXCIuLi8uLi9jb25maWcvYXVkaXRcIjtcblxuZXhwb3J0IGludGVyZmFjZSBBdWRpdFJvbGVQcm9wcyB7XG4gIC8qKlxuICAgKiBPdmVycmlkZSB0aGUgZGVmYXVsdCBGamFsbCB3ZWJhcHAgYWNjb3VudCBJRFxuICAgKiBEZWZhdWx0cyB0byB0aGUgYWNjb3VudCBJRCBzcGVjaWZpZWQgaW4gRkpBTExfQVVESVRfQ09ORklHXG4gICAqL1xuICB3ZWJhcHBBY2NvdW50SWQ/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIEV4dGVybmFsIElEIGZvciBhZGRpdGlvbmFsIHNlY3VyaXR5IHdoZW4gYXNzdW1pbmcgdGhlIHJvbGVcbiAgICogSWYgbm90IHByb3ZpZGVkLCBhIHVuaXF1ZSBleHRlcm5hbCBJRCB3aWxsIGJlIGdlbmVyYXRlZFxuICAgKi9cbiAgZXh0ZXJuYWxJZD86IHN0cmluZztcbn1cblxuLyoqXG4gKiBIaWdoLWxldmVsIHBhdHRlcm4gZm9yIGFkZGluZyBDbG91ZFF1ZXJ5IGF1ZGl0IGNhcGFiaWxpdGllcyB0byBhbiBhcHBsaWNhdGlvbi5cbiAqXG4gKiBUaGlzIGNyZWF0ZXMgYSBjcm9zcy1hY2NvdW50IElBTSByb2xlIHRoYXQgZ3JhbnRzIHRoZSBGamFsbCBwbGF0Zm9ybSByZWFkLW9ubHlcbiAqIGFjY2VzcyB0byBhbGwgQVdTIHJlc291cmNlcyBmb3Igc2VjdXJpdHkgYXVkaXRpbmcgdmlhIENsb3VkUXVlcnkuXG4gKlxuICogQGV4YW1wbGVcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIGltcG9ydCB7IEFwcCwgQXVkaXRSb2xlIH0gZnJvbSBcIkBmamFsbC9jb21wb25lbnRzLWluZnJhc3RydWN0dXJlXCI7XG4gKlxuICogY29uc3QgYXBwID0gQXBwLmdldEFwcChcIk15QXBwXCIpO1xuICpcbiAqIC8vIEV4cGxpY2l0IG9wdC1pbiB0byBhdWRpdCBjYXBhYmlsaXRpZXNcbiAqIGNvbnN0IGF1ZGl0Um9sZSA9IG5ldyBBdWRpdFJvbGUoYXBwLCBcIkF1ZGl0Um9sZVwiKTtcbiAqXG4gKiAvLyBDb250aW51ZSB3aXRoIG5vcm1hbCBhcHBsaWNhdGlvbiBzZXR1cFxuICogYXBwLmFkZENvbXB1dGUoLyogLi4uICpcXC8pO1xuICogYGBgXG4gKi9cbmV4cG9ydCBjbGFzcyBBdWRpdFJvbGUgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBwdWJsaWMgcmVhZG9ubHkgcm9sZTogUm9sZTtcbiAgcHVibGljIHJlYWRvbmx5IGV4dGVybmFsSWQ6IHN0cmluZztcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wcz86IEF1ZGl0Um9sZVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIC8vIEdldCB0aGUgQXBwIGluc3RhbmNlIHRvIGFjY2VzcyB0aGUgbmV0d29yayBzdGFja1xuICAgIGNvbnN0IGFwcCA9IHNjb3BlIGluc3RhbmNlb2YgQXBwID8gc2NvcGUgOiBBcHAuZ2V0SW5zdGFuY2UoKTtcbiAgICBjb25zdCBuZXR3b3JrU3RhY2sgPSBhcHAuZ2V0RGVmYXVsdE5ldHdvcmtTdGFjaygpO1xuXG4gICAgLy8gR2VuZXJhdGUgb3IgdXNlIHByb3ZpZGVkIGV4dGVybmFsIElEXG4gICAgdGhpcy5leHRlcm5hbElkID0gcHJvcHM/LmV4dGVybmFsSWQgfHwgdGhpcy5nZW5lcmF0ZUV4dGVybmFsSWQoYXBwKTtcblxuICAgIC8vIENyZWF0ZSB0aGUgYXVkaXQgcm9sZSB1c2luZyB0aGUgZmFjdG9yeVxuICAgIHRoaXMucm9sZSA9IEF1ZGl0Um9sZUZhY3RvcnkuYnVpbGQoYCR7YXBwW1wibmFtZVwiXX1BdWRpdFJvbGVgLCB7XG4gICAgICB3ZWJhcHBBY2NvdW50SWQ6XG4gICAgICAgIHByb3BzPy53ZWJhcHBBY2NvdW50SWQgfHwgRkpBTExfQVVESVRfQ09ORklHLndlYmFwcEF3c0FjY291bnRJZCxcbiAgICAgIGFwcE5hbWU6IGFwcFtcIm5hbWVcIl0sXG4gICAgICBleHRlcm5hbElkOiB0aGlzLmV4dGVybmFsSWQsXG4gICAgICByb2xlTmFtZVByZWZpeDogRkpBTExfQVVESVRfQ09ORklHLnJvbGVOYW1lUHJlZml4LFxuICAgICAgcm9sZVBhdGg6IEZKQUxMX0FVRElUX0NPTkZJRy5yb2xlUGF0aFxuICAgIH0pKGFwcCwgbmV0d29ya1N0YWNrLmdldFN0YWNrKCkpO1xuXG4gICAgLy8gUmVnaXN0ZXIgdGhlIHJvbGUgd2l0aCB0aGUgbmV0d29yayBzdGFja1xuICAgIG5ldHdvcmtTdGFjay5hZGRDb25zdHJ1Y3QodGhpcy5yb2xlKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZW5lcmF0ZSBhIHVuaXF1ZSBleHRlcm5hbCBJRCBmb3IgdGhpcyBhcHBsaWNhdGlvblxuICAgKiBGb3JtYXQ6IGZqYWxsLWF1ZGl0LXthcHBOYW1lfS17dGltZXN0YW1wfVxuICAgKi9cbiAgcHJpdmF0ZSBnZW5lcmF0ZUV4dGVybmFsSWQoYXBwOiBBcHApOiBzdHJpbmcge1xuICAgIGNvbnN0IGFwcE5hbWUgPSBhcHBbXCJuYW1lXCJdO1xuICAgIGNvbnN0IHRpbWVzdGFtcCA9IERhdGUubm93KCk7XG4gICAgcmV0dXJuIGBmamFsbC1hdWRpdC0ke2FwcE5hbWUudG9Mb3dlckNhc2UoKX0tJHt0aW1lc3RhbXB9YDtcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBBdWRpdFJvbGU7XG4iXX0=
|
|
File without changes
|
|
@@ -1,150 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// import AwsStack, { AwsStackProps } from "../../resources/aws/base/awsStack";
|
|
3
|
-
// import { Vpc } from "../../resources/aws/networking/vpc";
|
|
4
|
-
// import Fargate, {
|
|
5
|
-
// ContainerSecret,
|
|
6
|
-
// ScalingType,
|
|
7
|
-
// Protocol
|
|
8
|
-
// } from "../../resources/aws/compute/ecs";
|
|
9
|
-
// import Database from "../../resources/aws/database/database";
|
|
10
|
-
// import { Secret } from "../../resources/aws/secrets";
|
|
11
|
-
// import { Ecr } from "../../resources/aws/storage";
|
|
12
|
-
// import { Fn, SecretValue } from "aws-cdk-lib";
|
|
13
|
-
// import { IManagedPolicy, PolicyDocument } from "aws-cdk-lib/aws-iam";
|
|
14
|
-
// import { KeyValue } from "../../types";
|
|
15
|
-
// /**
|
|
16
|
-
// * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct
|
|
17
|
-
// * to treat these as required properties and avoid constant null checking.
|
|
18
|
-
// */
|
|
19
|
-
// export interface BasicAppPropDefaults {
|
|
20
|
-
// tags: KeyValue;
|
|
21
|
-
// serviceName: string;
|
|
22
|
-
// clusterName: string;
|
|
23
|
-
// protocol: Protocol;
|
|
24
|
-
// scalingType: ScalingType;
|
|
25
|
-
// containerPort: number;
|
|
26
|
-
// }
|
|
27
|
-
// export interface BasicAppProps {
|
|
28
|
-
// accountId?: string;
|
|
29
|
-
// clusterName?: string;
|
|
30
|
-
// containerCommand?: string[];
|
|
31
|
-
// containerEnvironment?: KeyValue;
|
|
32
|
-
// containerPort?: number;
|
|
33
|
-
// containerSecrets?: string[];
|
|
34
|
-
// environment: string;
|
|
35
|
-
// // The team/domain/business-unit that is responsible for this service
|
|
36
|
-
// owner?: string;
|
|
37
|
-
// parentDomain?: string; // Fix to make a dependency of protocol
|
|
38
|
-
// listenerPort?: number;
|
|
39
|
-
// protocol?: Protocol;
|
|
40
|
-
// region?: string;
|
|
41
|
-
// scalingType?: ScalingType;
|
|
42
|
-
// serviceName?: string;
|
|
43
|
-
// taskRoleInlinePolicies?: {
|
|
44
|
-
// [name: string]: PolicyDocument;
|
|
45
|
-
// };
|
|
46
|
-
// taskRoleManagedPolicies?: IManagedPolicy[];
|
|
47
|
-
// tags?: KeyValue;
|
|
48
|
-
// }
|
|
49
|
-
// export class BasicApp {
|
|
50
|
-
// private vpcStack: AwsStack;
|
|
51
|
-
// private databaseStack: AwsStack;
|
|
52
|
-
// private secretStack: AwsStack;
|
|
53
|
-
// private computeStack: AwsStack;
|
|
54
|
-
// constructor(id: string, rawProps: BasicAppProps) {
|
|
55
|
-
// const props = this.getProps(id, rawProps);
|
|
56
|
-
// const stackProps = this.getStackProps(props);
|
|
57
|
-
// this.vpcStack = new AwsStack(`${id}Network`, [], stackProps)
|
|
58
|
-
// .addNetwork(
|
|
59
|
-
// Vpc.build(`${id}Vpc`, {
|
|
60
|
-
// accountId: props.accountId,
|
|
61
|
-
// ipv4IpamPoolId: Fn.importValue(`IpamPoolId${props?.accountId}`),
|
|
62
|
-
// region: props.region,
|
|
63
|
-
// tags: props.tags
|
|
64
|
-
// })
|
|
65
|
-
// )
|
|
66
|
-
// .addContainerRegistry(Ecr.build(`${id}Ecr`));
|
|
67
|
-
// this.databaseStack = new AwsStack(
|
|
68
|
-
// `${id}Database`,
|
|
69
|
-
// this.vpcStack,
|
|
70
|
-
// stackProps
|
|
71
|
-
// )
|
|
72
|
-
// .addNetwork(this.vpcStack.getNetwork())
|
|
73
|
-
// .addResource(Database.build(`${id}Database`));
|
|
74
|
-
// //TODO: validate id does not contain special characters (no hyphens - no slashes etc) database instances won't allow it
|
|
75
|
-
// const dbResource = this.databaseStack.getResource(
|
|
76
|
-
// `${id}Database`
|
|
77
|
-
// ) as Database;
|
|
78
|
-
// const secretObjectValue: ContainerSecret = {};
|
|
79
|
-
// if (props.containerSecrets) {
|
|
80
|
-
// for (const secretObject of props.containerSecrets) {
|
|
81
|
-
// secretObjectValue[secretObject] = SecretValue.unsafePlainText("");
|
|
82
|
-
// }
|
|
83
|
-
// }
|
|
84
|
-
// this.secretStack = new AwsStack(`${id}Secret`, [], stackProps).addResource(
|
|
85
|
-
// Secret.build(`${id}Secret`, {
|
|
86
|
-
// secretName: `/${props.clusterName}/${props.serviceName}`,
|
|
87
|
-
// secretObjectValue: secretObjectValue,
|
|
88
|
-
// tags: props.tags
|
|
89
|
-
// })
|
|
90
|
-
// );
|
|
91
|
-
// this.computeStack = new AwsStack(
|
|
92
|
-
// `${id}Compute`,
|
|
93
|
-
// [this.vpcStack, this.databaseStack, this.secretStack],
|
|
94
|
-
// stackProps
|
|
95
|
-
// )
|
|
96
|
-
// .addNetwork(this.vpcStack.getNetwork())
|
|
97
|
-
// .addResource(
|
|
98
|
-
// Fargate.build(`${id}Fargate`, {
|
|
99
|
-
// clusterName: props.clusterName,
|
|
100
|
-
// protocol: props.protocol,
|
|
101
|
-
// //TODO: This should work via line 126, but doesn't work (at least on update)
|
|
102
|
-
// databaseConnection: dbResource.connections,
|
|
103
|
-
// containerCommand: props.containerCommand,
|
|
104
|
-
// containerEnvironment: props.containerEnvironment,
|
|
105
|
-
// containerPort: props.containerPort,
|
|
106
|
-
// containerSecrets: secretObjectValue,
|
|
107
|
-
// ecrRepository: this.vpcStack.getContainerRegistry(),
|
|
108
|
-
// parentDomain: props.parentDomain?.toLowerCase(),
|
|
109
|
-
// listenerPort: props.listenerPort,
|
|
110
|
-
// scalingType: props.scalingType,
|
|
111
|
-
// serviceName: props.serviceName,
|
|
112
|
-
// taskRoleInlinePolicies: props.taskRoleInlinePolicies,
|
|
113
|
-
// taskRoleManagedPolicies: props.taskRoleManagedPolicies,
|
|
114
|
-
// tags: props.tags
|
|
115
|
-
// })
|
|
116
|
-
// )
|
|
117
|
-
// .connect(`${id}Fargate`, `${id}Database`, 5432);
|
|
118
|
-
// }
|
|
119
|
-
// getStackProps(props: BasicAppProps): AwsStackProps | undefined {
|
|
120
|
-
// if (!props) return;
|
|
121
|
-
// return {
|
|
122
|
-
// accountId: props.accountId,
|
|
123
|
-
// region: props.region
|
|
124
|
-
// };
|
|
125
|
-
// }
|
|
126
|
-
// getProps(
|
|
127
|
-
// id: string,
|
|
128
|
-
// rawProps: BasicAppProps
|
|
129
|
-
// ): BasicAppProps & BasicAppPropDefaults {
|
|
130
|
-
// const defaultProps = {
|
|
131
|
-
// tags: {
|
|
132
|
-
// "fjall:costAllocation:service": "app",
|
|
133
|
-
// "fjall:costAllocation:environment":
|
|
134
|
-
// rawProps.environment || "production",
|
|
135
|
-
// "fjall:costAllocation:owner": rawProps.owner || "engineer"
|
|
136
|
-
// },
|
|
137
|
-
// scalingType: ScalingType.CPU,
|
|
138
|
-
// protocol: rawProps.parentDomain ? Protocol.HTTPS : Protocol.HTTP,
|
|
139
|
-
// containerPort: 3000,
|
|
140
|
-
// serviceName: `${id}Service`,
|
|
141
|
-
// clusterName: `${id}Cluster`
|
|
142
|
-
// };
|
|
143
|
-
// return {
|
|
144
|
-
// ...defaultProps,
|
|
145
|
-
// ...rawProps
|
|
146
|
-
// };
|
|
147
|
-
// }
|
|
148
|
-
// }
|
|
149
|
-
// export default BasicApp;
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basicApp.js","sourceRoot":"","sources":["../../../../lib/patterns/aws/basicApp.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,4DAA4D;AAC5D,oBAAoB;AACpB,qBAAqB;AACrB,iBAAiB;AACjB,aAAa;AACb,4CAA4C;AAC5C,gEAAgE;AAChE,wDAAwD;AACxD,qDAAqD;AACrD,iDAAiD;AACjD,wEAAwE;AACxE,0CAA0C;AAE1C,MAAM;AACN,+FAA+F;AAC/F,6EAA6E;AAC7E,MAAM;AACN,0CAA0C;AAC1C,oBAAoB;AACpB,yBAAyB;AACzB,yBAAyB;AACzB,wBAAwB;AACxB,8BAA8B;AAC9B,2BAA2B;AAC3B,IAAI;AAEJ,mCAAmC;AACnC,wBAAwB;AACxB,0BAA0B;AAC1B,iCAAiC;AACjC,qCAAqC;AACrC,4BAA4B;AAC5B,iCAAiC;AACjC,yBAAyB;AACzB,0EAA0E;AAC1E,oBAAoB;AACpB,mEAAmE;AACnE,2BAA2B;AAC3B,yBAAyB;AACzB,qBAAqB;AACrB,+BAA+B;AAC/B,0BAA0B;AAC1B,+BAA+B;AAC/B,sCAAsC;AACtC,OAAO;AACP,gDAAgD;AAChD,qBAAqB;AACrB,IAAI;AAEJ,0BAA0B;AAC1B,gCAAgC;AAChC,qCAAqC;AACrC,mCAAmC;AACnC,oCAAoC;AAEpC,uDAAuD;AACvD,iDAAiD;AACjD,oDAAoD;AAEpD,mEAAmE;AACnE,qBAAqB;AACrB,kCAAkC;AAClC,wCAAwC;AACxC,6EAA6E;AAC7E,kCAAkC;AAClC,6BAA6B;AAC7B,aAAa;AACb,UAAU;AACV,sDAAsD;AAEtD,yCAAyC;AACzC,yBAAyB;AACzB,uBAAuB;AACvB,mBAAmB;AACnB,QAAQ;AACR,gDAAgD;AAChD,uDAAuD;AAEvD,8HAA8H;AAE9H,yDAAyD;AACzD,wBAAwB;AACxB,qBAAqB;AAErB,qDAAqD;AACrD,oCAAoC;AACpC,6DAA6D;AAC7D,6EAA6E;AAC7E,UAAU;AACV,QAAQ;AAER,kFAAkF;AAClF,sCAAsC;AACtC,oEAAoE;AACpE,gDAAgD;AAChD,2BAA2B;AAC3B,WAAW;AACX,SAAS;AAET,wCAAwC;AACxC,wBAAwB;AACxB,+DAA+D;AAC/D,mBAAmB;AACnB,QAAQ;AACR,gDAAgD;AAChD,sBAAsB;AACtB,0CAA0C;AAC1C,4CAA4C;AAC5C,sCAAsC;AACtC,yFAAyF;AACzF,wDAAwD;AACxD,sDAAsD;AACtD,8DAA8D;AAC9D,gDAAgD;AAChD,iDAAiD;AACjD,iEAAiE;AACjE,6DAA6D;AAC7D,8CAA8C;AAC9C,4CAA4C;AAC5C,4CAA4C;AAC5C,kEAAkE;AAClE,oEAAoE;AACpE,6BAA6B;AAC7B,aAAa;AACb,UAAU;AACV,yDAAyD;AACzD,MAAM;AAEN,qEAAqE;AACrE,0BAA0B;AAE1B,eAAe;AACf,oCAAoC;AACpC,6BAA6B;AAC7B,SAAS;AACT,MAAM;AAEN,cAAc;AACd,kBAAkB;AAClB,8BAA8B;AAC9B,8CAA8C;AAC9C,6BAA6B;AAC7B,gBAAgB;AAChB,iDAAiD;AACjD,8CAA8C;AAC9C,kDAAkD;AAClD,qEAAqE;AACrE,WAAW;AACX,sCAAsC;AACtC,0EAA0E;AAC1E,6BAA6B;AAC7B,qCAAqC;AACrC,oCAAoC;AACpC,SAAS;AAET,eAAe;AACf,yBAAyB;AACzB,oBAAoB;AACpB,SAAS;AACT,MAAM;AACN,IAAI;AACJ,2BAA2B","sourcesContent":["// import AwsStack, { AwsStackProps } from \"../../resources/aws/base/awsStack\";\n// import { Vpc } from \"../../resources/aws/networking/vpc\";\n// import Fargate, {\n//   ContainerSecret,\n//   ScalingType,\n//   Protocol\n// } from \"../../resources/aws/compute/ecs\";\n// import Database from \"../../resources/aws/database/database\";\n// import { Secret } from \"../../resources/aws/secrets\";\n// import { Ecr } from \"../../resources/aws/storage\";\n// import { Fn, SecretValue } from \"aws-cdk-lib\";\n// import { IManagedPolicy, PolicyDocument } from \"aws-cdk-lib/aws-iam\";\n// import { KeyValue } from \"../../types\";\n\n// /**\n//  * Intersected with BasicAppProps in the getProps method. This allows the BasicApp construct\n//  * to treat these as required properties and avoid constant null checking.\n//  */\n// export interface BasicAppPropDefaults {\n//   tags: KeyValue;\n//   serviceName: string;\n//   clusterName: string;\n//   protocol: Protocol;\n//   scalingType: ScalingType;\n//   containerPort: number;\n// }\n\n// export interface BasicAppProps {\n//   accountId?: string;\n//   clusterName?: string;\n//   containerCommand?: string[];\n//   containerEnvironment?: KeyValue;\n//   containerPort?: number;\n//   containerSecrets?: string[];\n//   environment: string;\n//   // The team/domain/business-unit that is responsible for this service\n//   owner?: string;\n//   parentDomain?: string; // Fix to make a dependency of protocol\n//   listenerPort?: number;\n//   protocol?: Protocol;\n//   region?: string;\n//   scalingType?: ScalingType;\n//   serviceName?: string;\n//   taskRoleInlinePolicies?: {\n//     [name: string]: PolicyDocument;\n//   };\n//   taskRoleManagedPolicies?: IManagedPolicy[];\n//   tags?: KeyValue;\n// }\n\n// export class BasicApp {\n//   private vpcStack: AwsStack;\n//   private databaseStack: AwsStack;\n//   private secretStack: AwsStack;\n//   private computeStack: AwsStack;\n\n//   constructor(id: string, rawProps: BasicAppProps) {\n//     const props = this.getProps(id, rawProps);\n//     const stackProps = this.getStackProps(props);\n\n//     this.vpcStack = new AwsStack(`${id}Network`, [], stackProps)\n//       .addNetwork(\n//         Vpc.build(`${id}Vpc`, {\n//           accountId: props.accountId,\n//           ipv4IpamPoolId: Fn.importValue(`IpamPoolId${props?.accountId}`),\n//           region: props.region,\n//           tags: props.tags\n//         })\n//       )\n//       .addContainerRegistry(Ecr.build(`${id}Ecr`));\n\n//     this.databaseStack = new AwsStack(\n//       `${id}Database`,\n//       this.vpcStack,\n//       stackProps\n//     )\n//       .addNetwork(this.vpcStack.getNetwork())\n//       .addResource(Database.build(`${id}Database`));\n\n//     //TODO: validate id does not contain special characters (no hyphens - no slashes etc) database instances won't allow it\n\n//     const dbResource = this.databaseStack.getResource(\n//       `${id}Database`\n//     ) as Database;\n\n//     const secretObjectValue: ContainerSecret = {};\n//     if (props.containerSecrets) {\n//       for (const secretObject of props.containerSecrets) {\n//         secretObjectValue[secretObject] = SecretValue.unsafePlainText(\"\");\n//       }\n//     }\n\n//     this.secretStack = new AwsStack(`${id}Secret`, [], stackProps).addResource(\n//       Secret.build(`${id}Secret`, {\n//         secretName: `/${props.clusterName}/${props.serviceName}`,\n//         secretObjectValue: secretObjectValue,\n//         tags: props.tags\n//       })\n//     );\n\n//     this.computeStack = new AwsStack(\n//       `${id}Compute`,\n//       [this.vpcStack, this.databaseStack, this.secretStack],\n//       stackProps\n//     )\n//       .addNetwork(this.vpcStack.getNetwork())\n//       .addResource(\n//         Fargate.build(`${id}Fargate`, {\n//           clusterName: props.clusterName,\n//           protocol: props.protocol,\n//           //TODO: This should work via line 126, but doesn't work (at least on update)\n//           databaseConnection: dbResource.connections,\n//           containerCommand: props.containerCommand,\n//           containerEnvironment: props.containerEnvironment,\n//           containerPort: props.containerPort,\n//           containerSecrets: secretObjectValue,\n//           ecrRepository: this.vpcStack.getContainerRegistry(),\n//           parentDomain: props.parentDomain?.toLowerCase(),\n//           listenerPort: props.listenerPort,\n//           scalingType: props.scalingType,\n//           serviceName: props.serviceName,\n//           taskRoleInlinePolicies: props.taskRoleInlinePolicies,\n//           taskRoleManagedPolicies: props.taskRoleManagedPolicies,\n//           tags: props.tags\n//         })\n//       )\n//       .connect(`${id}Fargate`, `${id}Database`, 5432);\n//   }\n\n//   getStackProps(props: BasicAppProps): AwsStackProps | undefined {\n//     if (!props) return;\n\n//     return {\n//       accountId: props.accountId,\n//       region: props.region\n//     };\n//   }\n\n//   getProps(\n//     id: string,\n//     rawProps: BasicAppProps\n//   ): BasicAppProps & BasicAppPropDefaults {\n//     const defaultProps = {\n//       tags: {\n//         \"fjall:costAllocation:service\": \"app\",\n//         \"fjall:costAllocation:environment\":\n//           rawProps.environment || \"production\",\n//         \"fjall:costAllocation:owner\": rawProps.owner || \"engineer\"\n//       },\n//       scalingType: ScalingType.CPU,\n//       protocol: rawProps.parentDomain ? Protocol.HTTPS : Protocol.HTTP,\n//       containerPort: 3000,\n//       serviceName: `${id}Service`,\n//       clusterName: `${id}Cluster`\n//     };\n\n//     return {\n//       ...defaultProps,\n//       ...rawProps\n//     };\n//   }\n// }\n// export default BasicApp;\n"]}
|
|
@@ -1,43 +0,0 @@
|
|
|
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 {};
|