merge: bring in HttpResourceFetcher changes

Author: Hweinstock

.changes/next-release/Bug Fix-77137e24-593d-4859-a15f-e029edf843a7.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Resource Explorer: S3 tree view now shows bucket contents correctly, even when restricted to root prefix."
+}

packages/core/src/shared/clients/s3Client.ts

@@ -19,6 +19,7 @@ import { toStream } from '../utilities/collectionUtils'
 
 export const DEFAULT_MAX_KEYS = 300 // eslint-disable-line @typescript-eslint/naming-convention
 export const DEFAULT_DELIMITER = '/' // eslint-disable-line @typescript-eslint/naming-convention
+export const defaultPrefix = ''
 
 export type Bucket = InterfaceNoSymbol<DefaultBucket>
 export type Folder = InterfaceNoSymbol<DefaultFolder>
@@ -460,7 +461,13 @@ export class DefaultS3Client {
                 Bucket: bucket.name,
                 Delimiter: DEFAULT_DELIMITER,
                 MaxKeys: request.maxResults ?? DEFAULT_MAX_KEYS,
-                Prefix: request.folderPath,
+                /**
+                 * Set '' as the default prefix to ensure that the bucket's content will be displayed
+                 * when the user has at least list access to the root of the bucket.
+                 * https://github.com/aws/aws-toolkit-vscode/issues/4643
+                 * @default ''
+                 */
+                Prefix: request.folderPath ?? defaultPrefix,
                 ContinuationToken: request.continuationToken,
             })
             .promise()

packages/core/src/shared/lsp/lspResolver.ts

@@ -12,8 +12,8 @@ import AdmZip from 'adm-zip'
 import { TargetContent, logger, LspResult, LspVersion, Manifest } from './types'
 import { getApplicationSupportFolder } from '../vscode/env'
 import { createHash } from '../crypto'
-import request from '../request'
 import { lspSetupStage, StageResolver, tryStageResolvers } from './utils/stage'
+import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
 
 export class LanguageServerResolver {
     constructor(
@@ -194,14 +194,14 @@ export class LanguageServerResolver {
 
         const fetchTasks = contents.map(async (content) => {
             return {
-                res: await request.fetch('GET', content.url).response,
+                res: await new HttpResourceFetcher(content.url, { showUrl: true }).get(),
                 hash: content.hashes[0],
                 filename: content.filename,
             }
         })
         const fetchResults = await Promise.all(fetchTasks)
         const verifyTasks = fetchResults.flatMap(async (fetchResult) => {
-            if (!fetchResult.res.ok || !fetchResult.res.body) {
+            if (!(fetchResult.res && fetchResult.res.ok && fetchResult.res.body)) {
                 return []
             }
 

packages/core/src/shared/lsp/manifestResolver.ts

@@ -5,11 +5,11 @@
 
 import { getLogger } from '../logger/logger'
 import { ToolkitError } from '../errors'
-import { RetryableResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
 import { Timeout } from '../utilities/timeoutUtils'
 import globals from '../extensionGlobals'
 import { Manifest } from './types'
 import { StageResolver, tryStageResolvers } from './utils/stage'
+import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
 
 const logger = getLogger('lsp')
 
@@ -54,14 +54,11 @@ export class ManifestResolver {
     }
 
     private async fetchRemoteManifest(): Promise<Manifest> {
-        const resourceFetcher = new RetryableResourceFetcher({
-            resource: this.manifestURL,
-            params: {
-                timeout: new Timeout(manifestTimeoutMs),
-            },
-        })
+        const resp = await new HttpResourceFetcher(this.manifestURL, {
+            showUrl: true,
+            timeout: new Timeout(manifestTimeoutMs),
+        }).getNewETagContent(this.getEtag())
 
-        const resp = await resourceFetcher.getNewETagContent(this.getEtag())
         if (!resp.content) {
             throw new ToolkitError('New content was not downloaded; fallback to the locally stored manifest')
         }

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

@@ -134,51 +134,6 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
     }
 }
 
-export class RetryableResourceFetcher extends HttpResourceFetcher {
-    private readonly requestTimeoutMs: number
-    private readonly retryIntervalMs: number
-    private readonly resource: string
-
-    constructor({
-        resource,
-        params: { retryNumber = 5, retryIntervalMs = 3000, showUrl = true, timeout = new Timeout(5000) },
-    }: {
-        resource: string
-        params: {
-            retryNumber?: number
-            retryIntervalMs?: number
-            showUrl?: boolean
-            timeout?: Timeout
-        }
-    }) {
-        super(resource, {
-            showUrl,
-            timeout,
-        })
-        this.requestTimeoutMs = retryNumber * retryIntervalMs
-        this.retryIntervalMs = retryIntervalMs
-        this.resource = resource
-    }
-
-    fetch(versionTag?: string) {
-        return waitUntil(
-            async () => {
-                try {
-                    return await this.getNewETagContent(versionTag)
-                } catch (err) {
-                    getLogger('lsp').error('Failed to fetch at endpoint: %s, err: %s', this.resource, err)
-                    throw err
-                }
-            },
-            {
-                timeout: this.requestTimeoutMs,
-                interval: this.retryIntervalMs,
-                retryOnFail: true,
-            }
-        )
-    }
-}
-
 /**
  * Retrieves JSON property value from a remote resource
  * @param property property to retrieve

packages/webpack.web.config.js

@@ -41,7 +41,7 @@ module.exports = (env, argv) => {
              * environments. The following allows compilation to pass in Web mode by never bundling the module in the final output for web mode.
              */
             new webpack.IgnorePlugin({
-                resourceRegExp: /httpResourceFetcher/, // matches the path in the require() statement
+                resourceRegExp: /node\/httpResourceFetcher/, // matches the path in the require() statement
             }),
             /**
              * HACK: the ps-list module breaks Web mode if imported, BUT we still dynamically import this module for non web mode