Better warning

gradle · Dec 19, 2023 · c9bc776 · c9bc776
1 parent 58d37ce
commit c9bc776
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 19 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
@@ -93696,11 +93696,10 @@ function submitDependencyGraphs(dependencyGraphFiles) {
             }
             catch (error) {
                 if (error instanceof request_error_1.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.info(JSON.stringify(error));
+                    core.info(`error.name = ${error.name}`);
+                    core.info(`error.message = ${error.message}`);
+                    core.info(`error.response = ${error.response}`);
+                    core.warning(buildWarningMessage(jsonFile, error));
                 }
                 else {
                     throw error;
@@ -93709,6 +93708,14 @@ function submitDependencyGraphs(dependencyGraphFiles) {
         }
     });
 }
+function buildWarningMessage(jsonFile, error) {
+    const relativeJsonFile = getRelativePathFromWorkspace(jsonFile);
+    const mainWarning = `Failed to submit dependency graph ${relativeJsonFile}.\n${error.message}`;
+    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.
+    `;
+}
 function submitDependencyGraphFile(jsonFile) {
     return __awaiter(this, void 0, void 0, function* () {
         const octokit = getOctokit();

diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
@@ -93696,11 +93696,10 @@ function submitDependencyGraphs(dependencyGraphFiles) {
             }
             catch (error) {
                 if (error instanceof request_error_1.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.info(JSON.stringify(error));
+                    core.info(`error.name = ${error.name}`);
+                    core.info(`error.message = ${error.message}`);
+                    core.info(`error.response = ${error.response}`);
+                    core.warning(buildWarningMessage(jsonFile, error));
                 }
                 else {
                     throw error;
@@ -93709,6 +93708,14 @@ function submitDependencyGraphs(dependencyGraphFiles) {
         }
     });
 }
+function buildWarningMessage(jsonFile, error) {
+    const relativeJsonFile = getRelativePathFromWorkspace(jsonFile);
+    const mainWarning = `Failed to submit dependency graph ${relativeJsonFile}.\n${error.message}`;
+    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.
+    `;
+}
 function submitDependencyGraphFile(jsonFile) {
     return __awaiter(this, void 0, void 0, function* () {
         const octokit = getOctokit();

diff --git a/dist/post/index.js.map b/dist/post/index.js.map
diff --git a/src/dependency-graph.ts b/src/dependency-graph.ts
@@ -78,20 +78,27 @@ 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.info(JSON.stringify(error))
+                core.info(`error.name = ${error.name}`)
+                core.info(`error.message = ${error.message}`)
+                core.info(`error.response = ${error.response}`)
+
+                core.warning(buildWarningMessage(jsonFile, error))
             } else {
                 throw error
             }
         }
     }
 }
 
+function buildWarningMessage(jsonFile: string, error: RequestError): string {
+    const relativeJsonFile = getRelativePathFromWorkspace(jsonFile)
+    const mainWarning = `Failed to submit dependency graph ${relativeJsonFile}.\n${error.message}`
+    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.
+    `
+}
+
 async function submitDependencyGraphFile(jsonFile: string): Promise<void> {
     const octokit = getOctokit()
     const jsonContent = fs.readFileSync(jsonFile, 'utf8')