@fjall/components-infrastructure 0.42.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 +8 -3
- package/dist/lib/app.js +26 -8
- package/dist/lib/resources/aws/networking/vpc.js +6 -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/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
package/dist/lib/app.d.ts
CHANGED
|
@@ -16,6 +16,8 @@ export declare class App extends CdkApp {
|
|
|
16
16
|
private defaultVpc;
|
|
17
17
|
private defaultEcr;
|
|
18
18
|
private existingVpcId?;
|
|
19
|
+
private globalTags;
|
|
20
|
+
private aspectApplied;
|
|
19
21
|
private constructor();
|
|
20
22
|
/**
|
|
21
23
|
* Get/Create a basic Fjall Application with standard tags applied
|
|
@@ -81,10 +83,13 @@ export declare class App extends CdkApp {
|
|
|
81
83
|
*/
|
|
82
84
|
addStorageResource(resource: Construct): void;
|
|
83
85
|
/**
|
|
84
|
-
*
|
|
85
|
-
* Standard tags include environment and service name
|
|
86
|
+
* Initialize standard tags
|
|
86
87
|
*/
|
|
87
|
-
private
|
|
88
|
+
private initializeStandardTags;
|
|
89
|
+
/**
|
|
90
|
+
* Apply all tags as a single aspect
|
|
91
|
+
*/
|
|
92
|
+
private applyTagsAspect;
|
|
88
93
|
/**
|
|
89
94
|
* Add custom tags to all resources in the app
|
|
90
95
|
* @param tags Custom tags to apply to all resources
|
package/dist/lib/app.js
CHANGED
|
@@ -16,6 +16,8 @@ class App extends aws_cdk_lib_1.App {
|
|
|
16
16
|
constructor(name) {
|
|
17
17
|
super();
|
|
18
18
|
this.stacks = {};
|
|
19
|
+
this.globalTags = {};
|
|
20
|
+
this.aspectApplied = false;
|
|
19
21
|
if (name)
|
|
20
22
|
this.name = name;
|
|
21
23
|
else
|
|
@@ -28,7 +30,7 @@ class App extends aws_cdk_lib_1.App {
|
|
|
28
30
|
*/
|
|
29
31
|
static getApp(name) {
|
|
30
32
|
const app = App.getInstance(name);
|
|
31
|
-
app.
|
|
33
|
+
app.initializeStandardTags();
|
|
32
34
|
return app;
|
|
33
35
|
}
|
|
34
36
|
/**
|
|
@@ -53,6 +55,10 @@ class App extends aws_cdk_lib_1.App {
|
|
|
53
55
|
* @returns {AwsStack}
|
|
54
56
|
*/
|
|
55
57
|
getStack(key, dependencies) {
|
|
58
|
+
// Apply the aspect once before creating the first stack
|
|
59
|
+
if (!this.aspectApplied && Object.keys(this.stacks).length === 0 && Object.keys(this.globalTags).length > 0) {
|
|
60
|
+
this.applyTagsAspect();
|
|
61
|
+
}
|
|
56
62
|
if (!this.stacks[key]) {
|
|
57
63
|
this.stacks[key] = new resources_1.AwsStack(key, dependencies);
|
|
58
64
|
}
|
|
@@ -165,16 +171,24 @@ class App extends aws_cdk_lib_1.App {
|
|
|
165
171
|
storageStack.addConstruct(resource);
|
|
166
172
|
}
|
|
167
173
|
/**
|
|
168
|
-
*
|
|
169
|
-
* Standard tags include environment and service name
|
|
174
|
+
* Initialize standard tags
|
|
170
175
|
*/
|
|
171
|
-
|
|
176
|
+
initializeStandardTags() {
|
|
172
177
|
const config = (0, getConfig_1.getConfig)();
|
|
173
|
-
|
|
178
|
+
this.globalTags = {
|
|
174
179
|
"fjall:costAllocation:environment": config.environment,
|
|
175
180
|
"fjall:costAllocation:service": this.name
|
|
176
181
|
};
|
|
177
|
-
|
|
182
|
+
}
|
|
183
|
+
/**
|
|
184
|
+
* Apply all tags as a single aspect
|
|
185
|
+
*/
|
|
186
|
+
applyTagsAspect() {
|
|
187
|
+
if (!this.aspectApplied && Object.keys(this.globalTags).length > 0) {
|
|
188
|
+
// Apply ONE aspect with all tags using the CDK v2.206.0+ compatible StandardTagsAspect
|
|
189
|
+
aws_cdk_lib_1.Aspects.of(this).add(new standardTagsAspect_1.StandardTagsAspect(this.globalTags));
|
|
190
|
+
this.aspectApplied = true;
|
|
191
|
+
}
|
|
178
192
|
}
|
|
179
193
|
/**
|
|
180
194
|
* Add custom tags to all resources in the app
|
|
@@ -187,11 +201,15 @@ class App extends aws_cdk_lib_1.App {
|
|
|
187
201
|
* });
|
|
188
202
|
*/
|
|
189
203
|
addTags(tags) {
|
|
190
|
-
|
|
204
|
+
// Merge tags but don't apply aspect yet
|
|
205
|
+
this.globalTags = {
|
|
206
|
+
...this.globalTags,
|
|
207
|
+
...tags
|
|
208
|
+
};
|
|
191
209
|
return this;
|
|
192
210
|
}
|
|
193
211
|
}
|
|
194
212
|
exports.App = App;
|
|
195
213
|
App.instance = null;
|
|
196
214
|
exports.default = App;
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"app.js","sourceRoot":"","sources":["../../lib/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { App as CdkApp, Fn, Aspects } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { Vpc, VpcFactory } from \"./resources/aws/networking/vpc\";\nimport { IVpc } from \"aws-cdk-lib/aws-ec2\";\n\nimport { AwsStack } from \"./resources\";\nimport { Ecr, EcrFactory } from \"./resources/aws/storage/ecr\";\n\nimport { Storage } from \"./patterns/aws/storage\";\nimport { StandardTagsAspect } from \"./utils/standardTagsAspect\";\nimport { getConfig } from \"./utils/getConfig\";\n\n/**\n * The basic corner-stone of all Fjall-hosted applications.\n *  This class is a singleton and should be used to create and manage\n *   all resources in a Fjall application.\n */\nexport class App extends CdkApp {\n  private static instance: App | null = null;\n\n  private name: string;\n  private stacks: { [key: string]: AwsStack } = {};\n\n  private defaultVpc: IVpc;\n  private defaultEcr: Ecr;\n  private existingVpcId?: string;\n\n  private constructor(name?: string) {\n    super();\n\n    if (name) this.name = name;\n    else this.name = \"FjallApp\";\n  }\n\n  /**\n   * Get/Create a basic Fjall Application with standard tags applied\n   * @param name Application name\n   * @returns {App}\n   */\n  public static getApp(name?: string): App {\n    const app = App.getInstance(name);\n    app.applyStandardTags();\n    return app;\n  }\n\n  /**\n   * Get/Create the singleton instance of the App\n   * @param name\n   * @returns {App}\n   */\n  public static getInstance(name?: string): App {\n    // Despite supporting multiple stacks you can still only ever\n    // have a single Application per CDK deployment\n    if (!App.instance) {\n      App.instance = new App(name);\n    }\n\n    return App.instance;\n  }\n\n  /**\n   * Retrieve a stack by key. If the stack does not exist, it will be created.\n   *  Dependencies are only applied the first time a stack is created.\n   *\n   * @param key - The key of the stack\n   * @param dependencies - The stack(s) that this stack depends on\n   * @returns {AwsStack}\n   */\n  public getStack(key: string, dependencies?: AwsStack | AwsStack[]): AwsStack {\n    if (!this.stacks[key]) {\n      this.stacks[key] = new AwsStack(key, dependencies);\n    }\n\n    return this.stacks[key];\n  }\n\n  /**\n   * Retrieve default compute stack - named as `${this.name}Compute`\n   * @returns {AwsStack}\n   */\n  public getDefaultComputeStack(): AwsStack {\n    return this.getStack(`${this.name}Compute`, [\n      this.getDefaultNetworkStack(),\n      this.getDefaultStorageStack()\n    ]);\n  }\n\n  /**\n   * Retrieve default network stack - named as `${this.name}Network`\n   * @returns {AwsStack}\n   */\n  public getDefaultNetworkStack(): AwsStack {\n    return this.getStack(`${this.name}Network`);\n  }\n\n  public getDefaultStorageStack(): AwsStack {\n    return this.getStack(`${this.name}Storage`, this.getDefaultNetworkStack());\n  }\n\n  /**\n   * Retrieve default vpc. If the VPC does not exist it will be created.\n   * @returns {Vpc}\n   */\n  public getDefaultVpc(): IVpc {\n    var networkStack = this.getDefaultNetworkStack();\n\n    if (!this.defaultVpc) {\n      // Use an existing imported VPC if one was supplied\n      if (this.existingVpcId) {\n        this.defaultVpc = Vpc.fromLookup(\n          networkStack.getStack(),\n          `${this.name}ImportedVpc`,\n          { vpcId: this.existingVpcId }\n        );\n      } else {\n        // Attempt to automatically derive the account and region from the\n        // environment the CDK is running in. When an account ID is available,\n        // use it to import the corresponding IPAM pool so CIDRs are allocated\n        // from a central pool instead of using the default 10.0.0.0/16 block.\n\n        const accountId = process.env.CDK_DEFAULT_ACCOUNT;\n        const region = process.env.CDK_DEFAULT_REGION;\n        const isManagedAccount =\n          process.env.FJALL_MANAGED_ACCOUNT !== undefined;\n\n        let ipv4IpamPoolId: string | undefined;\n        if (isManagedAccount) {\n          ipv4IpamPoolId = Fn.importValue(`IpamPoolId${accountId}`);\n        } else {\n          ipv4IpamPoolId = undefined;\n        }\n\n        this.defaultVpc = VpcFactory.build(`${this.name}DefaultVpc`, {\n          accountId,\n          region,\n          ipv4IpamPoolId\n        })(this, networkStack.getStack());\n      }\n    }\n\n    return this.defaultVpc;\n  }\n\n  /**\n   * Reuse an existing VPC.\n   * Accepts either a Vpc object or a plain VPC ID string for convenience.\n   */\n  public useExistingVpc(vpcId: string): void {\n    if (this.defaultVpc) {\n      throw new Error(\n        \"useExistingVpc must be called before the default VPC has been created\"\n      );\n    }\n\n    this.existingVpcId = vpcId;\n  }\n\n  /**\n   * Retreive the default application container registry. If the registry does not exist\n   *  it will be created.\n   */\n  public getDefaultContainerRegistry(): Ecr {\n    if (!this.defaultEcr) {\n      var networkStack = this.getDefaultNetworkStack();\n\n      this.defaultEcr = EcrFactory.build(`${this.name}Ecr`)(\n        this,\n        networkStack.getStack()\n      );\n    }\n\n    return this.defaultEcr;\n  }\n\n  /**\n   * Add a compute resource to the default compute stack using the factory pattern.\n   */\n  public addCompute(fn: (app: App, scope: Construct) => Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(fn(this, computeStack.getStack()));\n  }\n\n  /**\n   * Manually add a resource to the default compute stack.\n   */\n  public addComputeResource(resource: Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(resource);\n  }\n\n  /**\n   *  Add a storage resource to the default storage stack using the factory pattern.\n   */\n  public addStorage(fn: (app: App, scope: Construct) => Construct): Storage {\n    const storageStack = this.getDefaultStorageStack();\n    const storageConstruct = fn(this, storageStack.getStack());\n    storageStack.addConstruct(storageConstruct);\n\n    return storageConstruct as unknown as Storage;\n  }\n\n  /**\n   * Manually add a resource to the default storage stack.\n   */\n  public addStorageResource(resource: Construct): void {\n    const storageStack = this.getDefaultStorageStack();\n    storageStack.addConstruct(resource);\n  }\n\n  /**\n   * Apply standard tags to all resources in the app\n   * Standard tags include environment and service name\n   */\n  private applyStandardTags(): void {\n    const config = getConfig();\n    \n    const standardTags = {\n      \"fjall:costAllocation:environment\": config.environment,\n      \"fjall:costAllocation:service\": this.name\n    };\n    \n    Aspects.of(this).add(new StandardTagsAspect(standardTags));\n  }\n\n  /**\n   * Add custom tags to all resources in the app\n   * @param tags Custom tags to apply to all resources\n   * @example\n   * app.addTags({\n   *   \"fjall:costAllocation:owner\": \"platform-team\",\n   *   \"fjall:costAllocation:cost-center\": \"CC-123\",\n   *   \"team:slack-channel\": \"#platform-alerts\"\n   * });\n   */\n  public addTags(tags: { [key: string]: string }): App {\n    Aspects.of(this).add(new StandardTagsAspect(tags));\n    return this;\n  }\n}\n\nexport default App;\n"]}
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"app.js","sourceRoot":"","sources":["../../lib/app.ts"],"names":[],"mappings":"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","sourcesContent":["import { App as CdkApp, Fn, Aspects } from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\nimport { Vpc, VpcFactory } from \"./resources/aws/networking/vpc\";\nimport { IVpc } from \"aws-cdk-lib/aws-ec2\";\n\nimport { AwsStack } from \"./resources\";\nimport { Ecr, EcrFactory } from \"./resources/aws/storage/ecr\";\n\nimport { Storage } from \"./patterns/aws/storage\";\nimport { StandardTagsAspect } from \"./utils/standardTagsAspect\";\nimport { getConfig } from \"./utils/getConfig\";\n\n/**\n * The basic corner-stone of all Fjall-hosted applications.\n *  This class is a singleton and should be used to create and manage\n *   all resources in a Fjall application.\n */\nexport class App extends CdkApp {\n  private static instance: App | null = null;\n\n  private name: string;\n  private stacks: { [key: string]: AwsStack } = {};\n\n  private defaultVpc: IVpc;\n  private defaultEcr: Ecr;\n  private existingVpcId?: string;\n  private globalTags: { [key: string]: string } = {};\n  private aspectApplied: boolean = false;\n\n  private constructor(name?: string) {\n    super();\n\n    if (name) this.name = name;\n    else this.name = \"FjallApp\";\n  }\n\n  /**\n   * Get/Create a basic Fjall Application with standard tags applied\n   * @param name Application name\n   * @returns {App}\n   */\n  public static getApp(name?: string): App {\n    const app = App.getInstance(name);\n    app.initializeStandardTags();\n    return app;\n  }\n\n  /**\n   * Get/Create the singleton instance of the App\n   * @param name\n   * @returns {App}\n   */\n  public static getInstance(name?: string): App {\n    // Despite supporting multiple stacks you can still only ever\n    // have a single Application per CDK deployment\n    if (!App.instance) {\n      App.instance = new App(name);\n    }\n\n    return App.instance;\n  }\n\n  /**\n   * Retrieve a stack by key. If the stack does not exist, it will be created.\n   *  Dependencies are only applied the first time a stack is created.\n   *\n   * @param key - The key of the stack\n   * @param dependencies - The stack(s) that this stack depends on\n   * @returns {AwsStack}\n   */\n  public getStack(key: string, dependencies?: AwsStack | AwsStack[]): AwsStack {\n    // Apply the aspect once before creating the first stack\n    if (!this.aspectApplied && Object.keys(this.stacks).length === 0 && Object.keys(this.globalTags).length > 0) {\n      this.applyTagsAspect();\n    }\n    \n    if (!this.stacks[key]) {\n      this.stacks[key] = new AwsStack(key, dependencies);\n    }\n\n    return this.stacks[key];\n  }\n\n  /**\n   * Retrieve default compute stack - named as `${this.name}Compute`\n   * @returns {AwsStack}\n   */\n  public getDefaultComputeStack(): AwsStack {\n    return this.getStack(`${this.name}Compute`, [\n      this.getDefaultNetworkStack(),\n      this.getDefaultStorageStack()\n    ]);\n  }\n\n  /**\n   * Retrieve default network stack - named as `${this.name}Network`\n   * @returns {AwsStack}\n   */\n  public getDefaultNetworkStack(): AwsStack {\n    return this.getStack(`${this.name}Network`);\n  }\n\n  public getDefaultStorageStack(): AwsStack {\n    return this.getStack(`${this.name}Storage`, this.getDefaultNetworkStack());\n  }\n\n  /**\n   * Retrieve default vpc. If the VPC does not exist it will be created.\n   * @returns {Vpc}\n   */\n  public getDefaultVpc(): IVpc {\n    var networkStack = this.getDefaultNetworkStack();\n\n    if (!this.defaultVpc) {\n      // Use an existing imported VPC if one was supplied\n      if (this.existingVpcId) {\n        this.defaultVpc = Vpc.fromLookup(\n          networkStack.getStack(),\n          `${this.name}ImportedVpc`,\n          { vpcId: this.existingVpcId }\n        );\n      } else {\n        // Attempt to automatically derive the account and region from the\n        // environment the CDK is running in. When an account ID is available,\n        // use it to import the corresponding IPAM pool so CIDRs are allocated\n        // from a central pool instead of using the default 10.0.0.0/16 block.\n\n        const accountId = process.env.CDK_DEFAULT_ACCOUNT;\n        const region = process.env.CDK_DEFAULT_REGION;\n        const isManagedAccount =\n          process.env.FJALL_MANAGED_ACCOUNT !== undefined;\n\n        let ipv4IpamPoolId: string | undefined;\n        if (isManagedAccount) {\n          ipv4IpamPoolId = Fn.importValue(`IpamPoolId${accountId}`);\n        } else {\n          ipv4IpamPoolId = undefined;\n        }\n\n        this.defaultVpc = VpcFactory.build(`${this.name}DefaultVpc`, {\n          accountId,\n          region,\n          ipv4IpamPoolId\n        })(this, networkStack.getStack());\n      }\n    }\n\n    return this.defaultVpc;\n  }\n\n  /**\n   * Reuse an existing VPC.\n   * Accepts either a Vpc object or a plain VPC ID string for convenience.\n   */\n  public useExistingVpc(vpcId: string): void {\n    if (this.defaultVpc) {\n      throw new Error(\n        \"useExistingVpc must be called before the default VPC has been created\"\n      );\n    }\n\n    this.existingVpcId = vpcId;\n  }\n\n  /**\n   * Retreive the default application container registry. If the registry does not exist\n   *  it will be created.\n   */\n  public getDefaultContainerRegistry(): Ecr {\n    if (!this.defaultEcr) {\n      var networkStack = this.getDefaultNetworkStack();\n\n      this.defaultEcr = EcrFactory.build(`${this.name}Ecr`)(\n        this,\n        networkStack.getStack()\n      );\n    }\n\n    return this.defaultEcr;\n  }\n\n  /**\n   * Add a compute resource to the default compute stack using the factory pattern.\n   */\n  public addCompute(fn: (app: App, scope: Construct) => Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(fn(this, computeStack.getStack()));\n  }\n\n  /**\n   * Manually add a resource to the default compute stack.\n   */\n  public addComputeResource(resource: Construct): void {\n    const computeStack = this.getDefaultComputeStack();\n    computeStack.addConstruct(resource);\n  }\n\n  /**\n   *  Add a storage resource to the default storage stack using the factory pattern.\n   */\n  public addStorage(fn: (app: App, scope: Construct) => Construct): Storage {\n    const storageStack = this.getDefaultStorageStack();\n    const storageConstruct = fn(this, storageStack.getStack());\n    storageStack.addConstruct(storageConstruct);\n\n    return storageConstruct as unknown as Storage;\n  }\n\n  /**\n   * Manually add a resource to the default storage stack.\n   */\n  public addStorageResource(resource: Construct): void {\n    const storageStack = this.getDefaultStorageStack();\n    storageStack.addConstruct(resource);\n  }\n\n  /**\n   * Initialize standard tags\n   */\n  private initializeStandardTags(): void {\n    const config = getConfig();\n    this.globalTags = {\n      \"fjall:costAllocation:environment\": config.environment,\n      \"fjall:costAllocation:service\": this.name\n    };\n  }\n\n\n  /**\n   * Apply all tags as a single aspect\n   */\n  private applyTagsAspect(): void {\n    if (!this.aspectApplied && Object.keys(this.globalTags).length > 0) {\n      // Apply ONE aspect with all tags using the CDK v2.206.0+ compatible StandardTagsAspect\n      Aspects.of(this).add(new StandardTagsAspect(this.globalTags));\n      this.aspectApplied = true;\n    }\n  }\n\n  /**\n   * Add custom tags to all resources in the app\n   * @param tags Custom tags to apply to all resources\n   * @example\n   * app.addTags({\n   *   \"fjall:costAllocation:owner\": \"platform-team\",\n   *   \"fjall:costAllocation:cost-center\": \"CC-123\",\n   *   \"team:slack-channel\": \"#platform-alerts\"\n   * });\n   */\n  public addTags(tags: { [key: string]: string }): App {\n    // Merge tags but don't apply aspect yet\n    this.globalTags = {\n      ...this.globalTags,\n      ...tags\n    };\n    return this;\n  }\n}\n\nexport default App;\n"]}
|
|
@@ -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=
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Stack, CfnResource } from "aws-cdk-lib";
|
|
2
|
+
import { IConstruct } from "constructs";
|
|
3
|
+
/**
|
|
4
|
+
* DirectTagging provides a way to apply tags to resources without using aspects.
|
|
5
|
+
* This approach works by directly manipulating CloudFormation resources during
|
|
6
|
+
* stack initialization, avoiding the infinite loop issue in CDK v2.206.0+
|
|
7
|
+
*/
|
|
8
|
+
export declare class DirectTagging {
|
|
9
|
+
private static globalTags;
|
|
10
|
+
private static stackTags;
|
|
11
|
+
/**
|
|
12
|
+
* Set global tags that will be applied to all resources
|
|
13
|
+
*/
|
|
14
|
+
static setGlobalTags(tags: {
|
|
15
|
+
[key: string]: string;
|
|
16
|
+
}): void;
|
|
17
|
+
/**
|
|
18
|
+
* Set tags for a specific stack
|
|
19
|
+
*/
|
|
20
|
+
static setStackTags(stack: Stack, tags: {
|
|
21
|
+
[key: string]: string;
|
|
22
|
+
}): void;
|
|
23
|
+
/**
|
|
24
|
+
* Apply tags to a CloudFormation resource directly
|
|
25
|
+
*/
|
|
26
|
+
static tagCfnResource(resource: CfnResource): void;
|
|
27
|
+
/**
|
|
28
|
+
* Process a construct tree and tag all CloudFormation resources
|
|
29
|
+
*/
|
|
30
|
+
static processConstructTree(root: IConstruct): void;
|
|
31
|
+
}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DirectTagging = void 0;
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
+
/**
|
|
6
|
+
* DirectTagging provides a way to apply tags to resources without using aspects.
|
|
7
|
+
* This approach works by directly manipulating CloudFormation resources during
|
|
8
|
+
* stack initialization, avoiding the infinite loop issue in CDK v2.206.0+
|
|
9
|
+
*/
|
|
10
|
+
class DirectTagging {
|
|
11
|
+
/**
|
|
12
|
+
* Set global tags that will be applied to all resources
|
|
13
|
+
*/
|
|
14
|
+
static setGlobalTags(tags) {
|
|
15
|
+
DirectTagging.globalTags = {
|
|
16
|
+
...DirectTagging.globalTags,
|
|
17
|
+
...tags
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Set tags for a specific stack
|
|
22
|
+
*/
|
|
23
|
+
static setStackTags(stack, tags) {
|
|
24
|
+
const existingTags = DirectTagging.stackTags.get(stack) || {};
|
|
25
|
+
DirectTagging.stackTags.set(stack, {
|
|
26
|
+
...existingTags,
|
|
27
|
+
...tags
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Apply tags to a CloudFormation resource directly
|
|
32
|
+
*/
|
|
33
|
+
static tagCfnResource(resource) {
|
|
34
|
+
const stack = aws_cdk_lib_1.Stack.of(resource);
|
|
35
|
+
const stackTags = DirectTagging.stackTags.get(stack) || {};
|
|
36
|
+
const allTags = {
|
|
37
|
+
...DirectTagging.globalTags,
|
|
38
|
+
...stackTags
|
|
39
|
+
};
|
|
40
|
+
if (Object.keys(allTags).length === 0) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
// Check if resource supports tags
|
|
44
|
+
if (!('tags' in resource) || typeof resource.tags !== 'object') {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
// Get existing tags
|
|
48
|
+
const existingTags = resource.tags || [];
|
|
49
|
+
const tagMap = new Map();
|
|
50
|
+
// Add existing tags to map
|
|
51
|
+
if (Array.isArray(existingTags)) {
|
|
52
|
+
existingTags.forEach((tag) => {
|
|
53
|
+
if (tag.key && tag.value) {
|
|
54
|
+
tagMap.set(tag.key, tag.value);
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
// Add new tags (overwriting if they exist)
|
|
59
|
+
Object.entries(allTags).forEach(([key, value]) => {
|
|
60
|
+
tagMap.set(key, value);
|
|
61
|
+
});
|
|
62
|
+
// Convert back to array format
|
|
63
|
+
resource.tags = Array.from(tagMap.entries()).map(([key, value]) => ({
|
|
64
|
+
key,
|
|
65
|
+
value
|
|
66
|
+
}));
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Process a construct tree and tag all CloudFormation resources
|
|
70
|
+
*/
|
|
71
|
+
static processConstructTree(root) {
|
|
72
|
+
const processNode = (node) => {
|
|
73
|
+
// Check if this is a CloudFormation resource
|
|
74
|
+
if (aws_cdk_lib_1.CfnResource.isCfnResource(node)) {
|
|
75
|
+
DirectTagging.tagCfnResource(node);
|
|
76
|
+
}
|
|
77
|
+
// Process children
|
|
78
|
+
node.node.children.forEach(child => processNode(child));
|
|
79
|
+
};
|
|
80
|
+
processNode(root);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
exports.DirectTagging = DirectTagging;
|
|
84
|
+
DirectTagging.globalTags = {};
|
|
85
|
+
DirectTagging.stackTags = new Map();
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlyZWN0VGFnZ2luZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy9kaXJlY3RUYWdnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUFpRDtBQUdqRDs7OztHQUlHO0FBQ0gsTUFBYSxhQUFhO0lBSXhCOztPQUVHO0lBQ0ksTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUErQjtRQUN6RCxhQUFhLENBQUMsVUFBVSxHQUFHO1lBQ3pCLEdBQUcsYUFBYSxDQUFDLFVBQVU7WUFDM0IsR0FBRyxJQUFJO1NBQ1IsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLE1BQU0sQ0FBQyxZQUFZLENBQUMsS0FBWSxFQUFFLElBQStCO1FBQ3RFLE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM5RCxhQUFhLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUU7WUFDakMsR0FBRyxZQUFZO1lBQ2YsR0FBRyxJQUFJO1NBQ1IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0ksTUFBTSxDQUFDLGNBQWMsQ0FBQyxRQUFxQjtRQUNoRCxNQUFNLEtBQUssR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNqQyxNQUFNLFNBQVMsR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDM0QsTUFBTSxPQUFPLEdBQUc7WUFDZCxHQUFHLGFBQWEsQ0FBQyxVQUFVO1lBQzNCLEdBQUcsU0FBUztTQUNiLENBQUM7UUFFRixJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ3RDLE9BQU87UUFDVCxDQUFDO1FBRUQsa0NBQWtDO1FBQ2xDLElBQUksQ0FBQyxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsSUFBSSxPQUFPLFFBQVEsQ0FBQyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDL0QsT0FBTztRQUNULENBQUM7UUFFRCxvQkFBb0I7UUFDcEIsTUFBTSxZQUFZLEdBQUcsUUFBUSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7UUFDekMsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7UUFFekMsMkJBQTJCO1FBQzNCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO1lBQ2hDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFRLEVBQUUsRUFBRTtnQkFDaEMsSUFBSSxHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztvQkFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDakMsQ0FBQztZQUNILENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUVELDJDQUEyQztRQUMzQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDL0MsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDekIsQ0FBQyxDQUFDLENBQUM7UUFFSCwrQkFBK0I7UUFDL0IsUUFBUSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ2xFLEdBQUc7WUFDSCxLQUFLO1NBQ04sQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsb0JBQW9CLENBQUMsSUFBZ0I7UUFDakQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxJQUFnQixFQUFFLEVBQUU7WUFDdkMsNkNBQTZDO1lBQzdDLElBQUkseUJBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztnQkFDcEMsYUFBYSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNyQyxDQUFDO1lBRUQsbUJBQW1CO1lBQ25CLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzFELENBQUMsQ0FBQztRQUVGLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDOztBQXJGSCxzQ0FzRkM7QUFyRmdCLHdCQUFVLEdBQThCLEVBQUUsQ0FBQztBQUMzQyx1QkFBUyxHQUEwQyxJQUFJLEdBQUcsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU3RhY2ssIENmblJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBJQ29uc3RydWN0LCBOb2RlIH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuLyoqXG4gKiBEaXJlY3RUYWdnaW5nIHByb3ZpZGVzIGEgd2F5IHRvIGFwcGx5IHRhZ3MgdG8gcmVzb3VyY2VzIHdpdGhvdXQgdXNpbmcgYXNwZWN0cy5cbiAqIFRoaXMgYXBwcm9hY2ggd29ya3MgYnkgZGlyZWN0bHkgbWFuaXB1bGF0aW5nIENsb3VkRm9ybWF0aW9uIHJlc291cmNlcyBkdXJpbmdcbiAqIHN0YWNrIGluaXRpYWxpemF0aW9uLCBhdm9pZGluZyB0aGUgaW5maW5pdGUgbG9vcCBpc3N1ZSBpbiBDREsgdjIuMjA2LjArXG4gKi9cbmV4cG9ydCBjbGFzcyBEaXJlY3RUYWdnaW5nIHtcbiAgcHJpdmF0ZSBzdGF0aWMgZ2xvYmFsVGFnczogeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfSA9IHt9O1xuICBwcml2YXRlIHN0YXRpYyBzdGFja1RhZ3M6IE1hcDxTdGFjaywgeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfT4gPSBuZXcgTWFwKCk7XG4gIFxuICAvKipcbiAgICogU2V0IGdsb2JhbCB0YWdzIHRoYXQgd2lsbCBiZSBhcHBsaWVkIHRvIGFsbCByZXNvdXJjZXNcbiAgICovXG4gIHB1YmxpYyBzdGF0aWMgc2V0R2xvYmFsVGFncyh0YWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9KTogdm9pZCB7XG4gICAgRGlyZWN0VGFnZ2luZy5nbG9iYWxUYWdzID0ge1xuICAgICAgLi4uRGlyZWN0VGFnZ2luZy5nbG9iYWxUYWdzLFxuICAgICAgLi4udGFnc1xuICAgIH07XG4gIH1cbiAgXG4gIC8qKlxuICAgKiBTZXQgdGFncyBmb3IgYSBzcGVjaWZpYyBzdGFja1xuICAgKi9cbiAgcHVibGljIHN0YXRpYyBzZXRTdGFja1RhZ3Moc3RhY2s6IFN0YWNrLCB0YWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9KTogdm9pZCB7XG4gICAgY29uc3QgZXhpc3RpbmdUYWdzID0gRGlyZWN0VGFnZ2luZy5zdGFja1RhZ3MuZ2V0KHN0YWNrKSB8fCB7fTtcbiAgICBEaXJlY3RUYWdnaW5nLnN0YWNrVGFncy5zZXQoc3RhY2ssIHtcbiAgICAgIC4uLmV4aXN0aW5nVGFncyxcbiAgICAgIC4uLnRhZ3NcbiAgICB9KTtcbiAgfVxuICBcbiAgLyoqXG4gICAqIEFwcGx5IHRhZ3MgdG8gYSBDbG91ZEZvcm1hdGlvbiByZXNvdXJjZSBkaXJlY3RseVxuICAgKi9cbiAgcHVibGljIHN0YXRpYyB0YWdDZm5SZXNvdXJjZShyZXNvdXJjZTogQ2ZuUmVzb3VyY2UpOiB2b2lkIHtcbiAgICBjb25zdCBzdGFjayA9IFN0YWNrLm9mKHJlc291cmNlKTtcbiAgICBjb25zdCBzdGFja1RhZ3MgPSBEaXJlY3RUYWdnaW5nLnN0YWNrVGFncy5nZXQoc3RhY2spIHx8IHt9O1xuICAgIGNvbnN0IGFsbFRhZ3MgPSB7XG4gICAgICAuLi5EaXJlY3RUYWdnaW5nLmdsb2JhbFRhZ3MsXG4gICAgICAuLi5zdGFja1RhZ3NcbiAgICB9O1xuICAgIFxuICAgIGlmIChPYmplY3Qua2V5cyhhbGxUYWdzKS5sZW5ndGggPT09IDApIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgXG4gICAgLy8gQ2hlY2sgaWYgcmVzb3VyY2Ugc3VwcG9ydHMgdGFnc1xuICAgIGlmICghKCd0YWdzJyBpbiByZXNvdXJjZSkgfHwgdHlwZW9mIHJlc291cmNlLnRhZ3MgIT09ICdvYmplY3QnKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuICAgIFxuICAgIC8vIEdldCBleGlzdGluZyB0YWdzXG4gICAgY29uc3QgZXhpc3RpbmdUYWdzID0gcmVzb3VyY2UudGFncyB8fCBbXTtcbiAgICBjb25zdCB0YWdNYXAgPSBuZXcgTWFwPHN0cmluZywgc3RyaW5nPigpO1xuICAgIFxuICAgIC8vIEFkZCBleGlzdGluZyB0YWdzIHRvIG1hcFxuICAgIGlmIChBcnJheS5pc0FycmF5KGV4aXN0aW5nVGFncykpIHtcbiAgICAgIGV4aXN0aW5nVGFncy5mb3JFYWNoKCh0YWc6IGFueSkgPT4ge1xuICAgICAgICBpZiAodGFnLmtleSAmJiB0YWcudmFsdWUpIHtcbiAgICAgICAgICB0YWdNYXAuc2V0KHRhZy5rZXksIHRhZy52YWx1ZSk7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH1cbiAgICBcbiAgICAvLyBBZGQgbmV3IHRhZ3MgKG92ZXJ3cml0aW5nIGlmIHRoZXkgZXhpc3QpXG4gICAgT2JqZWN0LmVudHJpZXMoYWxsVGFncykuZm9yRWFjaCgoW2tleSwgdmFsdWVdKSA9PiB7XG4gICAgICB0YWdNYXAuc2V0KGtleSwgdmFsdWUpO1xuICAgIH0pO1xuICAgIFxuICAgIC8vIENvbnZlcnQgYmFjayB0byBhcnJheSBmb3JtYXRcbiAgICByZXNvdXJjZS50YWdzID0gQXJyYXkuZnJvbSh0YWdNYXAuZW50cmllcygpKS5tYXAoKFtrZXksIHZhbHVlXSkgPT4gKHtcbiAgICAgIGtleSxcbiAgICAgIHZhbHVlXG4gICAgfSkpO1xuICB9XG4gIFxuICAvKipcbiAgICogUHJvY2VzcyBhIGNvbnN0cnVjdCB0cmVlIGFuZCB0YWcgYWxsIENsb3VkRm9ybWF0aW9uIHJlc291cmNlc1xuICAgKi9cbiAgcHVibGljIHN0YXRpYyBwcm9jZXNzQ29uc3RydWN0VHJlZShyb290OiBJQ29uc3RydWN0KTogdm9pZCB7XG4gICAgY29uc3QgcHJvY2Vzc05vZGUgPSAobm9kZTogSUNvbnN0cnVjdCkgPT4ge1xuICAgICAgLy8gQ2hlY2sgaWYgdGhpcyBpcyBhIENsb3VkRm9ybWF0aW9uIHJlc291cmNlXG4gICAgICBpZiAoQ2ZuUmVzb3VyY2UuaXNDZm5SZXNvdXJjZShub2RlKSkge1xuICAgICAgICBEaXJlY3RUYWdnaW5nLnRhZ0NmblJlc291cmNlKG5vZGUpO1xuICAgICAgfVxuICAgICAgXG4gICAgICAvLyBQcm9jZXNzIGNoaWxkcmVuXG4gICAgICBub2RlLm5vZGUuY2hpbGRyZW4uZm9yRWFjaChjaGlsZCA9PiBwcm9jZXNzTm9kZShjaGlsZCkpO1xuICAgIH07XG4gICAgXG4gICAgcHJvY2Vzc05vZGUocm9vdCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Construct } from "constructs";
|
|
2
|
+
/**
|
|
3
|
+
* Base construct for Fjall resources that automatically
|
|
4
|
+
* applies tags from context during construction.
|
|
5
|
+
*/
|
|
6
|
+
export declare class FjallConstruct extends Construct {
|
|
7
|
+
constructor(scope: Construct, id: string);
|
|
8
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FjallConstruct = void 0;
|
|
4
|
+
const constructs_1 = require("constructs");
|
|
5
|
+
const tagContext_1 = require("./tagContext");
|
|
6
|
+
/**
|
|
7
|
+
* Base construct for Fjall resources that automatically
|
|
8
|
+
* applies tags from context during construction.
|
|
9
|
+
*/
|
|
10
|
+
class FjallConstruct extends constructs_1.Construct {
|
|
11
|
+
constructor(scope, id) {
|
|
12
|
+
super(scope, id);
|
|
13
|
+
// Apply tags from context during construction
|
|
14
|
+
tagContext_1.TagContext.applyTagsFromContext(this.node);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.FjallConstruct = FjallConstruct;
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmphbGxDb25zdHJ1Y3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvZmphbGxDb25zdHJ1Y3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBQ3ZDLDZDQUEwQztBQUUxQzs7O0dBR0c7QUFDSCxNQUFhLGNBQWUsU0FBUSxzQkFBUztJQUMzQyxZQUFZLEtBQWdCLEVBQUUsRUFBVTtRQUN0QyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLDhDQUE4QztRQUM5Qyx1QkFBVSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0Y7QUFQRCx3Q0FPQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBUYWdDb250ZXh0IH0gZnJvbSBcIi4vdGFnQ29udGV4dFwiO1xuXG4vKipcbiAqIEJhc2UgY29uc3RydWN0IGZvciBGamFsbCByZXNvdXJjZXMgdGhhdCBhdXRvbWF0aWNhbGx5XG4gKiBhcHBsaWVzIHRhZ3MgZnJvbSBjb250ZXh0IGR1cmluZyBjb25zdHJ1Y3Rpb24uXG4gKi9cbmV4cG9ydCBjbGFzcyBGamFsbENvbnN0cnVjdCBleHRlbmRzIENvbnN0cnVjdCB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIFxuICAgIC8vIEFwcGx5IHRhZ3MgZnJvbSBjb250ZXh0IGR1cmluZyBjb25zdHJ1Y3Rpb25cbiAgICBUYWdDb250ZXh0LmFwcGx5VGFnc0Zyb21Db250ZXh0KHRoaXMubm9kZSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { DefaultStackSynthesizer } from "aws-cdk-lib";
|
|
2
|
+
import { ISynthesisSession } from "aws-cdk-lib/core";
|
|
3
|
+
/**
|
|
4
|
+
* Custom stack synthesizer that applies tags during synthesis.
|
|
5
|
+
* This avoids the infinite loop issue with aspects in CDK v2.206.0+
|
|
6
|
+
*/
|
|
7
|
+
export declare class FjallStackSynthesizer extends DefaultStackSynthesizer {
|
|
8
|
+
synthesize(session: ISynthesisSession): void;
|
|
9
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FjallStackSynthesizer = void 0;
|
|
4
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
|
+
const directTagging_1 = require("./directTagging");
|
|
6
|
+
/**
|
|
7
|
+
* Custom stack synthesizer that applies tags during synthesis.
|
|
8
|
+
* This avoids the infinite loop issue with aspects in CDK v2.206.0+
|
|
9
|
+
*/
|
|
10
|
+
class FjallStackSynthesizer extends aws_cdk_lib_1.DefaultStackSynthesizer {
|
|
11
|
+
synthesize(session) {
|
|
12
|
+
const stack = this.boundStack;
|
|
13
|
+
// Process the entire construct tree to apply tags
|
|
14
|
+
if (stack) {
|
|
15
|
+
directTagging_1.DirectTagging.processConstructTree(stack);
|
|
16
|
+
}
|
|
17
|
+
// Continue with normal synthesis
|
|
18
|
+
super.synthesize(session);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.FjallStackSynthesizer = FjallStackSynthesizer;
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmphbGxTdGFja1N5bnRoZXNpemVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL2ZqYWxsU3RhY2tTeW50aGVzaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBc0Q7QUFFdEQsbURBQWdEO0FBRWhEOzs7R0FHRztBQUNILE1BQWEscUJBQXNCLFNBQVEscUNBQXVCO0lBQ3pELFVBQVUsQ0FBQyxPQUEwQjtRQUMxQyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBRTlCLGtEQUFrRDtRQUNsRCxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ1YsNkJBQWEsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1QyxDQUFDO1FBRUQsaUNBQWlDO1FBQ2pDLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBWkQsc0RBWUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBEZWZhdWx0U3RhY2tTeW50aGVzaXplciB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0IHsgSVN5bnRoZXNpc1Nlc3Npb24gfSBmcm9tIFwiYXdzLWNkay1saWIvY29yZVwiO1xuaW1wb3J0IHsgRGlyZWN0VGFnZ2luZyB9IGZyb20gXCIuL2RpcmVjdFRhZ2dpbmdcIjtcblxuLyoqXG4gKiBDdXN0b20gc3RhY2sgc3ludGhlc2l6ZXIgdGhhdCBhcHBsaWVzIHRhZ3MgZHVyaW5nIHN5bnRoZXNpcy5cbiAqIFRoaXMgYXZvaWRzIHRoZSBpbmZpbml0ZSBsb29wIGlzc3VlIHdpdGggYXNwZWN0cyBpbiBDREsgdjIuMjA2LjArXG4gKi9cbmV4cG9ydCBjbGFzcyBGamFsbFN0YWNrU3ludGhlc2l6ZXIgZXh0ZW5kcyBEZWZhdWx0U3RhY2tTeW50aGVzaXplciB7XG4gIHB1YmxpYyBzeW50aGVzaXplKHNlc3Npb246IElTeW50aGVzaXNTZXNzaW9uKTogdm9pZCB7XG4gICAgY29uc3Qgc3RhY2sgPSB0aGlzLmJvdW5kU3RhY2s7XG4gICAgXG4gICAgLy8gUHJvY2VzcyB0aGUgZW50aXJlIGNvbnN0cnVjdCB0cmVlIHRvIGFwcGx5IHRhZ3NcbiAgICBpZiAoc3RhY2spIHtcbiAgICAgIERpcmVjdFRhZ2dpbmcucHJvY2Vzc0NvbnN0cnVjdFRyZWUoc3RhY2spO1xuICAgIH1cbiAgICBcbiAgICAvLyBDb250aW51ZSB3aXRoIG5vcm1hbCBzeW50aGVzaXNcbiAgICBzdXBlci5zeW50aGVzaXplKHNlc3Npb24pO1xuICB9XG59XG4iXX0=
|
|
@@ -3,40 +3,17 @@ import { IConstruct } from "constructs";
|
|
|
3
3
|
/**
|
|
4
4
|
* Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.
|
|
5
5
|
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* const app = new App();
|
|
12
|
-
*
|
|
13
|
-
* // Define the required tags
|
|
14
|
-
* const tags = {
|
|
15
|
-
* "fjall:costAllocation:environment": "production",
|
|
16
|
-
* "fjall:costAllocation:owner": "engineering"
|
|
17
|
-
* };
|
|
18
|
-
*
|
|
19
|
-
* // Add the aspect – CDK will invoke it for every construct during synthesis
|
|
20
|
-
* Aspects.of(app).add(new StandardTagsAspect(tags));
|
|
21
|
-
*
|
|
22
|
-
* // define stacks/constructs after the aspect is attached
|
|
23
|
-
* new MyStack(app, "MyStack");
|
|
24
|
-
*
|
|
25
|
-
* app.synth();
|
|
26
|
-
* ```
|
|
27
|
-
*
|
|
28
|
-
* How it works:
|
|
29
|
-
* 1. CDK traverses every construct and calls `visit(node)`.
|
|
30
|
-
* 2. For each required tag the aspect adds it to the construct via `Tags.of(node).add()`.
|
|
31
|
-
* 3. Constructs that don't support tagging are silently ignored.
|
|
32
|
-
* 4. The resulting CloudFormation template contains the enforced tags on all resources.
|
|
33
|
-
*
|
|
34
|
-
* If a tag already exists on a construct, CDK de-duplicates by key so no duplication occurs.
|
|
6
|
+
* Updated for CDK v2.206.0+ compatibility:
|
|
7
|
+
* - No longer uses Tags.of() during aspect visitation to avoid infinite loops
|
|
8
|
+
* - Directly manipulates CloudFormation resources instead
|
|
9
|
+
* - Maintains the same clean API and automatic tagging benefits
|
|
35
10
|
*/
|
|
36
11
|
export declare class StandardTagsAspect implements IAspect {
|
|
37
12
|
private readonly requiredTags;
|
|
13
|
+
private readonly taggedResources;
|
|
38
14
|
constructor(requiredTags: {
|
|
39
15
|
[key: string]: string;
|
|
40
16
|
});
|
|
41
17
|
visit(node: IConstruct): void;
|
|
18
|
+
private tagCfnResource;
|
|
42
19
|
}
|
|
@@ -5,46 +5,85 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
|
5
5
|
/**
|
|
6
6
|
* Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.
|
|
7
7
|
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* const app = new App();
|
|
14
|
-
*
|
|
15
|
-
* // Define the required tags
|
|
16
|
-
* const tags = {
|
|
17
|
-
* "fjall:costAllocation:environment": "production",
|
|
18
|
-
* "fjall:costAllocation:owner": "engineering"
|
|
19
|
-
* };
|
|
20
|
-
*
|
|
21
|
-
* // Add the aspect – CDK will invoke it for every construct during synthesis
|
|
22
|
-
* Aspects.of(app).add(new StandardTagsAspect(tags));
|
|
23
|
-
*
|
|
24
|
-
* // define stacks/constructs after the aspect is attached
|
|
25
|
-
* new MyStack(app, "MyStack");
|
|
26
|
-
*
|
|
27
|
-
* app.synth();
|
|
28
|
-
* ```
|
|
29
|
-
*
|
|
30
|
-
* How it works:
|
|
31
|
-
* 1. CDK traverses every construct and calls `visit(node)`.
|
|
32
|
-
* 2. For each required tag the aspect adds it to the construct via `Tags.of(node).add()`.
|
|
33
|
-
* 3. Constructs that don't support tagging are silently ignored.
|
|
34
|
-
* 4. The resulting CloudFormation template contains the enforced tags on all resources.
|
|
35
|
-
*
|
|
36
|
-
* If a tag already exists on a construct, CDK de-duplicates by key so no duplication occurs.
|
|
8
|
+
* Updated for CDK v2.206.0+ compatibility:
|
|
9
|
+
* - No longer uses Tags.of() during aspect visitation to avoid infinite loops
|
|
10
|
+
* - Directly manipulates CloudFormation resources instead
|
|
11
|
+
* - Maintains the same clean API and automatic tagging benefits
|
|
37
12
|
*/
|
|
38
13
|
class StandardTagsAspect {
|
|
39
14
|
constructor(requiredTags) {
|
|
15
|
+
this.taggedResources = new WeakSet();
|
|
40
16
|
this.requiredTags = requiredTags;
|
|
41
17
|
}
|
|
42
18
|
visit(node) {
|
|
43
|
-
//
|
|
44
|
-
|
|
45
|
-
|
|
19
|
+
// Skip if already processed
|
|
20
|
+
if (this.taggedResources.has(node)) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
// Only process CfnResource nodes to avoid the Tags.of() issue
|
|
24
|
+
if (aws_cdk_lib_1.CfnResource.isCfnResource(node)) {
|
|
25
|
+
this.tagCfnResource(node);
|
|
26
|
+
this.taggedResources.add(node);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
tagCfnResource(resource) {
|
|
30
|
+
// Check if resource supports tags
|
|
31
|
+
const cfnResourceType = resource.cfnResourceType;
|
|
32
|
+
// List of CloudFormation resource types that don't support tags
|
|
33
|
+
const unsupportedTypes = [
|
|
34
|
+
'AWS::CloudFormation::WaitConditionHandle',
|
|
35
|
+
'AWS::CloudFormation::WaitCondition',
|
|
36
|
+
'AWS::Lambda::Permission',
|
|
37
|
+
'AWS::IAM::Policy',
|
|
38
|
+
'AWS::IAM::Role',
|
|
39
|
+
'AWS::IAM::User',
|
|
40
|
+
'AWS::IAM::Group',
|
|
41
|
+
'AWS::Logs::LogGroup',
|
|
42
|
+
'AWS::Logs::LogStream',
|
|
43
|
+
'AWS::Events::Rule'
|
|
44
|
+
];
|
|
45
|
+
if (unsupportedTypes.includes(cfnResourceType)) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
// Get existing tags
|
|
49
|
+
let tags = resource.tags;
|
|
50
|
+
if (!tags) {
|
|
51
|
+
// Initialize tags if not present
|
|
52
|
+
resource.tags = [];
|
|
53
|
+
tags = resource.tags;
|
|
54
|
+
}
|
|
55
|
+
// Convert to map for easier manipulation
|
|
56
|
+
const tagMap = new Map();
|
|
57
|
+
// Add existing tags
|
|
58
|
+
if (Array.isArray(tags)) {
|
|
59
|
+
tags.forEach((tag) => {
|
|
60
|
+
if (tag && typeof tag === 'object' && 'key' in tag && 'value' in tag) {
|
|
61
|
+
tagMap.set(tag.key, tag.value);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
46
64
|
}
|
|
65
|
+
// Check for direct tags in metadata
|
|
66
|
+
const metadata = resource.node.metadata;
|
|
67
|
+
const directTagsMetadata = metadata.filter(m => m.type === 'fjall:direct-tags');
|
|
68
|
+
directTagsMetadata.forEach(m => {
|
|
69
|
+
if (m.data && typeof m.data === 'object') {
|
|
70
|
+
Object.entries(m.data).forEach(([key, value]) => {
|
|
71
|
+
if (typeof value === 'string') {
|
|
72
|
+
tagMap.set(key, value);
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
// Add required tags (overwriting if they exist)
|
|
78
|
+
Object.entries(this.requiredTags).forEach(([key, value]) => {
|
|
79
|
+
tagMap.set(key, value);
|
|
80
|
+
});
|
|
81
|
+
// Convert back to array format
|
|
82
|
+
resource.tags = Array.from(tagMap.entries()).map(([key, value]) => ({
|
|
83
|
+
key,
|
|
84
|
+
value
|
|
85
|
+
}));
|
|
47
86
|
}
|
|
48
87
|
}
|
|
49
88
|
exports.StandardTagsAspect = StandardTagsAspect;
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRUYWdzQXNwZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL3N0YW5kYXJkVGFnc0FzcGVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBMEQ7QUFHMUQ7Ozs7Ozs7R0FPRztBQUNILE1BQWEsa0JBQWtCO0lBSTdCLFlBQVksWUFBdUM7UUFGbEMsb0JBQWUsR0FBRyxJQUFJLE9BQU8sRUFBYyxDQUFDO1FBRzNELElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDO0lBQ25DLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBZ0I7UUFDcEIsNEJBQTRCO1FBQzVCLElBQUksSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNuQyxPQUFPO1FBQ1QsQ0FBQztRQUVELDhEQUE4RDtRQUM5RCxJQUFJLHlCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFtQixDQUFDLENBQUM7WUFDekMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDakMsQ0FBQztJQUNILENBQUM7SUFFTyxjQUFjLENBQUMsUUFBcUI7UUFDMUMsa0NBQWtDO1FBQ2xDLE1BQU0sZUFBZSxHQUFHLFFBQVEsQ0FBQyxlQUFlLENBQUM7UUFFakQsZ0VBQWdFO1FBQ2hFLE1BQU0sZ0JBQWdCLEdBQUc7WUFDdkIsMENBQTBDO1lBQzFDLG9DQUFvQztZQUNwQyx5QkFBeUI7WUFDekIsa0JBQWtCO1lBQ2xCLGdCQUFnQjtZQUNoQixnQkFBZ0I7WUFDaEIsaUJBQWlCO1lBQ2pCLHFCQUFxQjtZQUNyQixzQkFBc0I7WUFDdEIsbUJBQW1CO1NBQ3BCLENBQUM7UUFFRixJQUFJLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQy9DLE9BQU87UUFDVCxDQUFDO1FBRUQsb0JBQW9CO1FBQ3BCLElBQUksSUFBSSxHQUFJLFFBQWdCLENBQUMsSUFBSSxDQUFDO1FBRWxDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNWLGlDQUFpQztZQUNoQyxRQUFnQixDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDNUIsSUFBSSxHQUFJLFFBQWdCLENBQUMsSUFBSSxDQUFDO1FBQ2hDLENBQUM7UUFFRCx5Q0FBeUM7UUFDekMsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7UUFFekMsb0JBQW9CO1FBQ3BCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3hCLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFRLEVBQUUsRUFBRTtnQkFDeEIsSUFBSSxHQUFHLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEtBQUssSUFBSSxHQUFHLElBQUksT0FBTyxJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUNyRSxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUNqQyxDQUFDO1lBQ0gsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO1FBRUQsb0NBQW9DO1FBQ3BDLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3hDLE1BQU0sa0JBQWtCLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssbUJBQW1CLENBQUMsQ0FBQztRQUNoRixrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDN0IsSUFBSSxDQUFDLENBQUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztnQkFDekMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtvQkFDOUMsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQzt3QkFDOUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7b0JBQ3pCLENBQUM7Z0JBQ0gsQ0FBQyxDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7UUFFSCxnREFBZ0Q7UUFDaEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUN6RCxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN6QixDQUFDLENBQUMsQ0FBQztRQUVILCtCQUErQjtRQUM5QixRQUFnQixDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQzNFLEdBQUc7WUFDSCxLQUFLO1NBQ04sQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0NBQ0Y7QUF4RkQsZ0RBd0ZDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSUFzcGVjdCwgU3RhY2ssIENmblJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBJQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuLyoqXG4gKiBBc3BlY3QgdG8gZW5mb3JjZSBhIHN0YW5kYXJkIHNldCBvZiB0YWdzIG9uIGV2ZXJ5IHRhZy1jYXBhYmxlIHJlc291cmNlIGluIGEgY29uc3RydWN0IHRyZWUuXG4gKiBcbiAqIFVwZGF0ZWQgZm9yIENESyB2Mi4yMDYuMCsgY29tcGF0aWJpbGl0eTpcbiAqIC0gTm8gbG9uZ2VyIHVzZXMgVGFncy5vZigpIGR1cmluZyBhc3BlY3QgdmlzaXRhdGlvbiB0byBhdm9pZCBpbmZpbml0ZSBsb29wc1xuICogLSBEaXJlY3RseSBtYW5pcHVsYXRlcyBDbG91ZEZvcm1hdGlvbiByZXNvdXJjZXMgaW5zdGVhZFxuICogLSBNYWludGFpbnMgdGhlIHNhbWUgY2xlYW4gQVBJIGFuZCBhdXRvbWF0aWMgdGFnZ2luZyBiZW5lZml0c1xuICovXG5leHBvcnQgY2xhc3MgU3RhbmRhcmRUYWdzQXNwZWN0IGltcGxlbWVudHMgSUFzcGVjdCB7XG4gIHByaXZhdGUgcmVhZG9ubHkgcmVxdWlyZWRUYWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xuICBwcml2YXRlIHJlYWRvbmx5IHRhZ2dlZFJlc291cmNlcyA9IG5ldyBXZWFrU2V0PElDb25zdHJ1Y3Q+KCk7XG5cbiAgY29uc3RydWN0b3IocmVxdWlyZWRUYWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9KSB7XG4gICAgdGhpcy5yZXF1aXJlZFRhZ3MgPSByZXF1aXJlZFRhZ3M7XG4gIH1cblxuICB2aXNpdChub2RlOiBJQ29uc3RydWN0KTogdm9pZCB7XG4gICAgLy8gU2tpcCBpZiBhbHJlYWR5IHByb2Nlc3NlZFxuICAgIGlmICh0aGlzLnRhZ2dlZFJlc291cmNlcy5oYXMobm9kZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgXG4gICAgLy8gT25seSBwcm9jZXNzIENmblJlc291cmNlIG5vZGVzIHRvIGF2b2lkIHRoZSBUYWdzLm9mKCkgaXNzdWVcbiAgICBpZiAoQ2ZuUmVzb3VyY2UuaXNDZm5SZXNvdXJjZShub2RlKSkge1xuICAgICAgdGhpcy50YWdDZm5SZXNvdXJjZShub2RlIGFzIENmblJlc291cmNlKTtcbiAgICAgIHRoaXMudGFnZ2VkUmVzb3VyY2VzLmFkZChub2RlKTtcbiAgICB9XG4gIH1cbiAgXG4gIHByaXZhdGUgdGFnQ2ZuUmVzb3VyY2UocmVzb3VyY2U6IENmblJlc291cmNlKTogdm9pZCB7XG4gICAgLy8gQ2hlY2sgaWYgcmVzb3VyY2Ugc3VwcG9ydHMgdGFnc1xuICAgIGNvbnN0IGNmblJlc291cmNlVHlwZSA9IHJlc291cmNlLmNmblJlc291cmNlVHlwZTtcbiAgICBcbiAgICAvLyBMaXN0IG9mIENsb3VkRm9ybWF0aW9uIHJlc291cmNlIHR5cGVzIHRoYXQgZG9uJ3Qgc3VwcG9ydCB0YWdzXG4gICAgY29uc3QgdW5zdXBwb3J0ZWRUeXBlcyA9IFtcbiAgICAgICdBV1M6OkNsb3VkRm9ybWF0aW9uOjpXYWl0Q29uZGl0aW9uSGFuZGxlJyxcbiAgICAgICdBV1M6OkNsb3VkRm9ybWF0aW9uOjpXYWl0Q29uZGl0aW9uJyxcbiAgICAgICdBV1M6OkxhbWJkYTo6UGVybWlzc2lvbicsXG4gICAgICAnQVdTOjpJQU06OlBvbGljeScsXG4gICAgICAnQVdTOjpJQU06OlJvbGUnLFxuICAgICAgJ0FXUzo6SUFNOjpVc2VyJyxcbiAgICAgICdBV1M6OklBTTo6R3JvdXAnLFxuICAgICAgJ0FXUzo6TG9nczo6TG9nR3JvdXAnLFxuICAgICAgJ0FXUzo6TG9nczo6TG9nU3RyZWFtJyxcbiAgICAgICdBV1M6OkV2ZW50czo6UnVsZSdcbiAgICBdO1xuICAgIFxuICAgIGlmICh1bnN1cHBvcnRlZFR5cGVzLmluY2x1ZGVzKGNmblJlc291cmNlVHlwZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgXG4gICAgLy8gR2V0IGV4aXN0aW5nIHRhZ3NcbiAgICBsZXQgdGFncyA9IChyZXNvdXJjZSBhcyBhbnkpLnRhZ3M7XG4gICAgXG4gICAgaWYgKCF0YWdzKSB7XG4gICAgICAvLyBJbml0aWFsaXplIHRhZ3MgaWYgbm90IHByZXNlbnRcbiAgICAgIChyZXNvdXJjZSBhcyBhbnkpLnRhZ3MgPSBbXTtcbiAgICAgIHRhZ3MgPSAocmVzb3VyY2UgYXMgYW55KS50YWdzO1xuICAgIH1cbiAgICBcbiAgICAvLyBDb252ZXJ0IHRvIG1hcCBmb3IgZWFzaWVyIG1hbmlwdWxhdGlvblxuICAgIGNvbnN0IHRhZ01hcCA9IG5ldyBNYXA8c3RyaW5nLCBzdHJpbmc+KCk7XG4gICAgXG4gICAgLy8gQWRkIGV4aXN0aW5nIHRhZ3NcbiAgICBpZiAoQXJyYXkuaXNBcnJheSh0YWdzKSkge1xuICAgICAgdGFncy5mb3JFYWNoKCh0YWc6IGFueSkgPT4ge1xuICAgICAgICBpZiAodGFnICYmIHR5cGVvZiB0YWcgPT09ICdvYmplY3QnICYmICdrZXknIGluIHRhZyAmJiAndmFsdWUnIGluIHRhZykge1xuICAgICAgICAgIHRhZ01hcC5zZXQodGFnLmtleSwgdGFnLnZhbHVlKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfVxuICAgIFxuICAgIC8vIENoZWNrIGZvciBkaXJlY3QgdGFncyBpbiBtZXRhZGF0YVxuICAgIGNvbnN0IG1ldGFkYXRhID0gcmVzb3VyY2Uubm9kZS5tZXRhZGF0YTtcbiAgICBjb25zdCBkaXJlY3RUYWdzTWV0YWRhdGEgPSBtZXRhZGF0YS5maWx0ZXIobSA9PiBtLnR5cGUgPT09ICdmamFsbDpkaXJlY3QtdGFncycpO1xuICAgIGRpcmVjdFRhZ3NNZXRhZGF0YS5mb3JFYWNoKG0gPT4ge1xuICAgICAgaWYgKG0uZGF0YSAmJiB0eXBlb2YgbS5kYXRhID09PSAnb2JqZWN0Jykge1xuICAgICAgICBPYmplY3QuZW50cmllcyhtLmRhdGEpLmZvckVhY2goKFtrZXksIHZhbHVlXSkgPT4ge1xuICAgICAgICAgIGlmICh0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnKSB7XG4gICAgICAgICAgICB0YWdNYXAuc2V0KGtleSwgdmFsdWUpO1xuICAgICAgICAgIH1cbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgfSk7XG4gICAgXG4gICAgLy8gQWRkIHJlcXVpcmVkIHRhZ3MgKG92ZXJ3cml0aW5nIGlmIHRoZXkgZXhpc3QpXG4gICAgT2JqZWN0LmVudHJpZXModGhpcy5yZXF1aXJlZFRhZ3MpLmZvckVhY2goKFtrZXksIHZhbHVlXSkgPT4ge1xuICAgICAgdGFnTWFwLnNldChrZXksIHZhbHVlKTtcbiAgICB9KTtcbiAgICBcbiAgICAvLyBDb252ZXJ0IGJhY2sgdG8gYXJyYXkgZm9ybWF0XG4gICAgKHJlc291cmNlIGFzIGFueSkudGFncyA9IEFycmF5LmZyb20odGFnTWFwLmVudHJpZXMoKSkubWFwKChba2V5LCB2YWx1ZV0pID0+ICh7XG4gICAgICBrZXksXG4gICAgICB2YWx1ZVxuICAgIH0pKTtcbiAgfVxufVxuIl19
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Node } from "constructs";
|
|
2
|
+
/**
|
|
3
|
+
* TagContext provides a CDK context-based approach for passing tags
|
|
4
|
+
* down the construct tree without using aspects.
|
|
5
|
+
*
|
|
6
|
+
* This avoids the infinite loop issue with Tags.of() creating aspects
|
|
7
|
+
* during the aspect visitation phase in CDK v2.206.0+
|
|
8
|
+
*/
|
|
9
|
+
export declare class TagContext {
|
|
10
|
+
private static readonly TAG_CONTEXT_KEY;
|
|
11
|
+
/**
|
|
12
|
+
* Set tags in the context for a construct
|
|
13
|
+
*/
|
|
14
|
+
static setTags(node: Node, tags: {
|
|
15
|
+
[key: string]: string;
|
|
16
|
+
}): void;
|
|
17
|
+
/**
|
|
18
|
+
* Get tags from the context, including inherited tags from parent constructs
|
|
19
|
+
*/
|
|
20
|
+
static getTags(node: Node): {
|
|
21
|
+
[key: string]: string;
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* Apply tags from context to a construct using a safe approach
|
|
25
|
+
* This should be called during construction, not during synthesis
|
|
26
|
+
*/
|
|
27
|
+
static applyTagsFromContext(node: Node): void;
|
|
28
|
+
}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TagContext = void 0;
|
|
4
|
+
const constructs_1 = require("constructs");
|
|
5
|
+
/**
|
|
6
|
+
* TagContext provides a CDK context-based approach for passing tags
|
|
7
|
+
* down the construct tree without using aspects.
|
|
8
|
+
*
|
|
9
|
+
* This avoids the infinite loop issue with Tags.of() creating aspects
|
|
10
|
+
* during the aspect visitation phase in CDK v2.206.0+
|
|
11
|
+
*/
|
|
12
|
+
class TagContext {
|
|
13
|
+
/**
|
|
14
|
+
* Set tags in the context for a construct
|
|
15
|
+
*/
|
|
16
|
+
static setTags(node, tags) {
|
|
17
|
+
const existingTags = this.getTags(node);
|
|
18
|
+
node.setContext(this.TAG_CONTEXT_KEY, {
|
|
19
|
+
...existingTags,
|
|
20
|
+
...tags
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Get tags from the context, including inherited tags from parent constructs
|
|
25
|
+
*/
|
|
26
|
+
static getTags(node) {
|
|
27
|
+
// Get tags from this node
|
|
28
|
+
const nodeTags = node.tryGetContext(this.TAG_CONTEXT_KEY) || {};
|
|
29
|
+
// Get inherited tags from parent
|
|
30
|
+
const parentTags = node.scope ? this.getTags(constructs_1.Node.of(node.scope)) : {};
|
|
31
|
+
// Node tags override parent tags
|
|
32
|
+
return {
|
|
33
|
+
...parentTags,
|
|
34
|
+
...nodeTags
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Apply tags from context to a construct using a safe approach
|
|
39
|
+
* This should be called during construction, not during synthesis
|
|
40
|
+
*/
|
|
41
|
+
static applyTagsFromContext(node) {
|
|
42
|
+
const tags = this.getTags(node);
|
|
43
|
+
if (Object.keys(tags).length === 0) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
// Instead of using Tags.of() which creates aspects,
|
|
47
|
+
// we'll store tags as metadata that can be processed later
|
|
48
|
+
node.addMetadata('fjall:applied-tags', tags);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
exports.TagContext = TagContext;
|
|
52
|
+
TagContext.TAG_CONTEXT_KEY = "fjall:tags";
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnQ29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi91dGlscy90YWdDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUFrQztBQUVsQzs7Ozs7O0dBTUc7QUFDSCxNQUFhLFVBQVU7SUFHckI7O09BRUc7SUFDSSxNQUFNLENBQUMsT0FBTyxDQUFDLElBQVUsRUFBRSxJQUErQjtRQUMvRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3hDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRTtZQUNwQyxHQUFHLFlBQVk7WUFDZixHQUFHLElBQUk7U0FDUixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsT0FBTyxDQUFDLElBQVU7UUFDOUIsMEJBQTBCO1FBQzFCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUVoRSxpQ0FBaUM7UUFDakMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxpQkFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBRXZFLGlDQUFpQztRQUNqQyxPQUFPO1lBQ0wsR0FBRyxVQUFVO1lBQ2IsR0FBRyxRQUFRO1NBQ1osQ0FBQztJQUNKLENBQUM7SUFFRDs7O09BR0c7SUFDSSxNQUFNLENBQUMsb0JBQW9CLENBQUMsSUFBVTtRQUMzQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRWhDLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDbkMsT0FBTztRQUNULENBQUM7UUFFRCxvREFBb0Q7UUFDcEQsMkRBQTJEO1FBQzNELElBQUksQ0FBQyxXQUFXLENBQUMsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDL0MsQ0FBQzs7QUE3Q0gsZ0NBOENDO0FBN0N5QiwwQkFBZSxHQUFHLFlBQVksQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vZGUgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuXG4vKipcbiAqIFRhZ0NvbnRleHQgcHJvdmlkZXMgYSBDREsgY29udGV4dC1iYXNlZCBhcHByb2FjaCBmb3IgcGFzc2luZyB0YWdzXG4gKiBkb3duIHRoZSBjb25zdHJ1Y3QgdHJlZSB3aXRob3V0IHVzaW5nIGFzcGVjdHMuXG4gKiBcbiAqIFRoaXMgYXZvaWRzIHRoZSBpbmZpbml0ZSBsb29wIGlzc3VlIHdpdGggVGFncy5vZigpIGNyZWF0aW5nIGFzcGVjdHNcbiAqIGR1cmluZyB0aGUgYXNwZWN0IHZpc2l0YXRpb24gcGhhc2UgaW4gQ0RLIHYyLjIwNi4wK1xuICovXG5leHBvcnQgY2xhc3MgVGFnQ29udGV4dCB7XG4gIHByaXZhdGUgc3RhdGljIHJlYWRvbmx5IFRBR19DT05URVhUX0tFWSA9IFwiZmphbGw6dGFnc1wiO1xuXG4gIC8qKlxuICAgKiBTZXQgdGFncyBpbiB0aGUgY29udGV4dCBmb3IgYSBjb25zdHJ1Y3RcbiAgICovXG4gIHB1YmxpYyBzdGF0aWMgc2V0VGFncyhub2RlOiBOb2RlLCB0YWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9KTogdm9pZCB7XG4gICAgY29uc3QgZXhpc3RpbmdUYWdzID0gdGhpcy5nZXRUYWdzKG5vZGUpO1xuICAgIG5vZGUuc2V0Q29udGV4dCh0aGlzLlRBR19DT05URVhUX0tFWSwge1xuICAgICAgLi4uZXhpc3RpbmdUYWdzLFxuICAgICAgLi4udGFnc1xuICAgIH0pO1xuICB9XG5cbiAgLyoqXG4gICAqIEdldCB0YWdzIGZyb20gdGhlIGNvbnRleHQsIGluY2x1ZGluZyBpbmhlcml0ZWQgdGFncyBmcm9tIHBhcmVudCBjb25zdHJ1Y3RzXG4gICAqL1xuICBwdWJsaWMgc3RhdGljIGdldFRhZ3Mobm9kZTogTm9kZSk6IHsgW2tleTogc3RyaW5nXTogc3RyaW5nIH0ge1xuICAgIC8vIEdldCB0YWdzIGZyb20gdGhpcyBub2RlXG4gICAgY29uc3Qgbm9kZVRhZ3MgPSBub2RlLnRyeUdldENvbnRleHQodGhpcy5UQUdfQ09OVEVYVF9LRVkpIHx8IHt9O1xuICAgIFxuICAgIC8vIEdldCBpbmhlcml0ZWQgdGFncyBmcm9tIHBhcmVudFxuICAgIGNvbnN0IHBhcmVudFRhZ3MgPSBub2RlLnNjb3BlID8gdGhpcy5nZXRUYWdzKE5vZGUub2Yobm9kZS5zY29wZSkpIDoge307XG4gICAgXG4gICAgLy8gTm9kZSB0YWdzIG92ZXJyaWRlIHBhcmVudCB0YWdzXG4gICAgcmV0dXJuIHtcbiAgICAgIC4uLnBhcmVudFRhZ3MsXG4gICAgICAuLi5ub2RlVGFnc1xuICAgIH07XG4gIH1cblxuICAvKipcbiAgICogQXBwbHkgdGFncyBmcm9tIGNvbnRleHQgdG8gYSBjb25zdHJ1Y3QgdXNpbmcgYSBzYWZlIGFwcHJvYWNoXG4gICAqIFRoaXMgc2hvdWxkIGJlIGNhbGxlZCBkdXJpbmcgY29uc3RydWN0aW9uLCBub3QgZHVyaW5nIHN5bnRoZXNpc1xuICAgKi9cbiAgcHVibGljIHN0YXRpYyBhcHBseVRhZ3NGcm9tQ29udGV4dChub2RlOiBOb2RlKTogdm9pZCB7XG4gICAgY29uc3QgdGFncyA9IHRoaXMuZ2V0VGFncyhub2RlKTtcbiAgICBcbiAgICBpZiAoT2JqZWN0LmtleXModGFncykubGVuZ3RoID09PSAwKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgLy8gSW5zdGVhZCBvZiB1c2luZyBUYWdzLm9mKCkgd2hpY2ggY3JlYXRlcyBhc3BlY3RzLFxuICAgIC8vIHdlJ2xsIHN0b3JlIHRhZ3MgYXMgbWV0YWRhdGEgdGhhdCBjYW4gYmUgcHJvY2Vzc2VkIGxhdGVyXG4gICAgbm9kZS5hZGRNZXRhZGF0YSgnZmphbGw6YXBwbGllZC10YWdzJywgdGFncyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { IConstruct } from "constructs";
|
|
2
|
+
/**
|
|
3
|
+
* Tag a resource directly on the CloudFormation resource.
|
|
4
|
+
* This is used for resources that need tags at construction time,
|
|
5
|
+
* like VPC IPAM pool tags.
|
|
6
|
+
*/
|
|
2
7
|
export default function tagResource(resource: IConstruct, tags: {
|
|
3
8
|
[key: string]: string;
|
|
4
9
|
}): void;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = tagResource;
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
* Tag a resource directly on the CloudFormation resource.
|
|
6
|
+
* This is used for resources that need tags at construction time,
|
|
7
|
+
* like VPC IPAM pool tags.
|
|
8
|
+
*/
|
|
5
9
|
function tagResource(resource, tags) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
10
|
+
// Add a metadata marker that will be processed by StandardTagsAspect
|
|
11
|
+
resource.node.addMetadata('fjall:direct-tags', tags);
|
|
9
12
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnUmVzb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvdGFnUmVzb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFRQSw4QkFNQztBQVhEOzs7O0dBSUc7QUFDSCxTQUF3QixXQUFXLENBQ2pDLFFBQW9CLEVBQ3BCLElBQStCO0lBRS9CLHFFQUFxRTtJQUNyRSxRQUFRLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxtQkFBbUIsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUN2RCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSUNvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBDZm5SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuXG4vKipcbiAqIFRhZyBhIHJlc291cmNlIGRpcmVjdGx5IG9uIHRoZSBDbG91ZEZvcm1hdGlvbiByZXNvdXJjZS5cbiAqIFRoaXMgaXMgdXNlZCBmb3IgcmVzb3VyY2VzIHRoYXQgbmVlZCB0YWdzIGF0IGNvbnN0cnVjdGlvbiB0aW1lLFxuICogbGlrZSBWUEMgSVBBTSBwb29sIHRhZ3MuXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHRhZ1Jlc291cmNlKFxuICByZXNvdXJjZTogSUNvbnN0cnVjdCxcbiAgdGFnczogeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfVxuKSB7XG4gIC8vIEFkZCBhIG1ldGFkYXRhIG1hcmtlciB0aGF0IHdpbGwgYmUgcHJvY2Vzc2VkIGJ5IFN0YW5kYXJkVGFnc0FzcGVjdFxuICByZXNvdXJjZS5ub2RlLmFkZE1ldGFkYXRhKCdmamFsbDpkaXJlY3QtdGFncycsIHRhZ3MpO1xufVxuIl19
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { IConstruct } from "constructs";
|
|
2
|
+
import { IAspect } from "aws-cdk-lib";
|
|
3
|
+
/**
|
|
4
|
+
* TagSynthesizer is a specialized aspect that runs during synthesis
|
|
5
|
+
* to apply tags stored in metadata to CloudFormation resources.
|
|
6
|
+
*
|
|
7
|
+
* This approach avoids creating new aspects during aspect visitation,
|
|
8
|
+
* which causes the infinite loop in CDK v2.206.0+
|
|
9
|
+
*/
|
|
10
|
+
export declare class TagSynthesizer implements IAspect {
|
|
11
|
+
visit(node: IConstruct): void;
|
|
12
|
+
private collectTagsFromTree;
|
|
13
|
+
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TagSynthesizer = void 0;
|
|
4
|
+
const constructs_1 = require("constructs");
|
|
5
|
+
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
6
|
+
/**
|
|
7
|
+
* TagSynthesizer is a specialized aspect that runs during synthesis
|
|
8
|
+
* to apply tags stored in metadata to CloudFormation resources.
|
|
9
|
+
*
|
|
10
|
+
* This approach avoids creating new aspects during aspect visitation,
|
|
11
|
+
* which causes the infinite loop in CDK v2.206.0+
|
|
12
|
+
*/
|
|
13
|
+
class TagSynthesizer {
|
|
14
|
+
visit(node) {
|
|
15
|
+
// Only process CfnResource nodes
|
|
16
|
+
if (!aws_cdk_lib_1.CfnResource.isCfnResource(node)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
// Walk up the tree to collect all tag metadata
|
|
20
|
+
const collectedTags = {};
|
|
21
|
+
this.collectTagsFromTree(node, collectedTags);
|
|
22
|
+
if (Object.keys(collectedTags).length === 0) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
// Apply tags directly to the CloudFormation resource
|
|
26
|
+
// This doesn't create new aspects, avoiding the infinite loop
|
|
27
|
+
const cfnResource = node;
|
|
28
|
+
// Apply tags using the TagManager directly
|
|
29
|
+
const tagManager = aws_cdk_lib_1.TagManager.of(cfnResource);
|
|
30
|
+
if (tagManager) {
|
|
31
|
+
Object.entries(collectedTags).forEach(([key, value]) => {
|
|
32
|
+
tagManager.setTag(key, value);
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
collectTagsFromTree(node, collectedTags) {
|
|
37
|
+
// Walk up the tree
|
|
38
|
+
let current = node;
|
|
39
|
+
const tagSets = [];
|
|
40
|
+
while (current) {
|
|
41
|
+
const metadata = constructs_1.Node.of(current).metadata;
|
|
42
|
+
const tagMetadata = metadata.find(m => m.type === 'fjall:applied-tags');
|
|
43
|
+
if (tagMetadata && tagMetadata.data) {
|
|
44
|
+
tagSets.unshift(tagMetadata.data);
|
|
45
|
+
}
|
|
46
|
+
current = current.node.scope;
|
|
47
|
+
}
|
|
48
|
+
// Apply tags in order (parent to child) so child tags override parent tags
|
|
49
|
+
tagSets.forEach(tags => {
|
|
50
|
+
Object.assign(collectedTags, tags);
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
exports.TagSynthesizer = TagSynthesizer;
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFnU3ludGhlc2l6ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9saWIvdXRpbHMvdGFnU3ludGhlc2l6ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQThDO0FBQzlDLDZDQUErRDtBQUUvRDs7Ozs7O0dBTUc7QUFDSCxNQUFhLGNBQWM7SUFDbEIsS0FBSyxDQUFDLElBQWdCO1FBQzNCLGlDQUFpQztRQUNqQyxJQUFJLENBQUMseUJBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNyQyxPQUFPO1FBQ1QsQ0FBQztRQUVELCtDQUErQztRQUMvQyxNQUFNLGFBQWEsR0FBOEIsRUFBRSxDQUFDO1FBQ3BELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFFOUMsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUM1QyxPQUFPO1FBQ1QsQ0FBQztRQUVELHFEQUFxRDtRQUNyRCw4REFBOEQ7UUFDOUQsTUFBTSxXQUFXLEdBQUcsSUFBbUIsQ0FBQztRQUV4QywyQ0FBMkM7UUFDM0MsTUFBTSxVQUFVLEdBQUcsd0JBQVUsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDOUMsSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUNmLE1BQU0sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtnQkFDckQsVUFBVSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDaEMsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQztJQUVPLG1CQUFtQixDQUFDLElBQWdCLEVBQUUsYUFBd0M7UUFDcEYsbUJBQW1CO1FBQ25CLElBQUksT0FBTyxHQUEyQixJQUFJLENBQUM7UUFDM0MsTUFBTSxPQUFPLEdBQXFDLEVBQUUsQ0FBQztRQUVyRCxPQUFPLE9BQU8sRUFBRSxDQUFDO1lBQ2YsTUFBTSxRQUFRLEdBQUcsaUJBQUksQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBUSxDQUFDO1lBQzNDLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLG9CQUFvQixDQUFDLENBQUM7WUFFeEUsSUFBSSxXQUFXLElBQUksV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNwQyxPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFpQyxDQUFDLENBQUM7WUFDakUsQ0FBQztZQUVELE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQStCLENBQUM7UUFDekQsQ0FBQztRQUVELDJFQUEyRTtRQUMzRSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3JCLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3JDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBakRELHdDQWlEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElDb25zdHJ1Y3QsIE5vZGUgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgQ2ZuUmVzb3VyY2UsIElBc3BlY3QsIFRhZ01hbmFnZXIgfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcblxuLyoqXG4gKiBUYWdTeW50aGVzaXplciBpcyBhIHNwZWNpYWxpemVkIGFzcGVjdCB0aGF0IHJ1bnMgZHVyaW5nIHN5bnRoZXNpc1xuICogdG8gYXBwbHkgdGFncyBzdG9yZWQgaW4gbWV0YWRhdGEgdG8gQ2xvdWRGb3JtYXRpb24gcmVzb3VyY2VzLlxuICogXG4gKiBUaGlzIGFwcHJvYWNoIGF2b2lkcyBjcmVhdGluZyBuZXcgYXNwZWN0cyBkdXJpbmcgYXNwZWN0IHZpc2l0YXRpb24sXG4gKiB3aGljaCBjYXVzZXMgdGhlIGluZmluaXRlIGxvb3AgaW4gQ0RLIHYyLjIwNi4wK1xuICovXG5leHBvcnQgY2xhc3MgVGFnU3ludGhlc2l6ZXIgaW1wbGVtZW50cyBJQXNwZWN0IHtcbiAgcHVibGljIHZpc2l0KG5vZGU6IElDb25zdHJ1Y3QpOiB2b2lkIHtcbiAgICAvLyBPbmx5IHByb2Nlc3MgQ2ZuUmVzb3VyY2Ugbm9kZXNcbiAgICBpZiAoIUNmblJlc291cmNlLmlzQ2ZuUmVzb3VyY2Uobm9kZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICAvLyBXYWxrIHVwIHRoZSB0cmVlIHRvIGNvbGxlY3QgYWxsIHRhZyBtZXRhZGF0YVxuICAgIGNvbnN0IGNvbGxlY3RlZFRhZ3M6IHsgW2tleTogc3RyaW5nXTogc3RyaW5nIH0gPSB7fTtcbiAgICB0aGlzLmNvbGxlY3RUYWdzRnJvbVRyZWUobm9kZSwgY29sbGVjdGVkVGFncyk7XG4gICAgXG4gICAgaWYgKE9iamVjdC5rZXlzKGNvbGxlY3RlZFRhZ3MpLmxlbmd0aCA9PT0gMCkge1xuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIC8vIEFwcGx5IHRhZ3MgZGlyZWN0bHkgdG8gdGhlIENsb3VkRm9ybWF0aW9uIHJlc291cmNlXG4gICAgLy8gVGhpcyBkb2Vzbid0IGNyZWF0ZSBuZXcgYXNwZWN0cywgYXZvaWRpbmcgdGhlIGluZmluaXRlIGxvb3BcbiAgICBjb25zdCBjZm5SZXNvdXJjZSA9IG5vZGUgYXMgQ2ZuUmVzb3VyY2U7XG4gICAgXG4gICAgLy8gQXBwbHkgdGFncyB1c2luZyB0aGUgVGFnTWFuYWdlciBkaXJlY3RseVxuICAgIGNvbnN0IHRhZ01hbmFnZXIgPSBUYWdNYW5hZ2VyLm9mKGNmblJlc291cmNlKTtcbiAgICBpZiAodGFnTWFuYWdlcikge1xuICAgICAgT2JqZWN0LmVudHJpZXMoY29sbGVjdGVkVGFncykuZm9yRWFjaCgoW2tleSwgdmFsdWVdKSA9PiB7XG4gICAgICAgIHRhZ01hbmFnZXIuc2V0VGFnKGtleSwgdmFsdWUpO1xuICAgICAgfSk7XG4gICAgfVxuICB9XG4gIFxuICBwcml2YXRlIGNvbGxlY3RUYWdzRnJvbVRyZWUobm9kZTogSUNvbnN0cnVjdCwgY29sbGVjdGVkVGFnczogeyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfSk6IHZvaWQge1xuICAgIC8vIFdhbGsgdXAgdGhlIHRyZWVcbiAgICBsZXQgY3VycmVudDogSUNvbnN0cnVjdCB8IHVuZGVmaW5lZCA9IG5vZGU7XG4gICAgY29uc3QgdGFnU2V0czogQXJyYXk8eyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfT4gPSBbXTtcbiAgICBcbiAgICB3aGlsZSAoY3VycmVudCkge1xuICAgICAgY29uc3QgbWV0YWRhdGEgPSBOb2RlLm9mKGN1cnJlbnQpLm1ldGFkYXRhO1xuICAgICAgY29uc3QgdGFnTWV0YWRhdGEgPSBtZXRhZGF0YS5maW5kKG0gPT4gbS50eXBlID09PSAnZmphbGw6YXBwbGllZC10YWdzJyk7XG4gICAgICBcbiAgICAgIGlmICh0YWdNZXRhZGF0YSAmJiB0YWdNZXRhZGF0YS5kYXRhKSB7XG4gICAgICAgIHRhZ1NldHMudW5zaGlmdCh0YWdNZXRhZGF0YS5kYXRhIGFzIHsgW2tleTogc3RyaW5nXTogc3RyaW5nIH0pO1xuICAgICAgfVxuICAgICAgXG4gICAgICBjdXJyZW50ID0gY3VycmVudC5ub2RlLnNjb3BlIGFzIElDb25zdHJ1Y3QgfCB1bmRlZmluZWQ7XG4gICAgfVxuICAgIFxuICAgIC8vIEFwcGx5IHRhZ3MgaW4gb3JkZXIgKHBhcmVudCB0byBjaGlsZCkgc28gY2hpbGQgdGFncyBvdmVycmlkZSBwYXJlbnQgdGFnc1xuICAgIHRhZ1NldHMuZm9yRWFjaCh0YWdzID0+IHtcbiAgICAgIE9iamVjdC5hc3NpZ24oY29sbGVjdGVkVGFncywgdGFncyk7XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjall/components-infrastructure",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.43.0",
|
|
4
4
|
"bin": {
|
|
5
5
|
"infrastructure": "bin/infrastructure.js"
|
|
6
6
|
},
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@aws-sdk/client-cost-explorer": "^3.717.0",
|
|
37
37
|
"@aws-sdk/client-organizations": "^3.716.0",
|
|
38
|
-
"@fjall/util": "^0.
|
|
38
|
+
"@fjall/util": "^0.43.0",
|
|
39
39
|
"@pepperize/cdk-organizations": "^0.7.135",
|
|
40
40
|
"aws-lambda": "^1.0.7",
|
|
41
41
|
"cdk-time-sleep": "^1.0.0",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"overrides": {
|
|
47
47
|
"@smithy/core": "2.5.5"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "5047b77a5628b74cf48634f2a803ab77c1af3536",
|
|
50
50
|
"peerDependencies": {
|
|
51
51
|
"aws-cdk": "^2.206.0",
|
|
52
52
|
"aws-cdk-lib": "^2.206.0",
|