From d124ec149ffa852ad1c2fc6eef9107bad6efe31c Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Fri, 19 Apr 2024 10:17:50 -0600
Subject: [PATCH] Retain and log stacktrace for submission errors

---
 sources/src/dependency-graph.ts | 7 +++----
 sources/src/errors.ts           | 8 +++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sources/src/dependency-graph.ts b/sources/src/dependency-graph.ts
index 480fc3ef..a658f0c3 100644
--- a/sources/src/dependency-graph.ts
+++ b/sources/src/dependency-graph.ts
@@ -124,17 +124,16 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
             await submitDependencyGraphFile(dependencyGraphFile)
         } catch (error) {
             if (error instanceof RequestError) {
-                throw new Error(translateErrorMessage(dependencyGraphFile, error))
-            } else {
-                throw error
+                error.message = translateErrorMessage(dependencyGraphFile, error)
             }
+            throw error
         }
     }
 }
 
 function translateErrorMessage(jsonFile: string, error: RequestError): string {
     const relativeJsonFile = getRelativePathFromWorkspace(jsonFile)
-    const mainWarning = `Dependency submission failed for ${relativeJsonFile}.\n${String(error)}`
+    const mainWarning = `Dependency submission failed for ${relativeJsonFile}.\n${error.message}`
     if (error.message === 'Resource not accessible by integration') {
         return `${mainWarning}
 Please ensure that the 'contents: write' permission is available for the workflow job.
diff --git a/sources/src/errors.ts b/sources/src/errors.ts
index f3c4cb5d..a9232d31 100644
--- a/sources/src/errors.ts
+++ b/sources/src/errors.ts
@@ -22,7 +22,10 @@ export function handleMainActionError(error: unknown): void {
             }
         }
     } else if (error instanceof JobFailure) {
-        core.setFailed(String(error)) // No stack trace for JobFailure: these are known errors
+        core.setFailed(String(error))
+        if (error.stack) {
+            core.info(error.stack)
+        }
     } else {
         core.setFailed(String(error))
         if (error instanceof Error && error.stack) {
@@ -34,6 +37,9 @@ export function handleMainActionError(error: unknown): void {
 export function handlePostActionError(error: unknown): void {
     if (error instanceof JobFailure) {
         core.setFailed(String(error))
+        if (error.stack) {
+            core.info(error.stack)
+        }
     } else {
         core.warning(`Unhandled error in Gradle post-action - job will continue: ${error}`)
         if (error instanceof Error && error.stack) {