From 3ff1f67da8c3ad02767603693332f2d44e96cb5d Mon Sep 17 00:00:00 2001
From: Ulrik Andersen <ulrik@shape.dk>
Date: Thu, 6 Feb 2025 08:57:07 +0100
Subject: [PATCH 1/2] Include part of remote spec content in error

Makes it easier to debug why loading a remote spec fails
---
 src/app/api/remotes/[encodedRemoteConfig]/route.ts | 2 +-
 src/common/utils/fileUtils.ts                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/api/remotes/[encodedRemoteConfig]/route.ts b/src/app/api/remotes/[encodedRemoteConfig]/route.ts
index 1b49e7e6..b79ffcd7 100644
--- a/src/app/api/remotes/[encodedRemoteConfig]/route.ts
+++ b/src/app/api/remotes/[encodedRemoteConfig]/route.ts
@@ -55,7 +55,7 @@ export async function GET(_req: NextRequest, { params }: { params: Promise<Remot
     } else if (error.name === ErrorName.TIMEOUT) {
       return makeAPIErrorResponse(408, "The operation timed out.")
     } else if (error.name === ErrorName.NOT_JSON_OR_YAML) {
-      return makeAPIErrorResponse(400, "Url does not point to a JSON or YAML file.")
+      return makeAPIErrorResponse(400, error.message)
     } else if (error.name === ErrorName.URL_MAY_NOT_INCLUDE_BASIC_AITH) {
       return makeAPIErrorResponse(400, "Url may not include basic auth.")
     } else {
diff --git a/src/common/utils/fileUtils.ts b/src/common/utils/fileUtils.ts
index acc3b062..383878da 100644
--- a/src/common/utils/fileUtils.ts
+++ b/src/common/utils/fileUtils.ts
@@ -66,7 +66,7 @@ export function checkIfJsonOrYaml(fileText: string) {
     try {
         parseYaml(fileText) // will also parse JSON as it is a subset of YAML
     } catch {
-        const error = new Error("File is not JSON or YAML")
+        const error = new Error("File is not JSON or YAML. Content: " + fileText.slice(0, 1000));
         error.name = ErrorName.NOT_JSON_OR_YAML
         throw error
     }

From 96ceb3e37191dcabe38c1536d4488ab56adf74bc Mon Sep 17 00:00:00 2001
From: Ulrik Andersen <ulrik@shape.dk>
Date: Thu, 6 Feb 2025 09:20:19 +0100
Subject: [PATCH 2/2] Include remote spec name in error

---
 src/features/projects/data/GitHubProjectDataSource.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/projects/data/GitHubProjectDataSource.ts b/src/features/projects/data/GitHubProjectDataSource.ts
index 943e99c0..dc6de577 100644
--- a/src/features/projects/data/GitHubProjectDataSource.ts
+++ b/src/features/projects/data/GitHubProjectDataSource.ts
@@ -242,7 +242,7 @@ export default class GitHubProjectDataSource implements IProjectDataSource {
         password: this.encryptionService.decrypt(projectConfigRemoteSpec.auth.encryptedPassword)
       }
     } catch (error) {
-      console.error(`Failed to decrypt remote specification auth for ${projectConfigRemoteSpec.url}. Perhaps a different public key was used?:`, error);
+      console.info(`Failed to decrypt remote specification auth for ${projectConfigRemoteSpec.name} (${projectConfigRemoteSpec.url}). Perhaps a different public key was used?:`, error);
       return undefined
     }
   }