Merge branch 'main' into docs-fix-appsync-events-apikey

Author: mergify[bot]

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -25,7 +25,7 @@ import { AssumeRoleCommand, GetCallerIdentityCommand } from '@aws-sdk/client-sts
 import {
   cloneDirectory,
   integTest,
-  // randomInteger,
+  randomInteger,
   randomString,
   RESOURCES_DIR,
   retry,
@@ -2214,26 +2214,26 @@ integTest(
   }),
 );
 
-// integTest(
-//   'sam can locally test the synthesized cdk application',
-//   withSamIntegrationFixture(async (fixture) => {
-//     // Synth first
-//     await fixture.cdkSynth();
-
-//     const result = await fixture.samLocalStartApi(
-//       'TestStack',
-//       false,
-//       randomInteger(30000, 40000),
-//       '/restapis/spec/pythonFunction',
-//     );
-//     expect(result.actionSucceeded).toBeTruthy();
-//     expect(result.actionOutput).toEqual(
-//       expect.objectContaining({
-//         message: 'Hello World',
-//       }),
-//     );
-//   }),
-// );
+integTest(
+  'sam can locally test the synthesized cdk application',
+  withSamIntegrationFixture(async (fixture) => {
+    // Synth first
+    await fixture.cdkSynth();
+
+    const result = await fixture.samLocalStartApi(
+      'TestStack',
+      false,
+      randomInteger(30000, 40000),
+      '/restapis/spec/pythonFunction',
+    );
+    expect(result.actionSucceeded).toBeTruthy();
+    expect(result.actionOutput).toEqual(
+      expect.objectContaining({
+        message: 'Hello World',
+      }),
+    );
+  }),
+);
 
 integTest(
   'skips notice refresh',

packages/@aws-cdk/toolkit/jest.config.js

@@ -1,11 +1,14 @@
 const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = {
     ...baseConfig,
+    randomize: true,
     coverageThreshold: {
         global: {
             // this is very sad but we will get better
-            branches: 42,
-            statements: 69,
+            statements: 75,
+            branches: 55,
+            functions: 70,
+            lines: 75,
         },
     },
 };

packages/@aws-cdk/toolkit/lib/actions/deploy/index.ts

@@ -115,14 +115,6 @@ export interface BaseDeployOptions {
    */
   readonly stacks?: StackSelector;
 
-  /**
-   * @deprecated set on toolkit
-   * Name of the toolkit stack to use/deploy
-   *
-   * @default CDKToolkit
-   */
-  readonly toolkitStackName?: string;
-
   /**
    * Role to pass to CloudFormation for deployment
    */

packages/@aws-cdk/toolkit/lib/api/aws-cdk.ts

@@ -7,6 +7,7 @@ export { Deployments, type SuccessfulDeployStackResult } from '../../../../aws-c
 export { Settings } from '../../../../aws-cdk/lib/api/settings';
 export { tagsForStack } from '../../../../aws-cdk/lib/api/tags';
 export { DEFAULT_TOOLKIT_STACK_NAME } from '../../../../aws-cdk/lib/api/toolkit-info';
+export { ResourceMigrator } from '../../../../aws-cdk/lib/api/resource-import';
 
 // Context Providers
 export * as contextproviders from '../../../../aws-cdk/lib/context-providers';
@@ -19,7 +20,6 @@ export { formatTime } from '../../../../aws-cdk/lib/api/util/string-manipulation
 
 // @todo Not yet API probably should be
 export { formatErrorMessage } from '../../../../aws-cdk/lib/util/error';
-export { ResourceMigrator } from '../../../../aws-cdk/lib/migrator';
 export { obscureTemplate, serializeStructure } from '../../../../aws-cdk/lib/serialize';
 export { loadTree, some } from '../../../../aws-cdk/lib/tree';
 export { splitBySize } from '../../../../aws-cdk/lib/util';

packages/@aws-cdk/toolkit/lib/api/io/private/codes.ts

@@ -15,11 +15,15 @@ export const CODES = {
   // 2: List
   CDK_TOOLKIT_I2901: 'Provides details on the selected stacks and their dependencies',
 
+  // 3: Import & Migrate
+  CDK_TOOLKIT_E3900: 'Resource import failed',
+
   // 4: Diff
 
-  // 5: Deploy
+  // 5: Deploy & Watch
   CDK_TOOLKIT_I5000: 'Provides deployment times',
   CDK_TOOLKIT_I5001: 'Provides total time in deploy action, including synth and rollback',
+  CDK_TOOLKIT_I5002: 'Provides time for resource migration',
   CDK_TOOLKIT_I5031: 'Informs about any log groups that are traced as part of the deployment',
   CDK_TOOLKIT_I5050: 'Confirm rollback during deployment',
   CDK_TOOLKIT_I5060: 'Confirm deploy security sensitive changes',

packages/@aws-cdk/toolkit/lib/toolkit/toolkit.ts

@@ -19,7 +19,7 @@ import { CachedCloudAssemblySource, IdentityCloudAssemblySource, StackAssembly,
 import { ALL_STACKS, CloudAssemblySourceBuilder } from '../api/cloud-assembly/private';
 import { ToolkitError } from '../api/errors';
 import { IIoHost, IoMessageCode, IoMessageLevel } from '../api/io';
-import { asSdkLogger, withAction, Timer, confirm, error, highlight, info, success, warn, ActionAwareIoHost, debug, result, withoutEmojis, withoutColor, withTrimmedWhitespace } from '../api/io/private';
+import { asSdkLogger, withAction, Timer, confirm, error, info, success, warn, ActionAwareIoHost, debug, result, withoutEmojis, withoutColor, withTrimmedWhitespace } from '../api/io/private';
 
 /**
  * The current action being performed by the CLI. 'none' represents the absence of an action.
@@ -256,10 +256,8 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
     }
 
     const deployments = await this.deploymentsForAction('deploy');
+    const migrator = new ResourceMigrator({ deployments, ioHost, action });
 
-    const migrator = new ResourceMigrator({
-      deployments,
-    });
     await migrator.tryMigrateResources(stackCollection, options);
 
     const requireApproval = options.requireApproval ?? RequireApproval.NEVER;
@@ -275,7 +273,6 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
     }
 
     const stacks = stackCollection.stackArtifacts;
-
     const stackOutputs: { [key: string]: any } = {};
     const outputsFile = options.outputsFile;
 
@@ -303,28 +300,31 @@ export class Toolkit extends CloudAssemblySourceBuilder implements AsyncDisposab
     const deployStack = async (stackNode: StackNode) => {
       const stack = stackNode.stack;
       if (stackCollection.stackCount !== 1) {
-        await ioHost.notify(highlight(stack.displayName));
+        await ioHost.notify(info(chalk.bold(stack.displayName)));
       }
 
       if (!stack.environment) {
-        // eslint-disable-next-line max-len
         throw new ToolkitError(
           `Stack ${stack.displayName} does not define an environment, and AWS credentials could not be obtained from standard locations or no region was configured.`,
         );
       }
 
+      // The generated stack has no resources
       if (Object.keys(stack.template.Resources || {}).length === 0) {
-        // The generated stack has no resources
-        if (!(await deployments.stackExists({ stack }))) {
-          await ioHost.notify(warn(`${chalk.bold(stack.displayName)}: stack has no resources, skipping deployment.`));
-        } else {
-          await ioHost.notify(warn(`${chalk.bold(stack.displayName)}: stack has no resources, deleting existing stack.`));
-          await this._destroy(assembly, 'deploy', {
-            stacks: { patterns: [stack.hierarchicalId], strategy: StackSelectionStrategy.PATTERN_MUST_MATCH_SINGLE },
-            roleArn: options.roleArn,
-            ci: options.ci,
-          });
+        // stack is empty and doesn't exist => do nothing
+        const stackExists = await deployments.stackExists({ stack });
+        if (!stackExists) {
+          return ioHost.notify(warn(`${chalk.bold(stack.displayName)}: stack has no resources, skipping deployment.`));
         }
+
+        // stack is empty, but exists => delete
+        await ioHost.notify(warn(`${chalk.bold(stack.displayName)}: stack has no resources, deleting existing stack.`));
+        await this._destroy(assembly, 'deploy', {
+          stacks: { patterns: [stack.hierarchicalId], strategy: StackSelectionStrategy.PATTERN_MUST_MATCH_SINGLE },
+          roleArn: options.roleArn,
+          ci: options.ci,
+        });
+
         return;
       }
 

packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/asset/index.ts

@@ -7,7 +7,7 @@ const ioHost = new TestIoHost();
 const toolkit = new Toolkit({ ioHost });
 jest.spyOn(toolkit, 'rollback').mockResolvedValue();
 
-let mockDestroyStack = jest.fn().mockResolvedValue({});
+let mockDestroyStack = jest.fn();
 
 jest.mock('../../lib/api/aws-cdk', () => {
   return {
@@ -22,6 +22,7 @@ beforeEach(() => {
   ioHost.notifySpy.mockClear();
   ioHost.requestSpy.mockClear();
   jest.clearAllMocks();
+  mockDestroyStack.mockResolvedValue({});
 });
 
 describe('destroy', () => {
@@ -68,7 +69,7 @@ describe('destroy', () => {
 
   test('destroy deployment fails', async () => {
     // GIVEN
-    mockDestroyStack = jest.fn().mockRejectedValue({});
+    mockDestroyStack.mockRejectedValue({});
 
     // WHEN
     const cx = await builderFixture(toolkit, 'stack-with-role');

packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.ts

@@ -5,11 +5,7 @@ import { builderFixture, TestIoHost } from '../_helpers';
 const ioHost = new TestIoHost();
 const toolkit = new Toolkit({ ioHost });
 
-let mockRollbackStack = jest.fn().mockResolvedValue({
-  notInRollbackableState: false,
-  success: true,
-});
-
+let mockRollbackStack = jest.fn();
 jest.mock('../../lib/api/aws-cdk', () => {
   return {
     ...jest.requireActual('../../lib/api/aws-cdk'),
@@ -23,6 +19,10 @@ beforeEach(() => {
   ioHost.notifySpy.mockClear();
   ioHost.requestSpy.mockClear();
   jest.clearAllMocks();
+  mockRollbackStack.mockResolvedValue({
+    notInRollbackableState: false,
+    success: true,
+  });
 });
 
 describe('rollback', () => {