Merge branch 'feature/amazonqLSP' into lsp/cleanup

Author: Hweinstock

packages/core/src/shared/extensions.ts

@@ -31,9 +31,7 @@ export const vscodeExtensionMinVersion = {
     remotessh: '0.74.0',
 }
 
-/**
- * Long-lived, extension-scoped, shared globals.
- */
+/** @deprecated Use `extensionGlobals.ts:globals` instead. */
 export interface ExtContext {
     extensionContext: vscode.ExtensionContext
     awsContext: AwsContext

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

@@ -135,7 +135,7 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
 }
 
 export class RetryableResourceFetcher extends HttpResourceFetcher {
-    private readonly retryNumber: number
+    private readonly requestTimeoutMs: number
     private readonly retryIntervalMs: number
     private readonly resource: string
 
@@ -155,13 +155,13 @@ export class RetryableResourceFetcher extends HttpResourceFetcher {
             showUrl,
             timeout,
         })
-        this.retryNumber = retryNumber
+        this.requestTimeoutMs = retryNumber * retryIntervalMs
         this.retryIntervalMs = retryIntervalMs
         this.resource = resource
     }
 
     fetch(versionTag?: string) {
-        return withRetries(
+        return waitUntil(
             async () => {
                 try {
                     return await this.getNewETagContent(versionTag)
@@ -171,8 +171,9 @@ export class RetryableResourceFetcher extends HttpResourceFetcher {
                 }
             },
             {
-                maxRetries: this.retryNumber,
-                delay: this.retryIntervalMs,
+                timeout: this.requestTimeoutMs,
+                interval: this.retryIntervalMs,
+                retryOnFail: true,
             }
         )
     }