Merge branch 'main' into yuanhaoz/table-fix-ff

Author: mergify[bot]

packages/@aws-cdk/aws-iot-alpha/lib/scheduled-audit.ts

@@ -165,6 +165,11 @@ export enum DayOfWeek {
    * Saturday
    */
   SATURDAY = 'SAT',
+
+  /**
+   * UNSET_VALUE
+   */
+  UNSET_VALUE = 'UNSET_VALUE',
 }
 
 /**

packages/aws-cdk-lib/core/lib/nested-stack.ts

@@ -226,7 +226,8 @@ export class NestedStack extends Stack {
       packaging: FileAssetPackaging.FILE,
       sourceHash: templateHash,
       fileName: this.templateFile,
-      displayName: `${this.stackName} Template`,
+      // this.stackName is a Token for nested stacks, so use something else
+      displayName: `${Names.stackRelativeConstructPath(this)} Nested Stack Template`,
     });
 
     this.addResourceMetadata(this.resource, 'TemplateURL');

packages/aws-cdk-lib/core/lib/stack-synthesizers/asset-manifest-builder.ts

@@ -5,6 +5,7 @@ import * as cxschema from '../../../cloud-assembly-schema';
 import { FileAssetSource, FileAssetPackaging, DockerImageAssetSource } from '../assets';
 import { resolvedOr } from '../helpers-internal/string-specializer';
 import { Stack } from '../stack';
+import { Token } from '../token';
 
 /**
  * Build an asset manifest from assets added to a stack
@@ -289,13 +290,21 @@ function validateFileAssetSource(asset: FileAssetSource) {
   if (!!asset.packaging !== !!asset.fileName) {
     throw new Error(`'packaging' is expected in combination with 'fileName', got: ${JSON.stringify(asset)}`);
   }
+
+  if (Token.isUnresolved(asset.displayName)) {
+    throw new Error(`'displayName' may not contain a Token, got: ${JSON.stringify(asset.displayName)}`);
+  }
 }
 
 function validateDockerImageAssetSource(asset: DockerImageAssetSource) {
   if (!!asset.executable === !!asset.directoryName) {
     throw new Error(`Exactly one of 'directoryName' or 'executable' is required, got: ${JSON.stringify(asset)}`);
   }
 
+  if (Token.isUnresolved(asset.displayName)) {
+    throw new Error(`'displayName' may not contain a Token, got: ${JSON.stringify(asset.displayName)}`);
+  }
+
   check('dockerBuildArgs');
   check('dockerBuildTarget');
   check('dockerOutputs');

packages/aws-cdk-lib/core/test/stack-synthesis/all-synthesizers.test.ts

@@ -1,6 +1,6 @@
 import { FileAssetPackaging } from '@aws-cdk/cloud-assembly-schema';
 import { getAssetManifest, readAssetManifest } from './_helpers';
-import { CliCredentialsStackSynthesizer, LegacyStackSynthesizer } from '../../lib';
+import { Aws, CliCredentialsStackSynthesizer, LegacyStackSynthesizer } from '../../lib';
 import { App } from '../../lib/app';
 import { Stack } from '../../lib/stack';
 import { DefaultStackSynthesizer } from '../../lib/stack-synthesizers/default-synthesizer';
@@ -45,3 +45,29 @@ test.each([
   });
 });
 
+test.each([
+  ['DefaultStackSynthesizer', () => new DefaultStackSynthesizer()],
+  ['CliCredentialsStackSynthesizer', () => new CliCredentialsStackSynthesizer()],
+])('%p: displayName may not contain tokens', (_name, factory) => {
+  // GIVEN
+  const app = new App();
+  const stack = new Stack(app, 'Stack', {
+    synthesizer: factory(),
+    env: {
+      account: '111111111111', region: 'us-east-1',
+    },
+  });
+
+  expect(() => stack.synthesizer.addFileAsset({
+    fileName: __filename,
+    packaging: FileAssetPackaging.FILE,
+    sourceHash: 'fileHash',
+    displayName: Aws.STACK_NAME,
+  })).toThrow(/may not contain a Token/);
+
+  expect(() => stack.synthesizer.addDockerImageAsset({
+    directoryName: '.',
+    sourceHash: 'dockerHash',
+    displayName: Aws.STACK_NAME,
+  })).toThrow(/may not contain a Token/);
+});