@fjall/components-infrastructure 0.43.0 → 0.43.1

package/dist/lib/utils/standardTagsAspect.d.ts

@@ -4,8 +4,8 @@ import { IConstruct } from "constructs";
  * Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.
  *
  * Updated for CDK v2.206.0+ compatibility:
- * - No longer uses Tags.of() during aspect visitation to avoid infinite loops
- * - Directly manipulates CloudFormation resources instead
+ * - Avoids using any tagging APIs during aspect visitation to prevent infinite loops
+ * - Uses a synthesis-time approach to modify CloudFormation templates
  * - Maintains the same clean API and automatic tagging benefits
  */
 export declare class StandardTagsAspect implements IAspect {
@@ -15,5 +15,6 @@ export declare class StandardTagsAspect implements IAspect {
         [key: string]: string;
     });
     visit(node: IConstruct): void;
-    private tagCfnResource;
+    private processCfnResource;
+    private buildTagsArray;
 }

package/dist/lib/utils/standardTagsAspect.js

@@ -6,8 +6,8 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
  * Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.
  *
  * Updated for CDK v2.206.0+ compatibility:
- * - No longer uses Tags.of() during aspect visitation to avoid infinite loops
- * - Directly manipulates CloudFormation resources instead
+ * - Avoids using any tagging APIs during aspect visitation to prevent infinite loops
+ * - Uses a synthesis-time approach to modify CloudFormation templates
  * - Maintains the same clean API and automatic tagging benefits
  */
 class StandardTagsAspect {
@@ -20,15 +20,13 @@ class StandardTagsAspect {
         if (this.taggedResources.has(node)) {
             return;
         }
-        // Only process CfnResource nodes to avoid the Tags.of() issue
+        // Process L1 (CFN) resources only
         if (aws_cdk_lib_1.CfnResource.isCfnResource(node)) {
-            this.tagCfnResource(node);
+            this.processCfnResource(node);
             this.taggedResources.add(node);
         }
     }
-    tagCfnResource(resource) {
-        // Check if resource supports tags
-        const cfnResourceType = resource.cfnResourceType;
+    processCfnResource(resource) {
         // List of CloudFormation resource types that don't support tags
         const unsupportedTypes = [
             'AWS::CloudFormation::WaitConditionHandle',
@@ -38,26 +36,36 @@ class StandardTagsAspect {
             'AWS::IAM::Role',
             'AWS::IAM::User',
             'AWS::IAM::Group',
+            'AWS::IAM::ManagedPolicy',
+            'AWS::IAM::InstanceProfile',
             'AWS::Logs::LogGroup',
             'AWS::Logs::LogStream',
-            'AWS::Events::Rule'
+            'AWS::Events::Rule',
+            'AWS::Route53::RecordSet',
+            'AWS::Route53::RecordSetGroup',
+            'AWS::CloudWatch::Alarm',
+            'AWS::CloudWatch::Dashboard'
         ];
-        if (unsupportedTypes.includes(cfnResourceType)) {
+        if (unsupportedTypes.includes(resource.cfnResourceType)) {
             return;
         }
-        // Get existing tags
-        let tags = resource.tags;
-        if (!tags) {
-            // Initialize tags if not present
-            resource.tags = [];
-            tags = resource.tags;
-        }
-        // Convert to map for easier manipulation
+        // Add a synthesis hook to modify the CloudFormation template
+        const stack = aws_cdk_lib_1.Stack.of(resource);
+        const logicalId = stack.getLogicalId(resource);
+        // Use addTransform to add tags during synthesis
+        resource.addPropertyOverride('Tags', this.buildTagsArray(resource));
+    }
+    buildTagsArray(resource) {
         const tagMap = new Map();
-        // Add existing tags
-        if (Array.isArray(tags)) {
-            tags.forEach((tag) => {
-                if (tag && typeof tag === 'object' && 'key' in tag && 'value' in tag) {
+        // Get any existing tags if they exist
+        const existingTags = resource.tags || [];
+        // Process existing tags if they're in array format
+        if (Array.isArray(existingTags)) {
+            existingTags.forEach((tag) => {
+                if (tag && typeof tag === 'object' && 'Key' in tag && 'Value' in tag) {
+                    tagMap.set(tag.Key, tag.Value);
+                }
+                else if (tag && typeof tag === 'object' && 'key' in tag && 'value' in tag) {
                     tagMap.set(tag.key, tag.value);
                 }
             });
@@ -78,12 +86,12 @@ class StandardTagsAspect {
         Object.entries(this.requiredTags).forEach(([key, value]) => {
             tagMap.set(key, value);
         });
-        // Convert back to array format
-        resource.tags = Array.from(tagMap.entries()).map(([key, value]) => ({
-            key,
-            value
+        // Convert to CloudFormation format
+        return Array.from(tagMap.entries()).map(([key, value]) => ({
+            Key: key,
+            Value: value
         }));
     }
 }
 exports.StandardTagsAspect = StandardTagsAspect;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRUYWdzQXNwZWN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL3N0YW5kYXJkVGFnc0FzcGVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2Q0FBMEQ7QUFHMUQ7Ozs7Ozs7R0FPRztBQUNILE1BQWEsa0JBQWtCO0lBSTdCLFlBQVksWUFBdUM7UUFGbEMsb0JBQWUsR0FBRyxJQUFJLE9BQU8sRUFBYyxDQUFDO1FBRzNELElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDO0lBQ25DLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBZ0I7UUFDcEIsNEJBQTRCO1FBQzVCLElBQUksSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNuQyxPQUFPO1FBQ1QsQ0FBQztRQUVELDhEQUE4RDtRQUM5RCxJQUFJLHlCQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFtQixDQUFDLENBQUM7WUFDekMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDakMsQ0FBQztJQUNILENBQUM7SUFFTyxjQUFjLENBQUMsUUFBcUI7UUFDMUMsa0NBQWtDO1FBQ2xDLE1BQU0sZUFBZSxHQUFHLFFBQVEsQ0FBQyxlQUFlLENBQUM7UUFFakQsZ0VBQWdFO1FBQ2hFLE1BQU0sZ0JBQWdCLEdBQUc7WUFDdkIsMENBQTBDO1lBQzFDLG9DQUFvQztZQUNwQyx5QkFBeUI7WUFDekIsa0JBQWtCO1lBQ2xCLGdCQUFnQjtZQUNoQixnQkFBZ0I7WUFDaEIsaUJBQWlCO1lBQ2pCLHFCQUFxQjtZQUNyQixzQkFBc0I7WUFDdEIsbUJBQW1CO1NBQ3BCLENBQUM7UUFFRixJQUFJLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDO1lBQy9DLE9BQU87UUFDVCxDQUFDO1FBRUQsb0JBQW9CO1FBQ3BCLElBQUksSUFBSSxHQUFJLFFBQWdCLENBQUMsSUFBSSxDQUFDO1FBRWxDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNWLGlDQUFpQztZQUNoQyxRQUFnQixDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDNUIsSUFBSSxHQUFJLFFBQWdCLENBQUMsSUFBSSxDQUFDO1FBQ2hDLENBQUM7UUFFRCx5Q0FBeUM7UUFDekMsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7UUFFekMsb0JBQW9CO1FBQ3BCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3hCLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFRLEVBQUUsRUFBRTtnQkFDeEIsSUFBSSxHQUFHLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEtBQUssSUFBSSxHQUFHLElBQUksT0FBTyxJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUNyRSxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUNqQyxDQUFDO1lBQ0gsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO1FBRUQsb0NBQW9DO1FBQ3BDLE1BQU0sUUFBUSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3hDLE1BQU0sa0JBQWtCLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssbUJBQW1CLENBQUMsQ0FBQztRQUNoRixrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDN0IsSUFBSSxDQUFDLENBQUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztnQkFDekMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtvQkFDOUMsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQzt3QkFDOUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7b0JBQ3pCLENBQUM7Z0JBQ0gsQ0FBQyxDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7UUFFSCxnREFBZ0Q7UUFDaEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUN6RCxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN6QixDQUFDLENBQUMsQ0FBQztRQUVILCtCQUErQjtRQUM5QixRQUFnQixDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQzNFLEdBQUc7WUFDSCxLQUFLO1NBQ04sQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDO0NBQ0Y7QUF4RkQsZ0RBd0ZDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSUFzcGVjdCwgU3RhY2ssIENmblJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBJQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcblxuLyoqXG4gKiBBc3BlY3QgdG8gZW5mb3JjZSBhIHN0YW5kYXJkIHNldCBvZiB0YWdzIG9uIGV2ZXJ5IHRhZy1jYXBhYmxlIHJlc291cmNlIGluIGEgY29uc3RydWN0IHRyZWUuXG4gKiBcbiAqIFVwZGF0ZWQgZm9yIENESyB2Mi4yMDYuMCsgY29tcGF0aWJpbGl0eTpcbiAqIC0gTm8gbG9uZ2VyIHVzZXMgVGFncy5vZigpIGR1cmluZyBhc3BlY3QgdmlzaXRhdGlvbiB0byBhdm9pZCBpbmZpbml0ZSBsb29wc1xuICogLSBEaXJlY3RseSBtYW5pcHVsYXRlcyBDbG91ZEZvcm1hdGlvbiByZXNvdXJjZXMgaW5zdGVhZFxuICogLSBNYWludGFpbnMgdGhlIHNhbWUgY2xlYW4gQVBJIGFuZCBhdXRvbWF0aWMgdGFnZ2luZyBiZW5lZml0c1xuICovXG5leHBvcnQgY2xhc3MgU3RhbmRhcmRUYWdzQXNwZWN0IGltcGxlbWVudHMgSUFzcGVjdCB7XG4gIHByaXZhdGUgcmVhZG9ubHkgcmVxdWlyZWRUYWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xuICBwcml2YXRlIHJlYWRvbmx5IHRhZ2dlZFJlc291cmNlcyA9IG5ldyBXZWFrU2V0PElDb25zdHJ1Y3Q+KCk7XG5cbiAgY29uc3RydWN0b3IocmVxdWlyZWRUYWdzOiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9KSB7XG4gICAgdGhpcy5yZXF1aXJlZFRhZ3MgPSByZXF1aXJlZFRhZ3M7XG4gIH1cblxuICB2aXNpdChub2RlOiBJQ29uc3RydWN0KTogdm9pZCB7XG4gICAgLy8gU2tpcCBpZiBhbHJlYWR5IHByb2Nlc3NlZFxuICAgIGlmICh0aGlzLnRhZ2dlZFJlc291cmNlcy5oYXMobm9kZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgXG4gICAgLy8gT25seSBwcm9jZXNzIENmblJlc291cmNlIG5vZGVzIHRvIGF2b2lkIHRoZSBUYWdzLm9mKCkgaXNzdWVcbiAgICBpZiAoQ2ZuUmVzb3VyY2UuaXNDZm5SZXNvdXJjZShub2RlKSkge1xuICAgICAgdGhpcy50YWdDZm5SZXNvdXJjZShub2RlIGFzIENmblJlc291cmNlKTtcbiAgICAgIHRoaXMudGFnZ2VkUmVzb3VyY2VzLmFkZChub2RlKTtcbiAgICB9XG4gIH1cbiAgXG4gIHByaXZhdGUgdGFnQ2ZuUmVzb3VyY2UocmVzb3VyY2U6IENmblJlc291cmNlKTogdm9pZCB7XG4gICAgLy8gQ2hlY2sgaWYgcmVzb3VyY2Ugc3VwcG9ydHMgdGFnc1xuICAgIGNvbnN0IGNmblJlc291cmNlVHlwZSA9IHJlc291cmNlLmNmblJlc291cmNlVHlwZTtcbiAgICBcbiAgICAvLyBMaXN0IG9mIENsb3VkRm9ybWF0aW9uIHJlc291cmNlIHR5cGVzIHRoYXQgZG9uJ3Qgc3VwcG9ydCB0YWdzXG4gICAgY29uc3QgdW5zdXBwb3J0ZWRUeXBlcyA9IFtcbiAgICAgICdBV1M6OkNsb3VkRm9ybWF0aW9uOjpXYWl0Q29uZGl0aW9uSGFuZGxlJyxcbiAgICAgICdBV1M6OkNsb3VkRm9ybWF0aW9uOjpXYWl0Q29uZGl0aW9uJyxcbiAgICAgICdBV1M6OkxhbWJkYTo6UGVybWlzc2lvbicsXG4gICAgICAnQVdTOjpJQU06OlBvbGljeScsXG4gICAgICAnQVdTOjpJQU06OlJvbGUnLFxuICAgICAgJ0FXUzo6SUFNOjpVc2VyJyxcbiAgICAgICdBV1M6OklBTTo6R3JvdXAnLFxuICAgICAgJ0FXUzo6TG9nczo6TG9nR3JvdXAnLFxuICAgICAgJ0FXUzo6TG9nczo6TG9nU3RyZWFtJyxcbiAgICAgICdBV1M6OkV2ZW50czo6UnVsZSdcbiAgICBdO1xuICAgIFxuICAgIGlmICh1bnN1cHBvcnRlZFR5cGVzLmluY2x1ZGVzKGNmblJlc291cmNlVHlwZSkpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgXG4gICAgLy8gR2V0IGV4aXN0aW5nIHRhZ3NcbiAgICBsZXQgdGFncyA9IChyZXNvdXJjZSBhcyBhbnkpLnRhZ3M7XG4gICAgXG4gICAgaWYgKCF0YWdzKSB7XG4gICAgICAvLyBJbml0aWFsaXplIHRhZ3MgaWYgbm90IHByZXNlbnRcbiAgICAgIChyZXNvdXJjZSBhcyBhbnkpLnRhZ3MgPSBbXTtcbiAgICAgIHRhZ3MgPSAocmVzb3VyY2UgYXMgYW55KS50YWdzO1xuICAgIH1cbiAgICBcbiAgICAvLyBDb252ZXJ0IHRvIG1hcCBmb3IgZWFzaWVyIG1hbmlwdWxhdGlvblxuICAgIGNvbnN0IHRhZ01hcCA9IG5ldyBNYXA8c3RyaW5nLCBzdHJpbmc+KCk7XG4gICAgXG4gICAgLy8gQWRkIGV4aXN0aW5nIHRhZ3NcbiAgICBpZiAoQXJyYXkuaXNBcnJheSh0YWdzKSkge1xuICAgICAgdGFncy5mb3JFYWNoKCh0YWc6IGFueSkgPT4ge1xuICAgICAgICBpZiAodGFnICYmIHR5cGVvZiB0YWcgPT09ICdvYmplY3QnICYmICdrZXknIGluIHRhZyAmJiAndmFsdWUnIGluIHRhZykge1xuICAgICAgICAgIHRhZ01hcC5zZXQodGFnLmtleSwgdGFnLnZhbHVlKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfVxuICAgIFxuICAgIC8vIENoZWNrIGZvciBkaXJlY3QgdGFncyBpbiBtZXRhZGF0YVxuICAgIGNvbnN0IG1ldGFkYXRhID0gcmVzb3VyY2Uubm9kZS5tZXRhZGF0YTtcbiAgICBjb25zdCBkaXJlY3RUYWdzTWV0YWRhdGEgPSBtZXRhZGF0YS5maWx0ZXIobSA9PiBtLnR5cGUgPT09ICdmamFsbDpkaXJlY3QtdGFncycpO1xuICAgIGRpcmVjdFRhZ3NNZXRhZGF0YS5mb3JFYWNoKG0gPT4ge1xuICAgICAgaWYgKG0uZGF0YSAmJiB0eXBlb2YgbS5kYXRhID09PSAnb2JqZWN0Jykge1xuICAgICAgICBPYmplY3QuZW50cmllcyhtLmRhdGEpLmZvckVhY2goKFtrZXksIHZhbHVlXSkgPT4ge1xuICAgICAgICAgIGlmICh0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnKSB7XG4gICAgICAgICAgICB0YWdNYXAuc2V0KGtleSwgdmFsdWUpO1xuICAgICAgICAgIH1cbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgfSk7XG4gICAgXG4gICAgLy8gQWRkIHJlcXVpcmVkIHRhZ3MgKG92ZXJ3cml0aW5nIGlmIHRoZXkgZXhpc3QpXG4gICAgT2JqZWN0LmVudHJpZXModGhpcy5yZXF1aXJlZFRhZ3MpLmZvckVhY2goKFtrZXksIHZhbHVlXSkgPT4ge1xuICAgICAgdGFnTWFwLnNldChrZXksIHZhbHVlKTtcbiAgICB9KTtcbiAgICBcbiAgICAvLyBDb252ZXJ0IGJhY2sgdG8gYXJyYXkgZm9ybWF0XG4gICAgKHJlc291cmNlIGFzIGFueSkudGFncyA9IEFycmF5LmZyb20odGFnTWFwLmVudHJpZXMoKSkubWFwKChba2V5LCB2YWx1ZV0pID0+ICh7XG4gICAgICBrZXksXG4gICAgICB2YWx1ZVxuICAgIH0pKTtcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standardTagsAspect.js","sourceRoot":"","sources":["../../../lib/utils/standardTagsAspect.ts"],"names":[],"mappings":"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","sourcesContent":["import { IAspect, CfnResource, Stack } from \"aws-cdk-lib\";\nimport { IConstruct } from \"constructs\";\n\n/**\n * Aspect to enforce a standard set of tags on every tag-capable resource in a construct tree.\n * \n * Updated for CDK v2.206.0+ compatibility:\n * - Avoids using any tagging APIs during aspect visitation to prevent infinite loops\n * - Uses a synthesis-time approach to modify CloudFormation templates\n * - Maintains the same clean API and automatic tagging benefits\n */\nexport class StandardTagsAspect implements IAspect {\n  private readonly requiredTags: { [key: string]: string };\n  private readonly taggedResources = new WeakSet<IConstruct>();\n\n  constructor(requiredTags: { [key: string]: string }) {\n    this.requiredTags = requiredTags;\n  }\n\n  visit(node: IConstruct): void {\n    // Skip if already processed\n    if (this.taggedResources.has(node)) {\n      return;\n    }\n    \n    // Process L1 (CFN) resources only\n    if (CfnResource.isCfnResource(node)) {\n      this.processCfnResource(node as CfnResource);\n      this.taggedResources.add(node);\n    }\n  }\n  \n  private processCfnResource(resource: CfnResource): void {\n    // List of CloudFormation resource types that don't support tags\n    const unsupportedTypes = [\n      'AWS::CloudFormation::WaitConditionHandle',\n      'AWS::CloudFormation::WaitCondition',\n      'AWS::Lambda::Permission',\n      'AWS::IAM::Policy',\n      'AWS::IAM::Role',\n      'AWS::IAM::User',\n      'AWS::IAM::Group',\n      'AWS::IAM::ManagedPolicy',\n      'AWS::IAM::InstanceProfile',\n      'AWS::Logs::LogGroup',\n      'AWS::Logs::LogStream',\n      'AWS::Events::Rule',\n      'AWS::Route53::RecordSet',\n      'AWS::Route53::RecordSetGroup',\n      'AWS::CloudWatch::Alarm',\n      'AWS::CloudWatch::Dashboard'\n    ];\n    \n    if (unsupportedTypes.includes(resource.cfnResourceType)) {\n      return;\n    }\n    \n    // Add a synthesis hook to modify the CloudFormation template\n    const stack = Stack.of(resource);\n    const logicalId = stack.getLogicalId(resource);\n    \n    // Use addTransform to add tags during synthesis\n    resource.addPropertyOverride('Tags', this.buildTagsArray(resource));\n  }\n  \n  private buildTagsArray(resource: CfnResource): any[] {\n    const tagMap = new Map<string, string>();\n    \n    // Get any existing tags if they exist\n    const existingTags = (resource as any).tags || [];\n    \n    // Process existing tags if they're in array format\n    if (Array.isArray(existingTags)) {\n      existingTags.forEach((tag: any) => {\n        if (tag && typeof tag === 'object' && 'Key' in tag && 'Value' in tag) {\n          tagMap.set(tag.Key, tag.Value);\n        } else if (tag && typeof tag === 'object' && 'key' in tag && 'value' in tag) {\n          tagMap.set(tag.key, tag.value);\n        }\n      });\n    }\n    \n    // Check for direct tags in metadata\n    const metadata = resource.node.metadata;\n    const directTagsMetadata = metadata.filter(m => m.type === 'fjall:direct-tags');\n    directTagsMetadata.forEach(m => {\n      if (m.data && typeof m.data === 'object') {\n        Object.entries(m.data).forEach(([key, value]) => {\n          if (typeof value === 'string') {\n            tagMap.set(key, value);\n          }\n        });\n      }\n    });\n    \n    // Add required tags (overwriting if they exist)\n    Object.entries(this.requiredTags).forEach(([key, value]) => {\n      tagMap.set(key, value);\n    });\n    \n    // Convert to CloudFormation format\n    return Array.from(tagMap.entries()).map(([key, value]) => ({\n      Key: key,\n      Value: value\n    }));\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/components-infrastructure",
-  "version": "0.43.0",
+  "version": "0.43.1",
   "bin": {
     "infrastructure": "bin/infrastructure.js"
   },
@@ -35,7 +35,7 @@
   "dependencies": {
     "@aws-sdk/client-cost-explorer": "^3.717.0",
     "@aws-sdk/client-organizations": "^3.716.0",
-    "@fjall/util": "^0.43.0",
+    "@fjall/util": "^0.43.1",
     "@pepperize/cdk-organizations": "^0.7.135",
     "aws-lambda": "^1.0.7",
     "cdk-time-sleep": "^1.0.0",
@@ -46,7 +46,7 @@
   "overrides": {
     "@smithy/core": "2.5.5"
   },
-  "gitHead": "5047b77a5628b74cf48634f2a803ab77c1af3536",
+  "gitHead": "948c10f7e2fd66f4a2854c953622334555b733b9",
   "peerDependencies": {
     "aws-cdk": "^2.206.0",
     "aws-cdk-lib": "^2.206.0",