use 3 retries

Author: David Hasani

packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts

@@ -112,16 +112,17 @@ export async function uploadArtifactToS3(
 
         let response = undefined
         /* The existing S3 client has built-in retries but it requires the bucket name, so until
-         * CreateUploadUrl can be modified to return the S3 bucket name, manually implement retries
+         * CreateUploadUrl can be modified to return the S3 bucket name, manually implement retries.
+         * Alternatively, when waitUntil supports a fixed number of retries and retriableCodes, use that.
          */
         const retriableCodes = [408, 429, 500, 502, 503, 504]
-        for (let i = 0; i < 3; i++) {
+        for (let i = 0; i < 4; i++) {
             try {
                 response = await request.fetch('PUT', resp.uploadUrl, {
                     body: buffer,
                     headers: getHeadersObj(sha256, resp.kmsKeyArn),
                 }).response
-                getLogger().info(`CodeTransformation: upload to S3 status on attempt ${i + 1}/3 = ${response.status}`)
+                getLogger().info(`CodeTransformation: upload to S3 status on attempt ${i + 1}/4 = ${response.status}`)
                 if (response.status === 200) {
                     break
                 }
@@ -130,13 +131,13 @@ export async function uploadArtifactToS3(
                 if (response && !retriableCodes.includes(response.status)) {
                     throw new Error(`Upload failed with status code = ${response.status}; did not automatically retry`)
                 }
-                if (i !== 2) {
+                if (i !== 3) {
                     await sleep(1000 * Math.pow(2, i))
                 }
             }
         }
         if (!response || response.status !== 200) {
-            const uploadFailedError = `Upload failed after up to 3 attempts with status code = ${response?.status ?? 'unavailable'}`
+            const uploadFailedError = `Upload failed after up to 4 attempts with status code = ${response?.status ?? 'unavailable'}`
             getLogger().error(`CodeTransformation: ${uploadFailedError}`)
             throw new Error(uploadFailedError)
         }

packages/core/src/test/codewhisperer/commands/transformByQ.test.ts

@@ -511,15 +511,15 @@ describe('transformByQ', function () {
         sinon.assert.calledTwice(fetchStub)
     })
 
-    it('should throw error after 3 failed upload attempts', async () => {
+    it('should throw error after 4 failed upload attempts', async () => {
         const failedResponse = {
             ok: false,
             status: 500,
             text: () => Promise.resolve('Internal Server Error'),
         }
         fetchStub.returns({ response: Promise.resolve(failedResponse) })
         const expectedMessage =
-            'The upload failed due to: Upload failed after up to 3 attempts with status code = 500. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail)'
+            'The upload failed due to: Upload failed after up to 4 attempts with status code = 500. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail)'
         await assert.rejects(
             uploadArtifactToS3(
                 'test.zip',