chore(deps): update graphql dependency from merico-dev to merico-ai (#8699)

narrowizard · claude · web-flow · commit 80f9e2d16428 · 2026-02-09T13:37:00.000+08:00
* chore(deps): update graphql dependency from merico-dev to merico-ai

- Update github.com/merico-dev/graphql to github.com/merico-ai/graphql
- Update import paths across all files using the graphql package
- Update go.mod and go.sum with new dependency version

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;

* fix(github): fix ineffassign lint error in remote_api.go

Use named return values consistently with bare returns to avoid
variable shadowing of err in listGithubOwnerRepos.

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;

---------

Co-authored-by: Claude &lt;noreply@anthropic.com&gt;
diff --git a/backend/go.mod b/backend/go.mod
@@ -16,7 +16,6 @@ require (
 	github.com/lib/pq v1.10.2
 	github.com/libgit2/git2go/v33 v33.0.6
 	github.com/magiconair/properties v1.8.5
-	github.com/merico-dev/graphql v0.0.0-20240807070533-1cafa544cd5d
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/panjf2000/ants/v2 v2.4.6
 	github.com/robfig/cron/v3 v3.0.0
@@ -45,6 +44,7 @@ require (
 	github.com/chainguard-dev/git-urls v1.0.2
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/golang-jwt/jwt/v5 v5.0.0-rc.1
+	github.com/merico-ai/graphql v0.0.0-20260206020408-b7fd267bcfac
 	github.com/rogpeppe/go-internal v1.11.0
 	golang.org/x/mod v0.17.0
 )
diff --git a/backend/go.sum b/backend/go.sum
@@ -387,8 +387,8 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ=
 github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
-github.com/merico-dev/graphql v0.0.0-20240807070533-1cafa544cd5d h1:FpP+YRQudZtnrnIaFvVc87D/WVI7tWi0hBrnRCY8wmQ=
-github.com/merico-dev/graphql v0.0.0-20240807070533-1cafa544cd5d/go.mod h1:dcDqG8HXVtfEhTCipFMa0Q+RTKTtDKIO2vJt+JVzHEQ=
+github.com/merico-ai/graphql v0.0.0-20260206020408-b7fd267bcfac h1:J3wm8OohrRkYf/+Zy5GxqvhzcP2qHGJRduxTUUbBMdw=
+github.com/merico-ai/graphql v0.0.0-20260206020408-b7fd267bcfac/go.mod h1:4WSOgvd/Sv6eLKJE6fvrXlmxePBDGhbwRYKEBeqJr8g=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
diff --git a/backend/helpers/pluginhelper/api/graphql_async_client.go b/backend/helpers/pluginhelper/api/graphql_async_client.go
@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 // GraphqlAsyncClient send graphql one by one
diff --git a/backend/helpers/pluginhelper/api/graphql_collector.go b/backend/helpers/pluginhelper/api/graphql_collector.go
@@ -28,7 +28,7 @@ import (
 	"github.com/apache/incubator-devlake/core/dal"
 	"github.com/apache/incubator-devlake/core/errors"
 	plugin "github.com/apache/incubator-devlake/core/plugin"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 // CursorPager contains pagination information for a graphql request
diff --git a/backend/plugins/github/api/remote_api.go b/backend/plugins/github/api/remote_api.go
@@ -161,17 +161,18 @@ func listGithubOwnerRepos(
 
 	ownerType, ownerID, err := getOwnerInfo(apiClient, owner)
 	if err != nil {
-		return nil, nil, err
+		return
 	}
 
 	var reposBody *http.Response
+	var authUserID int
 	switch ownerType {
 	case "Organization":
 		reposBody, err = apiClient.Get(fmt.Sprintf("orgs/%s/repos", owner), query, nil)
 	case "User":
-		authUserID, err := getAuthenticatedUserID(apiClient)
+		authUserID, err = getAuthenticatedUserID(apiClient)
 		if err != nil {
-			return nil, nil, err
+			return
 		}
 		if authUserID == ownerID {
 			// Authenticated user's own account - includes private repos
@@ -185,7 +186,7 @@ func listGithubOwnerRepos(
 		reposBody, err = apiClient.Get(fmt.Sprintf("users/%s/repos", owner), query, nil)
 	}
 	if err != nil {
-		return nil, nil, err
+		return
 	}
 
 	var repos []repo
@@ -200,7 +201,7 @@ func listGithubOwnerRepos(
 			PerPage: page.PerPage,
 		}
 	}
-	return children, nextPage, nil
+	return
 }
 
 func listGithubAppInstalledRepos(
diff --git a/backend/plugins/github_graphql/impl/impl.go b/backend/plugins/github_graphql/impl/impl.go
@@ -38,7 +38,7 @@ import (
 	githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
 	"github.com/apache/incubator-devlake/plugins/github_graphql/model/migrationscripts"
 	"github.com/apache/incubator-devlake/plugins/github_graphql/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 	"golang.org/x/oauth2"
 )
 
diff --git a/backend/plugins/github_graphql/tasks/account_collector.go b/backend/plugins/github_graphql/tasks/account_collector.go
@@ -27,7 +27,7 @@ import (
 	helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	"github.com/apache/incubator-devlake/plugins/github/models"
 	githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 const RAW_ACCOUNTS_TABLE = "github_graphql_accounts"
diff --git a/backend/plugins/github_graphql/tasks/deployment_collector.go b/backend/plugins/github_graphql/tasks/deployment_collector.go
@@ -26,7 +26,7 @@ import (
 	"github.com/apache/incubator-devlake/core/plugin"
 	helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 var _ plugin.SubTaskEntryPoint = CollectDeployments
diff --git a/backend/plugins/github_graphql/tasks/issue_collector.go b/backend/plugins/github_graphql/tasks/issue_collector.go
@@ -30,7 +30,7 @@ import (
 	"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	"github.com/apache/incubator-devlake/plugins/github/models"
 	githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 const RAW_ISSUES_TABLE = "github_graphql_issues"
diff --git a/backend/plugins/github_graphql/tasks/job_collector.go b/backend/plugins/github_graphql/tasks/job_collector.go
@@ -29,7 +29,7 @@ import (
 	helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	"github.com/apache/incubator-devlake/plugins/github/models"
 	githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 const RAW_GRAPHQL_JOBS_TABLE = "github_graphql_jobs"
diff --git a/backend/plugins/github_graphql/tasks/pr_collector.go b/backend/plugins/github_graphql/tasks/pr_collector.go
@@ -29,7 +29,7 @@ import (
 	"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	"github.com/apache/incubator-devlake/plugins/github/models"
 	"github.com/apache/incubator-devlake/plugins/github/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 const RAW_PRS_TABLE = "github_graphql_prs"
diff --git a/backend/plugins/github_graphql/tasks/release_collector.go b/backend/plugins/github_graphql/tasks/release_collector.go
@@ -27,7 +27,7 @@ import (
 	"github.com/apache/incubator-devlake/core/utils"
 	helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"
-	"github.com/merico-dev/graphql"
+	"github.com/merico-ai/graphql"
 )
 
 const RAW_RELEASE_TABLE = "github_graphql_release"

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"sync"`
`28`	`28`	`"time"`
`29`	`29`
`30`		`- "github.com/merico-dev/graphql"`
	`30`	`+ "github.com/merico-ai/graphql"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// GraphqlAsyncClient send graphql one by one`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"github.com/apache/incubator-devlake/core/dal"`
`29`	`29`	`"github.com/apache/incubator-devlake/core/errors"`
`30`	`30`	`plugin "github.com/apache/incubator-devlake/core/plugin"`
`31`		`- "github.com/merico-dev/graphql"`
	`31`	`+ "github.com/merico-ai/graphql"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`// CursorPager contains pagination information for a graphql request`
Original file line number	Diff line number	Diff line change
`@@ -161,17 +161,18 @@ func listGithubOwnerRepos(`
`161`	`161`
`162`	`162`	`ownerType, ownerID, err := getOwnerInfo(apiClient, owner)`
`163`	`163`	`if err != nil {`
`164`		`- return nil, nil, err`
	`164`	`+ return`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`var reposBody *http.Response`
	`168`	`+ var authUserID int`
`168`	`169`	`switch ownerType {`
`169`	`170`	`case "Organization":`
`170`	`171`	`reposBody, err = apiClient.Get(fmt.Sprintf("orgs/%s/repos", owner), query, nil)`
`171`	`172`	`case "User":`
`172`		`- authUserID, err := getAuthenticatedUserID(apiClient)`
	`173`	`+ authUserID, err = getAuthenticatedUserID(apiClient)`
`173`	`174`	`if err != nil {`
`174`		`- return nil, nil, err`
	`175`	`+ return`
`175`	`176`	`}`
`176`	`177`	`if authUserID == ownerID {`
`177`	`178`	`// Authenticated user's own account - includes private repos`
`@@ -185,7 +186,7 @@ func listGithubOwnerRepos(`
`185`	`186`	`reposBody, err = apiClient.Get(fmt.Sprintf("users/%s/repos", owner), query, nil)`
`186`	`187`	`}`
`187`	`188`	`if err != nil {`
`188`		`- return nil, nil, err`
	`189`	`+ return`
`189`	`190`	`}`
`190`	`191`
`191`	`192`	`var repos []repo`
`@@ -200,7 +201,7 @@ func listGithubOwnerRepos(`
`200`	`201`	`PerPage: page.PerPage,`
`201`	`202`	`}`
`202`	`203`	`}`
`203`		`- return children, nextPage, nil`
	`204`	`+ return`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`func listGithubAppInstalledRepos(`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ import (`
`38`	`38`	`githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"`
`39`	`39`	`"github.com/apache/incubator-devlake/plugins/github_graphql/model/migrationscripts"`
`40`	`40`	`"github.com/apache/incubator-devlake/plugins/github_graphql/tasks"`
`41`		`- "github.com/merico-dev/graphql"`
	`41`	`+ "github.com/merico-ai/graphql"`
`42`	`42`	`"golang.org/x/oauth2"`
`43`	`43`	`)`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/apache/incubator-devlake/core/plugin"`
`27`	`27`	`helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"`
`28`	`28`	`githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"`
`29`		`- "github.com/merico-dev/graphql"`
	`29`	`+ "github.com/merico-ai/graphql"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`var _ plugin.SubTaskEntryPoint = CollectDeployments`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`	`"github.com/apache/incubator-devlake/helpers/pluginhelper/api"`
`31`	`31`	`"github.com/apache/incubator-devlake/plugins/github/models"`
`32`	`32`	`githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"`
`33`		`- "github.com/merico-dev/graphql"`
	`33`	`+ "github.com/merico-ai/graphql"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`const RAW_ISSUES_TABLE = "github_graphql_issues"`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"`
`30`	`30`	`"github.com/apache/incubator-devlake/plugins/github/models"`
`31`	`31`	`githubTasks "github.com/apache/incubator-devlake/plugins/github/tasks"`
`32`		`- "github.com/merico-dev/graphql"`
	`32`	`+ "github.com/merico-ai/graphql"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`const RAW_GRAPHQL_JOBS_TABLE = "github_graphql_jobs"`