merge additional configs with remote configs

Signed-off-by: Oleg S <97077423+RobotSail@users.noreply.github.com>
This commit is contained in:
Oleg S
2023-03-10 09:59:10 -05:00
parent 3ca229276d
commit ffbfcd1ab7
2 changed files with 8 additions and 5 deletions
-1
View File
@@ -1,7 +1,6 @@
---
'@backstage/backend-app-api': minor
'@backstage/backend-common': minor
'@backstage/config-loader': minor
---
Allow an additionalConfig to be provided to loadBackendConfig that fetches config values during runtime.
@@ -94,8 +94,11 @@ export async function loadBackendConfig(options: {
console.info(
`Reloaded config from ${newConfigs.map(c => c.context).join(', ')}`,
);
config.setConfig(ConfigReader.fromConfigs(newConfigs));
const configsToMerge = [...newConfigs];
if (options.additionalConfigs) {
configsToMerge.push(...options.additionalConfigs);
}
config.setConfig(ConfigReader.fromConfigs(configsToMerge));
},
stopSignal: new Promise(resolve => {
if (currentCancelFunc) {
@@ -115,10 +118,11 @@ export async function loadBackendConfig(options: {
`Loaded config from ${appConfigs.map(c => c.context).join(', ')}`,
);
const finalAppConfigs = [...appConfigs];
if (options.additionalConfigs) {
appConfigs.push(...options.additionalConfigs);
finalAppConfigs.push(...options.additionalConfigs);
}
config.setConfig(ConfigReader.fromConfigs(appConfigs));
config.setConfig(ConfigReader.fromConfigs(finalAppConfigs));
return { config };
}