avoid client config generation race condition (#2184)

* avoid client config generation race condition

* remove rejectCleanupSandbox action

* add changeset

* try this

* update deployment test template

Author: rtpascual

.changeset/tall-singers-rest.md

@@ -0,0 +1,2 @@
+---
+---

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

@@ -40,16 +40,6 @@ export const confirmDeleteSandbox = () =>
     )
     .sendYes();
 
-/**
- * Reusable predicated action: Wait for sandbox to prompt on quitting to delete all the resource and respond with no
- */
-export const rejectCleanupSandbox = () =>
-  new PredicatedActionBuilder()
-    .waitForLineIncludes(
-      'Would you like to delete all the resources in your sandbox environment'
-    )
-    .sendNo();
-
 /**
  * Reusable predicated action: Wait for sandbox to become idle,
  * then perform the specified file replacements in the backend code which will trigger sandbox again
@@ -59,9 +49,10 @@ export const replaceFiles = (replacements: CopyDefinition[]) => {
 };
 
 /**
- * Reusable predicated action: Wait for sandbox to become idle and then quit it (CTRL-C)
+ * Reusable predicated action: Wait for sandbox to become idle and config to be generated and then quit it (CTRL-C)
  */
-export const interruptSandbox = () => waitForSandboxToBecomeIdle().sendCtrlC();
+export const interruptSandbox = () =>
+  waitForConfigUpdateAfterDeployment().sendCtrlC();
 
 /**
  * Reusable predicated action: Wait for sandbox to finish deployment and assert that the deployment time is less

packages/integration-tests/src/test-e2e/deployment/deployment.test.template.ts

@@ -11,10 +11,7 @@ import { TestProjectBase } from '../../test-project-setup/test_project_base.js';
 import { PredicatedActionBuilder } from '../../process-controller/predicated_action_queue_builder.js';
 import { ampxCli } from '../../process-controller/process_controller.js';
 import path from 'path';
-import {
-  interruptSandbox,
-  rejectCleanupSandbox,
-} from '../../process-controller/predicated_action_macros.js';
+import { waitForSandboxToBecomeIdle } from '../../process-controller/predicated_action_macros.js';
 import assert from 'node:assert';
 import { TestBranch, amplifyAppPool } from '../../amplify_app_pool.js';
 import { BackendIdentifier } from '@aws-amplify/plugin-types';
@@ -127,17 +124,18 @@ export const defineDeploymentTest = (
 
         void describe('in sequence', { concurrency: false }, () => {
           void it('in sandbox deploy', async () => {
+            const predicatedActionBuilder = new PredicatedActionBuilder();
             await ampxCli(
               ['sandbox', '--dirToWatch', 'amplify'],
               testProject.projectDirPath
             )
               .do(
-                new PredicatedActionBuilder().waitForLineIncludes(
+                predicatedActionBuilder.waitForLineIncludes(
                   'TypeScript validation check failed'
                 )
               )
-              .do(interruptSandbox())
-              .do(rejectCleanupSandbox())
+              .do(waitForSandboxToBecomeIdle())
+              .do(predicatedActionBuilder.sendCtrlC())
               .run();
           });
 

packages/integration-tests/src/test-e2e/sandbox/sandbox.test.template.ts

@@ -11,7 +11,6 @@ import { ampxCli } from '../../process-controller/process_controller.js';
 import {
   ensureDeploymentTimeLessThan,
   interruptSandbox,
-  rejectCleanupSandbox,
   replaceFiles,
   waitForConfigUpdateAfterDeployment,
 } from '../../process-controller/predicated_action_macros.js';
@@ -98,10 +97,7 @@ export const defineSandboxTest = (testProjectCreator: TestProjectCreator) => {
             }
 
             // Execute the process.
-            await processController
-              .do(interruptSandbox())
-              .do(rejectCleanupSandbox())
-              .run();
+            await processController.do(interruptSandbox()).run();
 
             await testProject.assertPostDeployment(sandboxBackendIdentifier);
           }

packages/integration-tests/src/test-live-dependency-health-checks/health_checks.test.ts

@@ -14,7 +14,6 @@ import {
 import {
   confirmDeleteSandbox,
   interruptSandbox,
-  rejectCleanupSandbox,
   waitForSandboxDeploymentToPrintTotalTime,
 } from '../process-controller/predicated_action_macros.js';
 import { BackendIdentifierConversions } from '@aws-amplify/platform-core';
@@ -123,7 +122,6 @@ void describe('Live dependency health checks', { concurrency: true }, () => {
       await ampxCli(['sandbox'], tempDir)
         .do(waitForSandboxDeploymentToPrintTotalTime())
         .do(interruptSandbox())
-        .do(rejectCleanupSandbox())
         .run();
 
       const clientConfigStats = await fs.stat(

packages/integration-tests/src/test-project-setup/test_project_base.ts

@@ -9,7 +9,6 @@ import { ampxCli } from '../process-controller/process_controller.js';
 import {
   confirmDeleteSandbox,
   interruptSandbox,
-  rejectCleanupSandbox,
   waitForSandboxDeploymentToPrintTotalTime,
 } from '../process-controller/predicated_action_macros.js';
 
@@ -77,7 +76,6 @@ export abstract class TestProjectBase {
       })
         .do(waitForSandboxDeploymentToPrintTotalTime())
         .do(interruptSandbox())
-        .do(rejectCleanupSandbox())
         .run();
     } else {
       await ampxCli(