From 22ca64f117c29a50301ca7c56436720c2c10b1db Mon Sep 17 00:00:00 2001
From: Phil Kuang <pkuang@factset.com>
Date: Thu, 19 Oct 2023 12:02:23 -0400
Subject: [PATCH] fix(configLoader): properly resolve targets into absolute
 paths

Signed-off-by: Phil Kuang <pkuang@factset.com>
---
 .changeset/chatty-cobras-cheer.md                    |  5 +++++
 .../config-loader/src/sources/ConfigSources.test.ts  | 12 ++++++++++--
 packages/config-loader/src/sources/ConfigSources.ts  |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/chatty-cobras-cheer.md

diff --git a/.changeset/chatty-cobras-cheer.md b/.changeset/chatty-cobras-cheer.md
new file mode 100644
index 0000000000..c8203e58c0
--- /dev/null
+++ b/.changeset/chatty-cobras-cheer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/config-loader': patch
+---
+
+Correctly resolve config targets into absolute paths
diff --git a/packages/config-loader/src/sources/ConfigSources.test.ts b/packages/config-loader/src/sources/ConfigSources.test.ts
index 43feb3ca27..f095bbec42 100644
--- a/packages/config-loader/src/sources/ConfigSources.test.ts
+++ b/packages/config-loader/src/sources/ConfigSources.test.ts
@@ -95,6 +95,14 @@ describe('ConfigSources', () => {
       ),
     ).toEqual([{ name: 'FileConfigSource', path: '/config.yaml' }]);
 
+    expect(
+      mergeSources(
+        ConfigSources.defaultForTargets({
+          targets: [{ type: 'path', target: 'config.yaml' }],
+        }),
+      ),
+    ).toEqual([{ name: 'FileConfigSource', path: resolvePath('config.yaml') }]);
+
     const subFunc = async () => undefined;
     expect(
       mergeSources(
@@ -172,8 +180,8 @@ describe('ConfigSources', () => {
         }),
       ),
     ).toEqual([
-      { name: 'FileConfigSource', path: 'a.yaml' },
-      { name: 'FileConfigSource', path: 'b.yaml' },
+      { name: 'FileConfigSource', path: resolvePath('a.yaml') },
+      { name: 'FileConfigSource', path: resolvePath('b.yaml') },
       { name: 'EnvConfigSource', env: { HOME: '/' } },
     ]);
   });
diff --git a/packages/config-loader/src/sources/ConfigSources.ts b/packages/config-loader/src/sources/ConfigSources.ts
index 43123f87ea..03fc6d83d6 100644
--- a/packages/config-loader/src/sources/ConfigSources.ts
+++ b/packages/config-loader/src/sources/ConfigSources.ts
@@ -161,7 +161,7 @@ export class ConfigSources {
       }
       return FileConfigSource.create({
         watch: options.watch,
-        path: arg.target,
+        path: resolvePath(arg.target),
         substitutionFunc: options.substitutionFunc,
       });
     });