Skip to content

fix(core): Could not fetch endpoints #6418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpinkney-aws merged 1 commit into from
Jan 23, 2025
Merged

fix(core): Could not fetch endpoints #6418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/core/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@ export function registerGenericCommands(extensionContext: vscode.ExtensionContex
* https://docs.aws.amazon.com/general/latest/gr/rande.html
*/
export function makeEndpointsProvider() {
let localManifestFetcher: ResourceFetcher
let remoteManifestFetcher: ResourceFetcher
let localManifestFetcher: ResourceFetcher<string>
let remoteManifestFetcher: ResourceFetcher<Response>
if (isWeb()) {
localManifestFetcher = { get: async () => JSON.stringify(endpoints) }
// Cannot use HttpResourceFetcher due to web mode breaking on import
remoteManifestFetcher = { get: async () => (await fetch(endpointsFileUrl)).text() }
remoteManifestFetcher = { get: async () => await fetch(endpointsFileUrl) }
} else {
localManifestFetcher = new FileResourceFetcher(globals.manifestPaths.endpoints)
// HACK: HttpResourceFetcher breaks web mode when imported, so we use webpack.IgnorePlugin()
Expand Down
7 changes: 5 additions & 2 deletions packages/core/src/shared/regions/regionProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,11 @@ export class RegionProvider {
}
}

export async function getEndpointsFromFetcher(fetcher: ResourceFetcher): Promise<Endpoints> {
const endpointsJson = await fetcher.get()
export async function getEndpointsFromFetcher(
fetcher: ResourceFetcher<string> | ResourceFetcher<Response>
): Promise<Endpoints> {
const contents = await fetcher.get()
const endpointsJson = typeof contents === 'string' ? contents : await contents?.text()
if (!endpointsJson) {
throw new Error('Failed to get resource')
}
Expand Down
Loading