fix(core): Fix adding stack level tags and handling duplicate Accelerator tag (#763)

* Adding new tag for cfn stacks
* regular expression fix for testMatch with jest for cross os
* Fixing store outputs

Author: naveenkoppula

src/core/runtime/src/store-stack-output-step.ts

@@ -40,9 +40,9 @@ export const handler = async (input: StoreStackOutputInput) => {
       console.warn(`Could not load stack with name "${summary.StackName}"`);
       continue;
     }
-    const acceleratorTag = stack.Tags?.find(t => t.Key === 'Accelerator');
+    const acceleratorTag = stack.Tags?.find(t => t.Key === 'AcceleratorName');
     if (!acceleratorTag) {
-      console.warn(`Could not find Accelerator tag in stack with name "${summary.StackName}"`);
+      console.warn(`Could not find AcceleratorName tag in stack with name "${summary.StackName}"`);
       continue;
     }
 

src/deployments/cdk/package.json

@@ -152,7 +152,7 @@
     "preset": "ts-jest",
     "testEnvironment": "node",
     "testMatch": [
-      "<rootDir>/test/**/(*.)+(spec|test).ts"
+      "<rootDir>/test/**/*(*.)@(spec|test).[t]s?(x)"
     ]
   }
 }

src/deployments/cdk/toolkit.ts

@@ -302,7 +302,8 @@ function tagsForStack(stack: CloudFormationStackArtifact): Tag[] {
     // unfortunately.
     x => toCloudFormationTags(x.data as cxschema.Tag[]),
   );
-  return Array.prototype.concat([], ...tagLists);
+  // Conditional operator to remove undefined (Will get for Accelerator)
+  return Array.prototype.concat([], tagLists.length > 0 ? tagLists[0].filter(t => !!t) : []);
 }
 
 /**
@@ -312,5 +313,10 @@ function tagsForStack(stack: CloudFormationStackArtifact): Tag[] {
  * to the way that CloudFormation expects them. (Different casing).
  */
 function toCloudFormationTags(tags: cxschema.Tag[]): Tag[] {
-  return tags.map(t => ({ Key: t.key, Value: t.value }));
+  return tags.map(t => {
+    // Ignoring Accelerator tag in CFN since that is duplicated
+    if (t.key !== 'Accelerator') {
+      return { Key: t.key, Value: t.value };
+    }
+  });
 }

src/lib/cdk-accelerator/src/core/accelerator-stack.ts

@@ -16,6 +16,8 @@ export class AcceleratorStack extends cdk.Stack {
     this.acceleratorName = props.acceleratorName;
     this.acceleratorPrefix = props.acceleratorPrefix;
 
+    // Add Stack level tags using this.tags, so that CDK won't add them to resource in CFN
+    this.tags.setTag('AcceleratorName', this.acceleratorName);
     cdk.Aspects.of(this).add(new cdk.Tag('Accelerator', this.acceleratorName));
     cdk.Aspects.of(this).add(new AcceleratorNameTagger());
     cdk.Aspects.of(this).add(new AcceleratorProtectedTagger(this.acceleratorName));