Merge branch 'main' into appsync-log-retention

mergify[bot] · web-flow · commit ac64ec6fa7ae · 2022-08-04T14:12:16.000Z
diff --git a/packages/@aws-cdk/aws-autoscaling/test/asg-lt.integ.snapshot/aws-cdk-asg-integ.template.json b/packages/@aws-cdk/aws-autoscaling/test/asg-lt.integ.snapshot/aws-cdk-asg-integ.template.json
@@ -28,7 +28,18 @@
        ]
       }
      ]
-    }
+    },
+    "TagSpecifications": [
+     {
+      "ResourceType": "launch-template",
+      "Tags": [
+       {
+        "Key": "Name",
+        "Value": "aws-cdk-asg-integ/MainLT"
+       }
+      ]
+     }
+    ]
    }
   },
   "T4gLT8FF7D308": {
@@ -59,7 +70,18 @@
        ]
       }
      ]
-    }
+    },
+    "TagSpecifications": [
+     {
+      "ResourceType": "launch-template",
+      "Tags": [
+       {
+        "Key": "Name",
+        "Value": "aws-cdk-asg-integ/T4gLT"
+       }
+      ]
+     }
+    ]
    }
   },
   "VPCB9E5F0B4": {
diff --git a/packages/@aws-cdk/aws-ec2/lib/launch-template.ts b/packages/@aws-cdk/aws-ec2/lib/launch-template.ts
@@ -563,6 +563,7 @@ export class LaunchTemplate extends Resource implements ILaunchTemplate, iam.IGr
     }
 
     this.tags = new TagManager(TagType.KEY_VALUE, 'AWS::EC2::LaunchTemplate');
+
     const tagsToken = Lazy.any({
       produce: () => {
         if (this.tags.hasTags()) {
@@ -588,6 +589,27 @@ export class LaunchTemplate extends Resource implements ILaunchTemplate, iam.IGr
       },
     });
 
+    const ltTagsToken = Lazy.any({
+      produce: () => {
+        if (this.tags.hasTags()) {
+          const renderedTags = this.tags.renderTags();
+          const lowerCaseRenderedTags = renderedTags.map( (tag: { [key: string]: string}) => {
+            return {
+              key: tag.Key,
+              value: tag.Value,
+            };
+          });
+          return [
+            {
+              resourceType: 'launch-template',
+              tags: lowerCaseRenderedTags,
+            },
+          ];
+        }
+        return undefined;
+      },
+    });
+
     const resource = new CfnLaunchTemplate(this, 'Resource', {
       launchTemplateName: props?.launchTemplateName,
       launchTemplateData: {
@@ -655,6 +677,7 @@ export class LaunchTemplate extends Resource implements ILaunchTemplate, iam.IGr
         // placement: undefined,
 
       },
+      tagSpecifications: ltTagsToken,
     });
 
     Tags.of(this).add(NAME_TAG, this.node.path);
diff --git a/packages/@aws-cdk/aws-ec2/test/launch-template.test.ts b/packages/@aws-cdk/aws-ec2/test/launch-template.test.ts
@@ -74,6 +74,17 @@ describe('LaunchTemplate', () => {
           },
         ],
       },
+      TagSpecifications: [
+        {
+          ResourceType: 'launch-template',
+          Tags: [
+            {
+              Key: 'Name',
+              Value: 'Default/Template',
+            },
+          ],
+        },
+      ],
     });
     Template.fromStack(stack).resourceCountIs('AWS::IAM::InstanceProfile', 0);
     expect(() => { template.grantPrincipal; }).toThrow();
@@ -248,6 +259,17 @@ describe('LaunchTemplate', () => {
           },
         ],
       },
+      TagSpecifications: [
+        {
+          ResourceType: 'launch-template',
+          Tags: [
+            {
+              Key: 'Name',
+              Value: 'Default/Template',
+            },
+          ],
+        },
+      ],
     });
     expect(template.role).toBeDefined();
     expect(template.grantPrincipal).toBeDefined();
@@ -533,6 +555,21 @@ describe('LaunchTemplate', () => {
           },
         ],
       },
+      TagSpecifications: [
+        {
+          ResourceType: 'launch-template',
+          Tags: [
+            {
+              Key: 'Name',
+              Value: 'Default/Template',
+            },
+            {
+              Key: 'TestKey',
+              Value: 'TestValue',
+            },
+          ],
+        },
+      ],
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,18 @@`
`28`	`28`	`]`
`29`	`29`	`}`
`30`	`30`	`]`
`31`		`- }`
	`31`	`+ },`
	`32`	`+ "TagSpecifications": [`
	`33`	`+ {`
	`34`	`+ "ResourceType": "launch-template",`
	`35`	`+ "Tags": [`
	`36`	`+ {`
	`37`	`+ "Key": "Name",`
	`38`	`+ "Value": "aws-cdk-asg-integ/MainLT"`
	`39`	`+ }`
	`40`	`+ ]`
	`41`	`+ }`
	`42`	`+ ]`
`32`	`43`	`}`
`33`	`44`	`},`
`34`	`45`	`"T4gLT8FF7D308": {`
`@@ -59,7 +70,18 @@`
`59`	`70`	`]`
`60`	`71`	`}`
`61`	`72`	`]`
`62`		`- }`
	`73`	`+ },`
	`74`	`+ "TagSpecifications": [`
	`75`	`+ {`
	`76`	`+ "ResourceType": "launch-template",`
	`77`	`+ "Tags": [`
	`78`	`+ {`
	`79`	`+ "Key": "Name",`
	`80`	`+ "Value": "aws-cdk-asg-integ/T4gLT"`
	`81`	`+ }`
	`82`	`+ ]`
	`83`	`+ }`
	`84`	`+ ]`
`63`	`85`	`}`
`64`	`86`	`},`
`65`	`87`	`"VPCB9E5F0B4": {`