fix: harden CDK test cleanup against race conditions and version mismatch

Author: sarayev

packages/amplify-e2e-core/src/utils/index.ts

@@ -33,7 +33,22 @@ export function deleteProjectDir(root: string) {
     console.warn(`🌋 Did not delete project dir: ${root}`);
     return;
   }
-  rimraf.sync(root);
+  // Retry up to 3 times with 1s delay to handle Node 22 + rimraf v3
+  // ENOTEMPTY race conditions during parallel test cleanup
+  for (let attempt = 0; attempt < 3; attempt++) {
+    try {
+      rimraf.sync(root);
+      return;
+    } catch (err: any) {
+      if (attempt === 2) {
+        console.error(`Failed to delete project dir after 3 attempts: ${root}`, err.message);
+        return; // Don't throw — cleanup failures shouldn't fail tests
+      }
+      // Wait 1s before retry
+      const { execSync } = require('child_process');
+      execSync('sleep 1');
+    }
+  }
 }
 
 export function deleteAmplifyDir(root: string) {

packages/amplify-graphql-api-construct-tests/src/__tests__/ddb-iam-access.test.ts

@@ -153,9 +153,16 @@ describe('CDK DDB Iam Access', () => {
     } catch (err) {
       console.log(`Error invoking 'cdk destroy': ${err}`);
     }
-
-    deleteProjectDir(projRoot);
-    deleteProjectDir(projRootWithIam);
+    try {
+      deleteProjectDir(projRoot);
+    } catch (e) {
+      console.error(`Cleanup failed: ${e}`);
+    }
+    try {
+      deleteProjectDir(projRootWithIam);
+    } catch (e) {
+      console.error(`Cleanup failed: ${e}`);
+    }
   });
 
   it('can access TodoWithPrivateIam', async () => {

packages/amplify-graphql-api-construct-tests/src/__tests__/log-config.test.ts

@@ -123,8 +123,16 @@ describe('Log Config Tests', () => {
 
   afterAll(async () => {
     const destroyCDKProjectAndDeleteProjectDir = async (projRoot: string): Promise<void> => {
-      await cdkDestroy(projRoot, '--all');
-      deleteProjectDir(projRoot);
+      try {
+        await cdkDestroy(projRoot, '--all');
+      } catch (err) {
+        console.error(`Failed to destroy CDK project ${projRoot}:`, err);
+      }
+      try {
+        deleteProjectDir(projRoot);
+      } catch (err) {
+        console.error(`Failed to delete project dir ${projRoot}:`, err);
+      }
     };
     const cleanupTasks = projRoots.map((projRoot) => destroyCDKProjectAndDeleteProjectDir(projRoot));
     await Promise.all(cleanupTasks);

packages/amplify-graphql-api-construct-tests/src/commands.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import { copySync, moveSync, readFileSync, writeFileSync } from 'fs-extra';
+import { copySync, moveSync, readFileSync, removeSync, writeFileSync } from 'fs-extra';
 import {
   addApiWithoutSchema,
   amplifyPush,
@@ -99,6 +99,14 @@ export const initCDKProject = async (cwd: string, templatePath: string, props?:
 
   copyTemplateDirectory(cwd, templatePath);
 
+  // Remove the auto-generated lib/ directory from `cdk init` — it contains
+  // dead code that references potentially incompatible aws-cdk-lib imports
+  // and causes TypeScript compilation failures during `cdk destroy`
+  const libDir = path.join(cwd, 'lib');
+  if (fs.existsSync(libDir)) {
+    removeSync(libDir);
+  }
+
   const deps = [getPackagedConstructPath(props?.construct ?? 'GraphqlApi'), `aws-cdk-lib@${cdkVersion}`, ...additionalDependencies];
   await spawn('npm', ['install', ...deps], { cwd, stripColors: true }).runAsync();