From 39dddb8ae7ff59c7416189aac27a8980abd89bd0 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Mon, 5 May 2025 08:57:57 -0600
Subject: [PATCH] Remove direct use of octokit/request-error (#632)

---
 sources/package-lock.json       | 1 -
 sources/package.json            | 1 -
 sources/src/dependency-graph.ts | 5 ++---
 sources/src/job-summary.ts      | 5 ++---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sources/package-lock.json b/sources/package-lock.json
index 9ea82d4a..1704311f 100644
--- a/sources/package-lock.json
+++ b/sources/package-lock.json
@@ -18,7 +18,6 @@
         "@actions/glob": "0.5.0",
         "@actions/http-client": "2.2.3",
         "@actions/tool-cache": "2.0.2",
-        "@octokit/request-error": "5.1.1",
         "@octokit/webhooks-types": "7.6.1",
         "cheerio": "1.0.0",
         "semver": "7.7.1",
diff --git a/sources/package.json b/sources/package.json
index 2c775319..e4cc19a3 100644
--- a/sources/package.json
+++ b/sources/package.json
@@ -40,7 +40,6 @@
     "@actions/glob": "0.5.0",
     "@actions/http-client": "2.2.3",
     "@actions/tool-cache": "2.0.2",
-    "@octokit/request-error": "5.1.1",
     "@octokit/webhooks-types": "7.6.1",
     "cheerio": "1.0.0",
     "semver": "7.7.1",
diff --git a/sources/src/dependency-graph.ts b/sources/src/dependency-graph.ts
index fc9bceff..464f186c 100644
--- a/sources/src/dependency-graph.ts
+++ b/sources/src/dependency-graph.ts
@@ -3,7 +3,6 @@ import * as github from '@actions/github'
 import * as glob from '@actions/glob'
 import {DefaultArtifactClient} from '@actions/artifact'
 import {GitHub} from '@actions/github/lib/utils'
-import {RequestError} from '@octokit/request-error'
 import type {PullRequestEvent} from '@octokit/webhooks-types'
 
 import * as path from 'path'
@@ -191,7 +190,7 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
         try {
             await submitDependencyGraphFile(dependencyGraphFile)
         } catch (error) {
-            if (error instanceof RequestError) {
+            if (error instanceof Error && error.name === 'HttpError') {
                 error.message = translateErrorMessage(dependencyGraphFile, error)
             }
             throw error
@@ -199,7 +198,7 @@ async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<v
     }
 }
 
-function translateErrorMessage(jsonFile: string, error: RequestError): string {
+function translateErrorMessage(jsonFile: string, error: Error): string {
     const relativeJsonFile = getRelativePathFromWorkspace(jsonFile)
     const mainWarning = `Dependency submission failed for ${relativeJsonFile}.\n${error.message}`
     if (error.message === 'Resource not accessible by integration') {
diff --git a/sources/src/job-summary.ts b/sources/src/job-summary.ts
index d87cf6e0..e65fd419 100644
--- a/sources/src/job-summary.ts
+++ b/sources/src/job-summary.ts
@@ -1,6 +1,5 @@
 import * as core from '@actions/core'
 import * as github from '@actions/github'
-import {RequestError} from '@octokit/request-error'
 
 import {BuildResults, BuildResult} from './build-results'
 import {SummaryConfig, getActionId, getGithubToken} from './configuration'
@@ -66,7 +65,7 @@ ${jobSummary}`
             body: prComment
         })
     } catch (error) {
-        if (error instanceof RequestError) {
+        if (error instanceof Error && error.name === 'HttpError') {
             core.warning(buildWarningMessage(error))
         } else {
             throw error
@@ -74,7 +73,7 @@ ${jobSummary}`
     }
 }
 
-function buildWarningMessage(error: RequestError): string {
+function buildWarningMessage(error: Error): string {
     const mainWarning = `Failed to generate PR comment.\n${String(error)}`
     if (error.message === 'Resource not accessible by integration') {
         return `${mainWarning}