Merge branch 'main' into seed-feat

Author: Vieltojarvi

.changeset/funny-dolls-live.md

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

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

@@ -51,7 +51,7 @@ export const confirmDeleteSandbox = () =>
  * then perform the specified file replacements in the backend code which will trigger sandbox again
  */
 export const replaceFiles = (replacements: CopyDefinition[]) => {
-  return waitForSandboxToBecomeIdle().replaceFiles(replacements);
+  return waitForConfigUpdateAfterDeployment().replaceFiles(replacements);
 };
 
 /**

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

@@ -13,6 +13,7 @@ import {
   interruptSandbox,
   replaceFiles,
   waitForConfigUpdateAfterDeployment,
+  waitForSandboxToBecomeIdle,
   waitForSandboxToBeginHotswappingResources,
 } from '../../process-controller/predicated_action_macros.js';
 import { BackendIdentifier } from '@aws-amplify/plugin-types';
@@ -109,6 +110,7 @@ export const defineSandboxTest = (testProjectCreator: TestProjectCreator) => {
                       ensureDeploymentTimeLessThan(update.deployThresholdSec),
                     );
                   }
+                  processController.do(waitForSandboxToBecomeIdle());
                 }
 
                 // Execute the process.

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

@@ -286,8 +286,14 @@ class DataStorageAuthWithTriggerTestProject extends TestProjectBase {
       defaultNodeLambdaTypedShimPath,
       'utf8',
     );
-    assert.ok(fileContent.includes('newKey: string;')); // Env var added via addEnvironment
-    assert.ok(fileContent.includes('TEST_SECRET: string;')); // Env var added via defineFunction
+    assert.ok(
+      fileContent.includes('newKey: string;'),
+      `file content was ${fileContent}`,
+    ); // Env var added via addEnvironment
+    assert.ok(
+      fileContent.includes('TEST_SECRET: string;'),
+      `file content was ${fileContent}`,
+    ); // Env var added via defineFunction
 
     // assert specific config are correct in the outputs file
     const outputsObject = JSON.parse(