add retry for cdk migrate java & fetchDockerLoginCredential

Author: abidhasan-aws

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/migrate/cdk-migrate-deploys-successfully-java.integtest.ts

@@ -1,13 +1,13 @@
 import { deploysSuccessfully } from './testcase';
-import { integTest, withCDKMigrateFixture } from '../../../lib';
+import { integTest, withCDKMigrateFixture, withRetry } from '../../../lib';
 
 const language = 'java';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 
 integTest(
   `cdk migrate ${language} deploys successfully`,
-  withCDKMigrateFixture(language, async (fixture) => {
+  withRetry(withCDKMigrateFixture(language, async (fixture) => {
     await deploysSuccessfully(fixture, language);
-  }),
+  })),
 );

packages/cdk-assets/bin/docker-credential-cdk-assets.ts

@@ -39,9 +39,32 @@ async function main() {
 
   // Read the domain to fetch from stdin
   let endpoint = fs.readFileSync(0, { encoding: 'utf-8' }).trim();
-  const credentials = await fetchDockerLoginCredentials(new DefaultAwsClient(), config, endpoint);
-  // Write the credentials back to stdout
-  fs.writeFileSync(1, JSON.stringify(credentials));
+
+  const deadline = Date.now() + 60_000; // 60 seconds timeout
+  let lastError: Error | undefined;
+
+  while (Date.now() < deadline) {
+    try {
+      const credentials = await fetchDockerLoginCredentials(new DefaultAwsClient(), config, endpoint);
+      // Write the credentials back to stdout
+      fs.writeFileSync(1, JSON.stringify(credentials));
+      return;
+    } catch (e: any) {
+      lastError = e;
+      
+      // Retry on AccessDenied errors due to eventual consistency in AWS IAM.
+      // Newly created roles and policies may take time to propagate across regions.
+      if (e.name === 'AccessDenied') {
+        await new Promise(resolve => setTimeout(resolve, 5000)); // Wait 5 seconds
+        continue;
+      }
+      
+      // For other errors, throw immediately
+      throw e;
+    }
+  }
+
+  throw lastError;
 }
 
 main().catch((e) => {