Merge pull request #8406 from prkeshri/7340-remote-config-fix

7340 remote config fix

packages/backend-common/api-report.md

@@ -21,6 +21,7 @@ import { GitLabIntegration } from '@backstage/integration';
 import { isChildPath } from '@backstage/cli-common';
 import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
+import { LoadConfigOptionsRemote } from '@backstage/config-loader';
 import { Logger as Logger_2 } from 'winston';
 import { MergeResult } from 'isomorphic-git';
 import { PushResult } from 'isomorphic-git';
@@ -338,6 +339,7 @@ export function isDatabaseConflictError(e: unknown): boolean;
 // @public
 export function loadBackendConfig(options: {
   logger: Logger_2;
+  remote?: LoadConfigOptionsRemote;
   argv: string[];
 }): Promise<Config>;
 

packages/backend-common/src/config.ts

@@ -23,6 +23,7 @@ import {
   loadConfig,
   ConfigSchema,
   ConfigTarget,
+  LoadConfigOptionsRemote,
 } from '@backstage/config-loader';
 import { AppConfig, Config, ConfigReader } from '@backstage/config';
 import { JsonValue } from '@backstage/types';
@@ -178,6 +179,7 @@ let currentCancelFunc: () => void;
 export async function loadBackendConfig(options: {
   logger: Logger;
   // process.argv or any other overrides
+  remote?: LoadConfigOptionsRemote;
   argv: string[];
 }): Promise<Config> {
   const args = parseArgs(options.argv);
@@ -203,6 +205,7 @@ export async function loadBackendConfig(options: {
   const { appConfigs } = await loadConfig({
     configRoot: paths.targetRoot,
     configTargets: configTargets,
+    remote: options.remote,
     watch: {
       onChange(newConfigs) {
         options.logger.info(

packages/backend/src/index.ts

@@ -89,6 +89,7 @@ async function main() {
     argv: process.argv,
     logger,
   });
+
   const createEnv = makeCreateEnv(config);
 
   const healthcheckEnv = useHotMemoize(module, () => createEnv('healthcheck'));

packages/config-loader/src/loader.ts

@@ -45,7 +45,7 @@ export type LoadConfigOptionsWatch = {
 
 export type LoadConfigOptionsRemote = {
   /**
-   * An optional remote config reloading period, in seconds
+   * A remote config reloading period, in seconds
    */
   reloadIntervalSeconds: number;
 };
@@ -114,8 +114,16 @@ export async function loadConfig(
     .filter((e): e is { url: string } => e.hasOwnProperty('url'))
     .map(configTarget => configTarget.url);
 
-  if (remote === undefined && configUrls.length > 0) {
-    throw new Error(`Remote config detected but this feature is turned off`);
+  if (remote === undefined) {
+    if (configUrls.length > 0) {
+      throw new Error(
+        `Please make sure you are passing the remote option when loading remote configurations. See https://backstage.io/docs/conf/writing#configuration-files for detailed info.`,
+      );
+    }
+  } else if (remote.reloadIntervalSeconds <= 0) {
+    throw new Error(
+      `Remote config must be contain a non zero reloadIntervalSeconds: <seconds> value`,
+    );
   }
 
   // If no paths are provided, we default to reading