Merge branch 'main' into revert-p0

Author: mergify[bot]

packages/aws-cdk-lib/core/lib/tag-aspect.ts

@@ -121,7 +121,7 @@ export class Tag extends TagBase {
   constructor(key: string, value: string, props: TagProps = {}) {
     super(key, props);
     if (value === undefined) {
-      throw new UnscopedValidationError('Tag must have a value');
+      throw new UnscopedValidationError(`Tag '${key}' must have a value`);
     }
     this.value = value;
   }

packages/aws-cdk-lib/core/test/tag-aspect.test.ts

@@ -13,6 +13,7 @@ import {
   ITaggable,
   ITaggableV2,
   AspectPriority,
+  UnscopedValidationError,
 } from '../lib';
 import { synthesize } from '../lib/private/synthesis';
 
@@ -331,4 +332,14 @@ describe('tag aspect', () => {
       }).toThrow();
     });
   });
+
+  test('if tag value is undefined, it raises with appropriate content', () => {
+    expect(() => {
+      new Tag('test-key', undefined as any);
+    }).toThrow(UnscopedValidationError);
+
+    expect(() => {
+      new Tag('test-key', undefined as any);
+    }).toThrow("Tag 'test-key' must have a value");
+  });
 });