From a2a391283441c057ec68288ca45428773b635998 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 1 Jul 2021 14:00:53 +0200 Subject: [PATCH] backend-common: smol tweak + lint fix Co-authored-by: Johan Haals Signed-off-by: Patrik Oldsberg --- packages/backend-common/src/reading/GithubUrlReader.ts | 5 +---- .../backend-common/src/reading/GitlabUrlReader.test.ts | 2 +- packages/backend-common/src/reading/GitlabUrlReader.ts | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/backend-common/src/reading/GithubUrlReader.ts b/packages/backend-common/src/reading/GithubUrlReader.ts index 946d863154..bccddc6838 100644 --- a/packages/backend-common/src/reading/GithubUrlReader.ts +++ b/packages/backend-common/src/reading/GithubUrlReader.ts @@ -109,12 +109,9 @@ export class GithubUrlReader implements UrlReader { } if (response.ok) { - const etag = response.headers.get('ETag') - ? response.headers.get('ETag')! - : undefined; return { buffer: async () => Buffer.from(await response.text()), - etag, + etag: response.headers.get('ETag') ?? undefined, }; } diff --git a/packages/backend-common/src/reading/GitlabUrlReader.test.ts b/packages/backend-common/src/reading/GitlabUrlReader.test.ts index a2f873c580..945444d8ed 100644 --- a/packages/backend-common/src/reading/GitlabUrlReader.test.ts +++ b/packages/backend-common/src/reading/GitlabUrlReader.test.ts @@ -213,7 +213,7 @@ describe('GitlabUrlReader', () => { rest.get('*/api/v4/projects/:name', (_, res, ctx) => res(ctx.status(200), ctx.json({ id: 12345 })), ), - rest.get('*', (req, res, ctx) => { + rest.get('*', (_req, res, ctx) => { return res(ctx.status(200), ctx.set('ETag', '999'), ctx.body('foo')); }), ); diff --git a/packages/backend-common/src/reading/GitlabUrlReader.ts b/packages/backend-common/src/reading/GitlabUrlReader.ts index 3fd13e324c..6c272471e2 100644 --- a/packages/backend-common/src/reading/GitlabUrlReader.ts +++ b/packages/backend-common/src/reading/GitlabUrlReader.ts @@ -83,10 +83,10 @@ export class GitlabUrlReader implements UrlReader { } if (response.ok) { - const etag = response.headers.get('ETag') - ? response.headers.get('ETag')! - : undefined; - return { buffer: async () => Buffer.from(await response.text()), etag }; + return { + buffer: async () => Buffer.from(await response.text()), + etag: response.headers.get('ETag') ?? undefined, + }; } const message = `${url} could not be read as ${builtUrl}, ${response.status} ${response.statusText}`;