feat: sandbox deployment events

packages/cli/src/commands/generate/generate_command_factory.ts

@@ -2,11 +2,15 @@ import { CommandModule } from 'yargs';
 import { GenerateCommand } from './generate_command.js';
 import { GenerateConfigCommand } from './config/generate_config_command.js';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
+import { GenerateFormsCommand } from './forms/generate_forms_command.js';
 import { CwdPackageJsonLoader } from '../../cwd_package_json_loader.js';
 import { GenerateGraphqlClientCodeCommand } from './graphql-client-code/generate_graphql_client_code_command.js';
 import { LocalAppNameResolver } from '../../backend-identifier/local_app_name_resolver.js';
 import { BackendIdentifierResolver } from '../../backend-identifier/backend_identifier_resolver.js';
 import { ClientConfigGeneratorAdapter } from '../../client-config/client_config_generator_adapter.js';
+import { FormGenerationHandler } from './forms/form_generation_handler.js';
+import { BackendOutputClient } from '@aws-amplify/deployed-backend-client';
+import { GenerateApiCodeAdapter } from './graphql-client-code/generate_api_code_adapter.js';
 
 /**
  * Creates wired generate command.

packages/cli/src/commands/sandbox/sandbox_command.test.ts

@@ -12,6 +12,7 @@ import { createSandboxCommand } from './sandbox_command_factory.js';
 import { SandboxDeleteCommand } from './sandbox-delete/sandbox_delete_command.js';
 import { Sandbox, SandboxSingletonFactory } from '@aws-amplify/sandbox';
 import { ClientConfigGeneratorAdapter } from '../../client-config/client_config_generator_adapter.js';
+import { createSandboxSecretCommand } from './sandbox-secret/sandbox_secret_command_factory.js';
 
 void describe('sandbox command factory', () => {
   void it('instantiate a sandbox command correctly', () => {
@@ -23,7 +24,7 @@ void describe('sandbox command', () => {
   let commandRunner: TestCommandRunner;
   let sandbox: Sandbox;
   let sandboxStartMock = mock.fn<typeof sandbox.start>();
-  let mockGenerate =
+  const mockGenerate =
     mock.fn<ClientConfigGeneratorAdapter['generateClientConfigToFile']>();
   const generationMock = mock.fn<EventHandler>();
 
@@ -38,7 +39,7 @@ void describe('sandbox command', () => {
 
     const sandboxCommand = new SandboxCommand(
       sandboxFactory,
-      sandboxDeleteCommand,
+      [sandboxDeleteCommand, createSandboxSecretCommand()],
       () => ({
         successfulDeployment: [generationMock],
       })
@@ -49,7 +50,7 @@ void describe('sandbox command', () => {
     mockGenerate.mock.resetCalls();
   });
 
-  it('registers a callback on the "successfulDeployment" event', async () => {
+  void it('registers a callback on the "successfulDeployment" event', async () => {
     const mockOn = mock.method(sandbox, 'on');
     await commandRunner.runCommand('sandbox');
     assert.equal(mockOn.mock.calls[0].arguments[0], 'successfulDeployment');
@@ -71,7 +72,7 @@ void describe('sandbox command', () => {
     );
   });
 
-  it('shows available options in help output', async () => {
+  void it('shows available options in help output', async () => {
     const output = await commandRunner.runCommand('sandbox --help');
     assert.match(output, /--name/);
     assert.match(output, /--dirToWatch/);

packages/cli/src/commands/sandbox/sandbox_command.ts

@@ -1,5 +1,4 @@
 import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
-import { SandboxDeleteCommand } from './sandbox-delete/sandbox_delete_command.js';
 import fs from 'fs';
 import { AmplifyPrompter } from '../prompter/amplify_prompts.js';
 import { SandboxSingletonFactory } from '@aws-amplify/sandbox';
@@ -56,7 +55,7 @@ export class SandboxCommand
    */
   constructor(
     private readonly sandboxFactory: SandboxSingletonFactory,
-    private readonly sandboxDeleteCommand: SandboxDeleteCommand,
+    private readonly sandboxSubCommands: CommandModule[],
     private readonly sandboxEventHandlerCreator?: SandboxEventHandlerCreator
   ) {
     this.command = 'sandbox';
@@ -74,7 +73,7 @@ export class SandboxCommand
     const eventHandlers = this.sandboxEventHandlerCreator?.({
       appName: args.name,
       format: args.format,
-      outDir: args.out,
+      outDir: args.outDir,
     });
     if (eventHandlers) {
       Object.entries(eventHandlers).forEach(([event, handlers]) => {
@@ -83,7 +82,7 @@ export class SandboxCommand
     }
     const watchExclusions = args.exclude ?? [];
     const clientConfigWritePath = await getClientConfigPath(
-      args.out,
+      args.outDir,
       args.format
     );
     watchExclusions.push(clientConfigWritePath);

packages/cli/src/commands/sandbox/sandbox_command_factory.ts

@@ -41,7 +41,7 @@ export const createSandboxCommand = (): CommandModule<
       successfulDeployment: [
         async () => {
           const id = await getBackendIdentifier(appName);
-          clientConfigGeneratorAdapter.generateClientConfigToFile(
+          await clientConfigGeneratorAdapter.generateClientConfigToFile(
             id,
             outDir,
             format
@@ -52,7 +52,7 @@ export const createSandboxCommand = (): CommandModule<
   };
   return new SandboxCommand(
     sandboxFactory,
-    new SandboxDeleteCommand(sandboxFactory),
+    [new SandboxDeleteCommand(sandboxFactory), createSandboxSecretCommand()],
     sandboxEventHandlerCreator
   );
 };

packages/integration-tests/src/process-controller/process_controller.ts

@@ -72,6 +72,8 @@ export class ProcessController {
       if (typeof currentInteraction.payload === 'string') {
         if (currentInteraction.payload === CONTROL_C) {
           if (process.platform.startsWith('win')) {
+            // Wait X milliseconds before sending kill in hopes of draining the node event queue
+            await new Promise((resolve) => setTimeout(resolve, 5000));
             // turns out killing child process on Windows is a huge PITA
             // https://stackoverflow.com/questions/23706055/why-can-i-not-kill-my-child-process-in-nodejs-on-windows
             // https://github.com/sindresorhus/execa#killsignal-options

packages/sandbox/src/file_watching_sandbox.test.ts

@@ -311,7 +311,7 @@ void describe('Sandbox with absolute output path', () => {
     await sandboxInstance.stop();
   });
 
-  it('sets AWS profile when starting sandbox', async () => {
+  void it('sets AWS profile when starting sandbox', async () => {
     assert.strictEqual(process.env.AWS_PROFILE, 'amplify-sandbox');
   });
 });
@@ -388,7 +388,7 @@ void describe('Sandbox ignoring paths in .gitignore', () => {
     // CDK should also be called once
     assert.strictEqual(execaDeployMock.mock.callCount(), 1);
   });
-  it('emits the successfulDeployment event after deployment', async () => {
+  void it('emits the successfulDeployment event after deployment', async () => {
     const mockListener = mock.fn();
     const mockDeploy = mock.fn();
     mockDeploy.mock.mockImplementation(async () => null);