From 7c116bcac7fcb93f86c381ac744fe694a81db03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Fri, 12 May 2023 10:36:20 +0200 Subject: [PATCH] await response errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/eleven-taxis-notice.md | 7 +++++++ packages/config-loader/src/sources/RemoteConfigSource.ts | 2 +- .../src/providers/cloudflare-access/provider.ts | 2 +- .../src/actions/confluence/helpers.ts | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .changeset/eleven-taxis-notice.md diff --git a/.changeset/eleven-taxis-notice.md b/.changeset/eleven-taxis-notice.md new file mode 100644 index 0000000000..88a25991fa --- /dev/null +++ b/.changeset/eleven-taxis-notice.md @@ -0,0 +1,7 @@ +--- +'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch +'@backstage/config-loader': patch +'@backstage/plugin-auth-backend': patch +--- + +Fixed the way that some request errors are thrown diff --git a/packages/config-loader/src/sources/RemoteConfigSource.ts b/packages/config-loader/src/sources/RemoteConfigSource.ts index ff75060f56..3a8f6bf812 100644 --- a/packages/config-loader/src/sources/RemoteConfigSource.ts +++ b/packages/config-loader/src/sources/RemoteConfigSource.ts @@ -149,7 +149,7 @@ export class RemoteConfigSource implements ConfigSource { signal: signal as import('node-fetch').RequestInit['signal'], }); if (!res.ok) { - throw ResponseError.fromResponse(res); + throw await ResponseError.fromResponse(res); } const content = await res.text(); diff --git a/plugins/auth-backend/src/providers/cloudflare-access/provider.ts b/plugins/auth-backend/src/providers/cloudflare-access/provider.ts index 0d8f736550..6313276508 100644 --- a/plugins/auth-backend/src/providers/cloudflare-access/provider.ts +++ b/plugins/auth-backend/src/providers/cloudflare-access/provider.ts @@ -227,7 +227,7 @@ export class CloudflareAccessAuthProvider implements AuthProviderRouteHandlers { { headers }, ); if (!res.ok) { - throw ResponseError.fromResponse(res); + throw await ResponseError.fromResponse(res); } const cfIdentity = await res.json(); return cfIdentity as unknown as CloudflareAccessIdentityProfile; diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts index 58f84a8747..c741f6f6c0 100644 --- a/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts +++ b/plugins/scaffolder-backend-module-confluence-to-markdown/src/actions/confluence/helpers.ts @@ -88,7 +88,7 @@ export const getAndWriteAttachments = async ( }, }); if (!res.ok) { - throw ResponseError.fromResponse(res); + throw await ResponseError.fromResponse(res); } else if (res.body !== null) { fs.openSync(`${workspace}/${mkdocsDir}docs/img/${downloadTitle}`, 'w'); const writeStream = fs.createWriteStream(