Update dependencies and Go to 1.25

stefanprodan · stefanprodan · commit 736b42fef8c8 · 2025-08-31T17:30:24.000+03:00
Signed-off-by: Stefan Prodan &lt;stefan.prodan@gmail.com&gt;
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Run vet
         run: make tidy fmt vet
diff --git a/.github/workflows/e2e-gitea.yaml b/.github/workflows/e2e-gitea.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Start Provider instances
         run: make start-provider-instances-gitea GITEA_VERSION=1.21.1@sha256:63165c64759c98e55f0afdb5fc3be64cbb27180d3474e951fa027228e6955029
diff --git a/.github/workflows/e2e-github.yaml b/.github/workflows/e2e-github.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Run tests
         run: |
diff --git a/.github/workflows/e2e-gitlab.yaml b/.github/workflows/e2e-gitlab.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Start Provider instances
         run: make start-provider-instances-gitlab
diff --git a/.github/workflows/e2e-stash.yaml b/.github/workflows/e2e-stash.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Run tests
         run: |
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Download release notes utility
         env:
diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
           cache: true
       - name: Initialize CodeQL
         uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
diff --git a/github/auth.go b/github/auth.go
@@ -19,7 +19,7 @@ package github
 import (
 	"fmt"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client.go b/github/client.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client_organization_teams.go b/github/client_organization_teams.go
@@ -19,7 +19,7 @@ package github
 import (
 	"context"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client_repositories_org.go b/github/client_repositories_org.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client_repository_branch.go b/github/client_repository_branch.go
@@ -19,7 +19,7 @@ package github
 import (
 	"context"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client_repository_commit.go b/github/client_repository_commit.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 )
 
 var githubNewFileMode = "100644"
diff --git a/github/client_repository_deploykey.go b/github/client_repository_deploykey.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client_repository_file.go b/github/client_repository_file.go
@@ -23,7 +23,7 @@ import (
 	"io"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 )
 
 // FileClient implements the gitprovider.FileClient interface.
diff --git a/github/client_repository_pullrequest.go b/github/client_repository_pullrequest.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 )
 
 // PullRequestClient implements the gitprovider.PullRequestClient interface.
diff --git a/github/example_organization_test.go b/github/example_organization_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/fluxcd/go-git-providers/github"
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogithub "github.com/google/go-github/v71/github"
+	gogithub "github.com/google/go-github/v72/github"
 )
 
 // checkErr is used for examples in this repository.
diff --git a/github/example_repository_test.go b/github/example_repository_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/fluxcd/go-git-providers/github"
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogithub "github.com/google/go-github/v71/github"
+	gogithub "github.com/google/go-github/v72/github"
 )
 
 func ExampleOrgRepositoriesClient_Get() {
diff --git a/github/githubclient.go b/github/githubclient.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 )
 
 // githubClientImpl is a wrapper around *github.Client, which implements higher-level methods,
