From 34167270b3172371cca002766e2ffc043041b68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Mon, 17 Apr 2023 12:01:20 +0200 Subject: [PATCH] Ensure that additional configs passed to loadBackendConfig are properly taken into account MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/sour-cooks-repeat.md | 7 +++++++ packages/backend-common/api-report.md | 2 +- packages/backend-common/src/config.ts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .changeset/sour-cooks-repeat.md diff --git a/.changeset/sour-cooks-repeat.md b/.changeset/sour-cooks-repeat.md new file mode 100644 index 0000000000..017e3ebf2c --- /dev/null +++ b/.changeset/sour-cooks-repeat.md @@ -0,0 +1,7 @@ +--- +'@backstage/backend-common': patch +--- + +Renamed the `loadBackendConfig` option `additionalConfig` to `additionalConfigs` as an array, and ensured that they get passed on properly. + +This is technically breaking, but the [original addition](https://github.com/backstage/backstage/pull/16643) hasn't been released in mainline yet so we are taking this step now as a `patch` change. diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md index 99f4bfea71..640358664c 100644 --- a/packages/backend-common/api-report.md +++ b/packages/backend-common/api-report.md @@ -534,7 +534,7 @@ export const legacyPlugin: ( export function loadBackendConfig(options: { logger: LoggerService; remote?: LoadConfigOptionsRemote; - additionalConfig?: AppConfig; + additionalConfigs?: AppConfig[]; argv: string[]; }): Promise; diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts index cc824c47fd..53b438de5d 100644 --- a/packages/backend-common/src/config.ts +++ b/packages/backend-common/src/config.ts @@ -34,7 +34,7 @@ export async function loadBackendConfig(options: { logger: LoggerService; // process.argv or any other overrides remote?: LoadConfigOptionsRemote; - additionalConfig?: AppConfig; + additionalConfigs?: AppConfig[]; argv: string[]; }): Promise { const secretEnumerator = await createConfigSecretEnumerator({