This is an automated email from the ASF dual-hosted git repository.
lynwee pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 80f9e2d16 chore(deps): update graphql dependency from merico-dev to
merico-ai (#8699)
80f9e2d16 is described below
commit 80f9e2d1642829d68507f1004345efeaa4b982a6
Author: NaRro <[email protected]>
AuthorDate: Mon Feb 9 05:37:00 2026 +0000
chore(deps): update graphql dependency from merico-dev to merico-ai (#8699)
* 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 <[email protected]>
* 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 <[email protected]>
---------
Co-authored-by: Claude <[email protected]>
---
backend/go.mod | 2 +-
backend/go.sum | 4 ++--
backend/helpers/pluginhelper/api/graphql_async_client.go | 2 +-
backend/helpers/pluginhelper/api/graphql_collector.go | 2 +-
backend/plugins/github/api/remote_api.go | 11 ++++++-----
backend/plugins/github_graphql/impl/impl.go | 2 +-
backend/plugins/github_graphql/tasks/account_collector.go | 2 +-
backend/plugins/github_graphql/tasks/deployment_collector.go | 2 +-
backend/plugins/github_graphql/tasks/issue_collector.go | 2 +-
backend/plugins/github_graphql/tasks/job_collector.go | 2 +-
backend/plugins/github_graphql/tasks/pr_collector.go | 2 +-
backend/plugins/github_graphql/tasks/release_collector.go | 2 +-
12 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/backend/go.mod b/backend/go.mod
index 21f8d4b19..b744729e1 100644
--- 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
index 2b8e19f62..2344cde8b 100644
--- 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
index 2df25583e..32dac66a9 100644
--- 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
index 78315ad6d..fdd779097 100644
--- 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
index 6fff1a202..627f5b86d 100644
--- 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
index 31fe0a9b7..3efbe10a2 100644
--- 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
index 34e4faac1..a75013d0d 100644
--- 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
index b28c8deca..7f8ff5cde 100644
--- 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
index bc4d7a17b..f4db1d5b6 100644
--- 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
index f0deb7b41..05fd67007 100644
--- 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
index b3d462467..669839385 100644
--- 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
index 83581c4c1..1f9f86c5d 100644
--- 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"
