Merge pull request #307 from erikgb/gitlab-client-go

stefanprodan · web-flow · commit ecb961099ab6 · 2025-01-03T13:51:39.000+02:00
Migrate to new GitLab client-go
diff --git a/gitlab/auth.go b/gitlab/auth.go
@@ -18,7 +18,7 @@ package gitlab
 
 import (
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogitlab "github.com/xanzy/go-gitlab"
+	gogitlab "gitlab.com/gitlab-org/api/client-go"
 )
 
 const (
diff --git a/gitlab/client.go b/gitlab/client.go
@@ -22,7 +22,7 @@ import (
 	"net/url"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // ProviderID is the provider ID for GitLab.
diff --git a/gitlab/client_organization_teams.go b/gitlab/client_organization_teams.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // TeamsClient implements the gitprovider.TeamsClient interface.
diff --git a/gitlab/client_repositories_org.go b/gitlab/client_repositories_org.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // OrgRepositoriesClient implements the gitprovider.OrgRepositoriesClient interface.
diff --git a/gitlab/client_repository_branch.go b/gitlab/client_repository_branch.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // BranchClient implements the gitprovider.BranchClient interface.
diff --git a/gitlab/client_repository_commit.go b/gitlab/client_repository_commit.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // CommitClient implements the gitprovider.CommitClient interface.
diff --git a/gitlab/client_repository_deploykey.go b/gitlab/client_repository_deploykey.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // DeployKeyClient implements the gitprovider.DeployKeyClient interface.
diff --git a/gitlab/client_repository_deploytoken.go b/gitlab/client_repository_deploytoken.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // DeployTokenClient implements the gitprovider.DeployTokenClient interface.
diff --git a/gitlab/client_repository_file.go b/gitlab/client_repository_file.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // FileClient implements the gitprovider.FileClient interface.
diff --git a/gitlab/client_repository_pullrequest.go b/gitlab/client_repository_pullrequest.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // mergeStatusChecking indicates that gitlab has not yet asynchronously updated the merge status for a merge request
diff --git a/gitlab/client_repository_tree.go b/gitlab/client_repository_tree.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // TreeClient implements the gitprovider.TreeClient interface.
diff --git a/gitlab/example_organization_test.go b/gitlab/example_organization_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/fluxcd/go-git-providers/gitlab"
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogitlab "github.com/xanzy/go-gitlab"
+	gogitlab "gitlab.com/gitlab-org/api/client-go"
 )
 
 // checkErr is used for examples in this repository.
diff --git a/gitlab/example_repository_test.go b/gitlab/example_repository_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/fluxcd/go-git-providers/gitlab"
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogitlab "github.com/xanzy/go-gitlab"
+	gogitlab "gitlab.com/gitlab-org/api/client-go"
 )
 
 func ExampleOrgRepositoriesClient_Get() {
diff --git a/gitlab/gitlabclient.go b/gitlab/gitlabclient.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // gitlabClientImpl is a wrapper around *github.Client, which implements higher-level methods,
diff --git a/gitlab/integration_test.go b/gitlab/integration_test.go
@@ -37,7 +37,7 @@ import (
 	"github.com/gregjones/httpcache"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	testutils "github.com/fluxcd/go-git-providers/gitprovider/testutils"
diff --git a/gitlab/resource_commit.go b/gitlab/resource_commit.go
@@ -17,7 +17,7 @@ limitations under the License.
 package gitlab
 
 import (
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/gitlab/resource_deploykey.go b/gitlab/resource_deploykey.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/gitlab/resource_deploytoken.go b/gitlab/resource_deploytoken.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/gitlab/resource_organization.go b/gitlab/resource_organization.go
@@ -17,7 +17,7 @@ limitations under the License.
 package gitlab
 
 import (
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/gitlab/resource_pullrequest.go b/gitlab/resource_pullrequest.go
@@ -18,7 +18,7 @@ package gitlab
 
 import (
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 // The value of the "State" field of a gitlab merge request after it has been merged"
diff --git a/gitlab/resource_repository.go b/gitlab/resource_repository.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 
 	"github.com/google/go-cmp/cmp"
-	gogitlab "github.com/xanzy/go-gitlab"
+	gogitlab "gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/gitlab/util.go b/gitlab/util.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/gitlab/util_test.go b/gitlab/util_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
-	"github.com/xanzy/go-gitlab"
+	"gitlab.com/gitlab-org/api/client-go"
 )
 
 func Test_validateAPIObject(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/ktrysmt/go-bitbucket v0.9.81
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.36.1
-	github.com/xanzy/go-gitlab v0.114.0
+	gitlab.com/gitlab-org/api/client-go v0.116.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.30.0
 	golang.org/x/oauth2 v0.24.0
diff --git a/go.sum b/go.sum
@@ -154,12 +154,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/xanzy/go-gitlab v0.114.0 h1:0wQr/KBckwrZPfEMjRqpUz0HmsKKON9UhCYv9KDy19M=
-github.com/xanzy/go-gitlab v0.114.0/go.mod h1:wKNKh3GkYDMOsGmnfuX+ITCmDuSDWFO0G+C4AygL9RY=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+gitlab.com/gitlab-org/api/client-go v0.116.0 h1:Dy534gtZPMrnm3fAcmQRMadrcoUyFO4FQ4rXlSAdHAw=
+gitlab.com/gitlab-org/api/client-go v0.116.0/go.mod h1:B29OfnZklmaoiR7uHANh9jTyfWEgmXvZLVEnosw2Dx0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package gitlab`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`21`		`- gogitlab "github.com/xanzy/go-gitlab"`
	`21`	`+ gogitlab "gitlab.com/gitlab-org/api/client-go"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"net/url"`
`23`	`23`
`24`	`24`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`25`		`- "github.com/xanzy/go-gitlab"`
	`25`	`+ "gitlab.com/gitlab-org/api/client-go"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// ProviderID is the provider ID for GitLab.`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"context"`
`21`	`21`
`22`	`22`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`23`		`- "github.com/xanzy/go-gitlab"`
	`23`	`+ "gitlab.com/gitlab-org/api/client-go"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// TeamsClient implements the gitprovider.TeamsClient interface.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"errors"`
`22`	`22`
`23`	`23`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`24`		`- "github.com/xanzy/go-gitlab"`
	`24`	`+ "gitlab.com/gitlab-org/api/client-go"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// OrgRepositoriesClient implements the gitprovider.OrgRepositoriesClient interface.`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"strings"`
`24`	`24`
`25`	`25`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`26`		`- "github.com/xanzy/go-gitlab"`
	`26`	`+ "gitlab.com/gitlab-org/api/client-go"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// FileClient implements the gitprovider.FileClient interface.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/fluxcd/go-git-providers/gitlab"`
`12`	`12`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`13`		`- gogitlab "github.com/xanzy/go-gitlab"`
	`13`	`+ gogitlab "gitlab.com/gitlab-org/api/client-go"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// checkErr is used for examples in this repository.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/fluxcd/go-git-providers/gitlab"`
`11`	`11`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`12`		`- gogitlab "github.com/xanzy/go-gitlab"`
	`12`	`+ gogitlab "gitlab.com/gitlab-org/api/client-go"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func ExampleOrgRepositoriesClient_Get() {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`package gitlab`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.com/xanzy/go-gitlab"`
	`20`	`+ "gitlab.com/gitlab-org/api/client-go"`
`21`	`21`
`22`	`22`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`23`	`23`	`)`