From a1980784de3397bb0ae047a357871ec28d15395a Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Tue, 19 Dec 2023 13:55:20 -0700
Subject: [PATCH] Improve reporting for dependency-graph failure

The previous message was assuming a permissions issue, and was not
including the underlying error message in the response.
---
 src/dependency-graph.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/dependency-graph.ts b/src/dependency-graph.ts
index fda1aa4..4f61881 100644
--- a/src/dependency-graph.ts
+++ b/src/dependency-graph.ts
@@ -78,12 +78,7 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
             await submitDependencyGraphFile(jsonFile)
         } catch (error) {
             if (error instanceof RequestError) {
-                const relativeJsonFile = getRelativePathFromWorkspace(jsonFile)
-                core.warning(
-                    `Failed to submit dependency graph ${relativeJsonFile}.\n` +
-                        "Please ensure that the 'contents: write' permission is available for the workflow job.\n" +
-                        "Note that this permission is never available for a 'pull_request' trigger from a repository fork."
-                )
+                core.warning(buildWarningMessage(jsonFile, error))
             } else {
                 throw error
             }
@@ -91,6 +86,18 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
     }
 }
 
+function buildWarningMessage(jsonFile: string, error: RequestError): string {
+    const relativeJsonFile = getRelativePathFromWorkspace(jsonFile)
+    const mainWarning = `Failed to submit dependency graph ${relativeJsonFile}.\n${String(error)}`
+    if (error.message === 'Resource not accessible by integration') {
+        return `${mainWarning}
+Please ensure that the 'contents: write' permission is available for the workflow job.
+Note that this permission is never available for a 'pull_request' trigger from a repository fork.
+        `
+    }
+    return mainWarning
+}
+
 async function submitDependencyGraphFile(jsonFile: string): Promise<void> {
     const octokit = getOctokit()
     const jsonContent = fs.readFileSync(jsonFile, 'utf8')