Merge master into feature/sdkv3

Author: aws-toolkit-automation

packages/core/src/shared/request.ts

@@ -99,7 +99,11 @@ class FetchRequest {
     }
 
     async #throwIfBadResponse(request: RequestParams, response: Response, url: string) {
-        if (response.ok) {
+        /**
+         * response.ok only returns true for 200-299.
+         * We need to explicitly allow 304 since it means the cached version is still valid
+         */
+        if (response.ok || response.status === 304) {
             return
         }
 

packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts

@@ -39,9 +39,7 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
      */
     public get(): Promise<Response | undefined> {
         this.logger.verbose(`downloading: ${this.logText()}`)
-        return withRetries(() => this.downloadRequest(), {
-            maxRetries: this.params.retries ?? 1,
-        })
+        return this.downloadRequest()
     }
 
     /**
@@ -99,16 +97,23 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
     }
 
     private async getResponseFromGetRequest(timeout?: Timeout, headers?: RequestHeaders): Promise<Response> {
-        const req = request.fetch('GET', this.url, {
-            headers: this.buildRequestHeaders(headers),
-        })
-
-        const cancelListener = timeout?.token.onCancellationRequested((event) => {
-            this.logCancellation(event)
-            req.cancel()
-        })
-
-        return req.response.finally(() => cancelListener?.dispose())
+        return withRetries(
+            () => {
+                const req = request.fetch('GET', this.url, {
+                    headers: this.buildRequestHeaders(headers),
+                })
+
+                const cancelListener = timeout?.token.onCancellationRequested((event) => {
+                    this.logCancellation(event)
+                    req.cancel()
+                })
+
+                return req.response.finally(() => cancelListener?.dispose())
+            },
+            {
+                maxRetries: this.params.retries ?? 1,
+            }
+        )
     }
 
     private buildRequestHeaders(requestHeaders?: RequestHeaders): Headers {