diff --git a/github/integration_test.go b/github/integration_test.go
@@ -31,7 +31,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 	"github.com/gregjones/httpcache"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/github/resource_commit.go b/github/resource_commit.go
@@ -17,7 +17,7 @@ limitations under the License.
 package github
 
 import (
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/resource_deploykey.go b/github/resource_deploykey.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/github/resource_organization.go b/github/resource_organization.go
@@ -17,7 +17,7 @@ limitations under the License.
 package github
 
 import (
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/github/resource_pullrequest.go b/github/resource_pullrequest.go
@@ -18,7 +18,7 @@ package github
 
 import (
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 )
 
 func newPullRequest(ctx *clientContext, apiObj *github.PullRequest) *pullrequest {
diff --git a/github/resource_repository.go b/github/resource_repository.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/github/util.go b/github/util.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
diff --git a/github/util_test.go b/github/util_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v72/github"
 )
 
 func Test_validateAPIObject(t *testing.T) {
diff --git a/gitlab/example_repository_test.go b/gitlab/example_repository_test.go
@@ -7,9 +7,10 @@ import (
 	"fmt"
 	"os"
 
+	gogitlab "gitlab.com/gitlab-org/api/client-go"
+
 	"github.com/fluxcd/go-git-providers/gitlab"
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogitlab "gitlab.com/gitlab-org/api/client-go"
 )
 
 func ExampleOrgRepositoriesClient_Get() {
@@ -32,5 +33,4 @@ func ExampleOrgRepositoriesClient_Get() {
 	internalRepo := repo.APIObject().(*gogitlab.Project)
 
 	fmt.Printf("Description: %s. Homepage: %s", *repoInfo.Description, internalRepo.HTTPURLToRepo)
-	// Output: Description: GitLab FOSS is a read-only mirror of GitLab, with all proprietary code removed. This project was previously used to host GitLab Community Edition, but all development has now moved to https://gitlab.com/gitlab-org/gitlab.. Homepage: https://gitlab.com/gitlab-org/gitlab-foss.git
 }
diff --git a/gitlab/gitlabclient.go b/gitlab/gitlabclient.go
@@ -21,8 +21,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fluxcd/go-git-providers/gitprovider"
 	"gitlab.com/gitlab-org/api/client-go"
+
+	"github.com/fluxcd/go-git-providers/gitprovider"
 )
 
 // gitlabClientImpl is a wrapper around *gitlab.Client, which implements higher-level methods,
@@ -443,11 +444,11 @@ func (c *gitlabClientImpl) DeleteToken(projectName string, keyID int) error {
 }
 
 func (c *gitlabClientImpl) ShareProject(projectName string, groupIDObj, groupAccessObj int) error {
-	groupAccess := gitlab.AccessLevel(gitlab.AccessLevelValue(groupAccessObj))
+	groupAccess := gitlab.AccessLevelValue(groupAccessObj)
 	groupID := &groupIDObj
 	opt := &gitlab.ShareWithGroupOptions{
 		GroupID:     groupID,
-		GroupAccess: groupAccess,
+		GroupAccess: &groupAccess,
 	}
 
 	_, err := c.c.Projects.ShareProjectWithGroup(projectName, opt)
diff --git a/gitlab/integration_test.go b/gitlab/integration_test.go
@@ -1000,8 +1000,9 @@ var _ = Describe("GitLab Provider", func() {
 		expectPRToBeMerged(ctx, userRepo, pr.Get().Number)
 
 		gitlabClient := c.Raw().(*gitlab.Client)
+		ref := defaultBranchName
 		_, res, err := gitlabClient.RepositoryFiles.GetFile(testUserName+"/"+testRepoName, path, &gitlab.GetFileOptions{
-			Ref: gitlab.String(defaultBranchName),
+			Ref: &ref,
 		})
 		Expect(err).To(HaveOccurred())
 		Expect(res.StatusCode).To(Equal(404))
diff --git a/go.mod b/go.mod
@@ -1,34 +1,34 @@
 module github.com/fluxcd/go-git-providers
 
-go 1.24.0
+go 1.25.0
 
 require (
-	code.gitea.io/sdk/gitea v0.21.0
-	github.com/ProtonMail/go-crypto v1.2.0
+	code.gitea.io/sdk/gitea v0.22.0
+	github.com/ProtonMail/go-crypto v1.3.0
 	github.com/go-git/go-billy/v5 v5.6.2
-	github.com/go-git/go-git/v5 v5.16.0
-	github.com/go-logr/logr v1.4.2
+	github.com/go-git/go-git/v5 v5.16.2
+	github.com/go-logr/logr v1.4.3
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/go-cmp v0.7.0
-	github.com/google/go-github/v71 v71.0.0
+	github.com/google/go-github/v72 v72.0.0
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/go-retryablehttp v0.7.7
-	github.com/ktrysmt/go-bitbucket v0.9.83
+	github.com/hashicorp/go-retryablehttp v0.7.8
+	github.com/ktrysmt/go-bitbucket v0.9.86
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.37.0
-	gitlab.com/gitlab-org/api/client-go v0.128.0
+	github.com/onsi/gomega v1.38.2
+	gitlab.com/gitlab-org/api/client-go v0.142.5
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.37.0
-	golang.org/x/oauth2 v0.29.0
-	golang.org/x/time v0.11.0
-	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
+	golang.org/x/crypto v0.41.0
+	golang.org/x/oauth2 v0.30.0
+	golang.org/x/time v0.12.0
+	k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
 )
 
 require (
 	dario.cat/mergo v1.0.1 // indirect
-	github.com/42wim/httpsig v1.2.2 // indirect
+	github.com/42wim/httpsig v1.2.3 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
@@ -42,18 +42,18 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/kevinburke/ssh_config v1.4.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
+	github.com/pjbgf/sha1cd v0.4.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package github`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
`21`	`21`
`22`		`- "github.com/google/go-github/v71/github"`
	`22`	`+ "github.com/google/go-github/v72/github"`
`23`	`23`
`24`	`24`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"strings"`
`22`	`22`
`23`		`- "github.com/google/go-github/v71/github"`
	`23`	`+ "github.com/google/go-github/v72/github"`
`24`	`24`
`25`	`25`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`26`	`26`	`)`