From 7c85fa3aa35e49a82ae9f7db826dacdbc255c556 Mon Sep 17 00:00:00 2001
From: Kiss Miklos <miklos@roadie.io>
Date: Tue, 5 Jul 2022 15:23:27 +0200
Subject: [PATCH] use absolute urls

Signed-off-by: Kiss Miklos <miklos@roadie.io>
---
 .../src/modules/core/FileReaderProcessor.test.ts     |  2 +-
 .../src/modules/core/FileReaderProcessor.ts          |  5 +++--
 .../src/modules/core/PlaceholderProcessor.test.ts    |  2 +-
 .../src/modules/core/PlaceholderProcessor.ts         | 12 +++++++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugins/catalog-backend/src/modules/core/FileReaderProcessor.test.ts b/plugins/catalog-backend/src/modules/core/FileReaderProcessor.test.ts
index 0c114f49a1..d726edc4db 100644
--- a/plugins/catalog-backend/src/modules/core/FileReaderProcessor.test.ts
+++ b/plugins/catalog-backend/src/modules/core/FileReaderProcessor.test.ts
@@ -89,7 +89,7 @@ describe('FileReaderProcessor', () => {
       type: 'file',
       target: expect.stringMatching(/^[^*]*$/),
     });
-    expect(emit.mock.calls[1][0].key).toContain('file:');
+    expect(emit.mock.calls[1][0].key).toContain('file://');
     expect(emit.mock.calls[1][0].key).toContain(
       'fileReaderProcessor/component.yaml',
     );
diff --git a/plugins/catalog-backend/src/modules/core/FileReaderProcessor.ts b/plugins/catalog-backend/src/modules/core/FileReaderProcessor.ts
index 59795589b2..188bfd0031 100644
--- a/plugins/catalog-backend/src/modules/core/FileReaderProcessor.ts
+++ b/plugins/catalog-backend/src/modules/core/FileReaderProcessor.ts
@@ -52,6 +52,7 @@ export class FileReaderProcessor implements CatalogProcessor {
       if (fileMatches.length > 0) {
         for (const fileMatch of fileMatches) {
           const data = await fs.readFile(fileMatch);
+          const normalizedFilePath = path.normalize(fileMatch);
 
           // The normalize converts to native slashes; the glob library returns
           // forward slashes even on windows
@@ -59,13 +60,13 @@ export class FileReaderProcessor implements CatalogProcessor {
             data: data,
             location: {
               type: LOCATION_TYPE,
-              target: path.normalize(fileMatch),
+              target: normalizedFilePath,
             },
           })) {
             emit(parseResult);
             emit(
               processingResult.refresh(
-                `${LOCATION_TYPE}:${path.normalize(fileMatch)}`,
+                `${LOCATION_TYPE}://${normalizedFilePath}`,
               ),
             );
           }
diff --git a/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts b/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts
index aa448dd955..02f30c9e69 100644
--- a/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts
+++ b/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts
@@ -385,7 +385,7 @@ describe('PlaceholderProcessor', () => {
     console.log(emitted);
     expect(emitted[0]).toEqual({
       type: 'refresh',
-      key: 'url:./path-to-file.json',
+      key: 'url:http://example.com/path-to-file.json',
     });
   });
 });
diff --git a/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.ts b/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.ts
index 8a1891fe0c..bcd474016b 100644
--- a/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.ts
+++ b/plugins/catalog-backend/src/modules/core/PlaceholderProcessor.ts
@@ -134,7 +134,17 @@ export class PlaceholderProcessor implements CatalogProcessor {
           base,
         });
 
-      emit(processingResult.refresh(`url:${resolverValue}`));
+      emit(
+        processingResult.refresh(
+          `url:${relativeUrl({
+            key: resolverKey,
+            value: resolverValue,
+            baseUrl: location.target,
+            read,
+            resolveUrl,
+          })}`,
+        ),
+      );
 
       return [
         await resolver({