Merge pull request #2247 from guardian/aa/tag-launch-template

fix(ec2-app): Apply the `App` tag to the launch template
guardian · Mar 8, 2024 · 5b71970 · 5b71970
2 parents 1a47c1e + a551119
commit 5b71970
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/.changeset/breezy-countries-bake.md b/.changeset/breezy-countries-bake.md
@@ -0,0 +1,5 @@
+---
+"@guardian/cdk": patch
+---
+
+Apply the `App` tag to the launch template created in the EC2 App pattern.
diff --git a/src/constructs/autoscaling/asg.ts b/src/constructs/autoscaling/asg.ts
@@ -1,4 +1,4 @@
-import { Token } from "aws-cdk-lib";
+import { Tags, Token } from "aws-cdk-lib";
 import { AutoScalingGroup } from "aws-cdk-lib/aws-autoscaling";
 import type { AutoScalingGroupProps, CfnAutoScalingGroup } from "aws-cdk-lib/aws-autoscaling";
 import { LaunchTemplate, OperatingSystemType, UserData } from "aws-cdk-lib/aws-ec2";
@@ -162,5 +162,7 @@ export class GuAutoScalingGroup extends GuAppAwareConstruct(AutoScalingGroup) {
     // leaves it to the default value, which is actually false.
     // { UpdatePolicy: { autoScalingScheduledAction: { IgnoreUnmodifiedGroupSizeProperties: true }}
     cfnAsg.addDeletionOverride("UpdatePolicy");
+
+    Tags.of(launchTemplate).add("App", app);
   }
 }
diff --git a/src/patterns/ec2-app/__snapshots__/base.test.ts.snap b/src/patterns/ec2-app/__snapshots__/base.test.ts.snap
@@ -899,6 +899,10 @@ exports[`the GuEC2App pattern can produce a restricted EC2 app locked to specifi
             {
               "ResourceType": "instance",
               "Tags": [
+                {
+                  "Key": "App",
+                  "Value": "test-gu-ec2-app",
+                },
                 {
                   "Key": "gu:cdk:version",
                   "Value": "TEST",
@@ -924,6 +928,10 @@ exports[`the GuEC2App pattern can produce a restricted EC2 app locked to specifi
             {
               "ResourceType": "volume",
               "Tags": [
+                {
+                  "Key": "App",
+                  "Value": "test-gu-ec2-app",
+                },
                 {
                   "Key": "gu:cdk:version",
                   "Value": "TEST",
@@ -955,6 +963,10 @@ exports[`the GuEC2App pattern can produce a restricted EC2 app locked to specifi
           {
             "ResourceType": "launch-template",
             "Tags": [
+              {
+                "Key": "App",
+                "Value": "test-gu-ec2-app",
+              },
               {
                 "Key": "gu:cdk:version",
                 "Value": "TEST",
@@ -1772,6 +1784,10 @@ exports[`the GuEC2App pattern should produce a functional EC2 app with minimal a
             {
               "ResourceType": "instance",
               "Tags": [
+                {
+                  "Key": "App",
+                  "Value": "test-gu-ec2-app",
+                },
                 {
                   "Key": "gu:cdk:version",
                   "Value": "TEST",
@@ -1797,6 +1813,10 @@ exports[`the GuEC2App pattern should produce a functional EC2 app with minimal a
             {
               "ResourceType": "volume",
               "Tags": [
+                {
+                  "Key": "App",
+                  "Value": "test-gu-ec2-app",
+                },
                 {
                   "Key": "gu:cdk:version",
                   "Value": "TEST",
@@ -1828,6 +1848,10 @@ exports[`the GuEC2App pattern should produce a functional EC2 app with minimal a
           {
             "ResourceType": "launch-template",
             "Tags": [
+              {
+                "Key": "App",
+                "Value": "test-gu-ec2-app",
+              },
               {
                 "Key": "gu:cdk:version",
                 "Value": "TEST",