From fbabef096f95c50f03c04f0027d0175a477d631c Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 31 Mar 2023 11:11:16 +0200 Subject: [PATCH] config-loader: make RemoteConfigSource use node-fetch Signed-off-by: Patrik Oldsberg --- .../src/sources/RemoteConfigSource.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/config-loader/src/sources/RemoteConfigSource.ts b/packages/config-loader/src/sources/RemoteConfigSource.ts index 3e7da73248..276c140340 100644 --- a/packages/config-loader/src/sources/RemoteConfigSource.ts +++ b/packages/config-loader/src/sources/RemoteConfigSource.ts @@ -14,20 +14,21 @@ * limitations under the License. */ -import { - AsyncConfigSourceIterator, - ConfigSource, - ReadConfigDataOptions, -} from './types'; -import isEqual from 'lodash/isEqual'; -import yaml from 'yaml'; import { ResponseError } from '@backstage/errors'; import { JsonObject } from '@backstage/types'; +import isEqual from 'lodash/isEqual'; +import fetch from 'node-fetch'; +import yaml from 'yaml'; import { ConfigTransformer, createConfigTransformer, } from '../lib/transform/apply'; import { EnvFunc } from '../lib/transform/types'; +import { + AsyncConfigSourceIterator, + ConfigSource, + ReadConfigDataOptions, +} from './types'; const DEFAULT_RELOAD_INTERVAL_SECONDS = 60; @@ -90,7 +91,9 @@ export class RemoteConfigSource implements ConfigSource { } async #load(signal?: AbortSignal): Promise { - const res = await fetch(this.#url, { signal }); + const res = await fetch(this.#url, { + signal: signal as import('node-fetch').RequestInit['signal'], + }); if (!res.ok) { throw ResponseError.fromResponse(res); }