Merge pull request #317 from fluxcd/go-1.24

stefanprodan · web-flow · commit bdf080041716 · 2025-04-25T11:57:46.000+03:00
Update dependencies and Go to 1.24
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.23.x
+          go-version: 1.24.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.23.x
+          go-version: 1.24.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.23.x
+          go-version: 1.24.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.23.x
+          go-version: 1.24.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.23.x
+          go-version: 1.24.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.23.x
+          go-version: 1.24.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.23.x
+          go-version: 1.24.x
           cache: true
       - name: Initialize CodeQL
         uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ TEST_PATTERN?=./...
 all: test
 
 tidy:
-	go mod tidy -compat=1.22
+	go mod tidy -compat=1.24
 
 fmt:
 	go fmt ./...
diff --git a/gitea/client_repository_tree.go b/gitea/client_repository_tree.go
@@ -20,6 +20,8 @@ import (
 	"context"
 	"strings"
 
+	"code.gitea.io/sdk/gitea"
+
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
 
@@ -34,7 +36,10 @@ type TreeClient struct {
 
 // Get returns a tree
 func (c *TreeClient) Get(ctx context.Context, sha string, recursive bool) (*gitprovider.TreeInfo, error) {
-	tree, resp, err := c.c.GetTrees(c.ref.GetIdentity(), c.ref.GetRepository(), sha, recursive)
+	tree, resp, err := c.c.GetTrees(c.ref.GetIdentity(), c.ref.GetRepository(), gitea.ListTreeOptions{
+		Ref:       sha,
+		Recursive: recursive,
+	})
 	if err != nil {
 		return nil, handleHTTPError(resp, err)
 	}
diff --git a/github/auth.go b/github/auth.go
@@ -19,7 +19,7 @@ package github
 import (
 	"fmt"
 
-	"github.com/google/go-github/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	gogithub "github.com/google/go-github/v71/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/v66/github"
+	gogithub "github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/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/v66/github"
+	"github.com/google/go-github/v71/github"
 )
 
 func Test_validateAPIObject(t *testing.T) {
diff --git a/gitlab/client_repository_pullrequest.go b/gitlab/client_repository_pullrequest.go
@@ -21,12 +21,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/fluxcd/go-git-providers/gitprovider"
 	"gitlab.com/gitlab-org/api/client-go"
-)
 
-// mergeStatusChecking indicates that gitlab has not yet asynchronously updated the merge status for a merge request
-const mergeStatusChecking = "checking"
+	"github.com/fluxcd/go-git-providers/gitprovider"
+)
 
 // PullRequestClient implements the gitprovider.PullRequestClient interface.
 var _ gitprovider.PullRequestClient = &PullRequestClient{}
@@ -46,7 +44,11 @@ func (c *PullRequestClient) List(_ context.Context) ([]gitprovider.PullRequest,
 
 	requests := make([]gitprovider.PullRequest, len(mrs))
 
-	for idx, mr := range mrs {
+	for idx, basicMR := range mrs {
+		mr, _, err := c.c.Client().MergeRequests.GetMergeRequest(getRepoPath(c.ref), basicMR.IID, nil)
+		if err != nil {
+			return nil, err
+		}
 		requests[idx] = newPullRequest(c.clientContext, mr)
 	}
 
@@ -96,7 +98,8 @@ func (c *PullRequestClient) Get(_ context.Context, number int) (gitprovider.Pull
 
 // Merge merges a pull request with the given specifications.
 func (c *PullRequestClient) Merge(_ context.Context, number int, mergeMethod gitprovider.MergeMethod, message string) error {
-	if err := c.waitForMergeRequestToBeMergeable(number); err != nil {
+	status, err := c.waitForMergeRequestToBeMergeable(number)
+	if err != nil {
 		return err
 	}
 
@@ -124,25 +127,30 @@ func (c *PullRequestClient) Merge(_ context.Context, number int, mergeMethod git
 		SHA:                       nil,
 	}
 
-	_, _, err := c.c.Client().MergeRequests.AcceptMergeRequest(getRepoPath(c.ref), number, amrOpts)
+	_, _, err = c.c.Client().MergeRequests.AcceptMergeRequest(getRepoPath(c.ref), number, amrOpts)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to accept merge request with status '%s': %s", status, err)
 	}
 
 	return nil
 }
 
-func (c *PullRequestClient) waitForMergeRequestToBeMergeable(number int) error {
-	// gitlab says to poll for merge status
+func (c *PullRequestClient) waitForMergeRequestToBeMergeable(number int) (string, error) {
+	// poll for merge status to reach "mergeable" state
+	// docs: https://docs.gitlab.com/api/merge_requests/#merge-status
+	currentStatus := "unknown"
 	for retries := 0; retries < 10; retries++ {
 		mr, _, err := c.c.Client().MergeRequests.GetMergeRequest(getRepoPath(c.ref), number, &gitlab.GetMergeRequestsOptions{})
-		if err != nil || mr.MergeStatus == mergeStatusChecking {
+		if err != nil || mr.DetailedMergeStatus != "mergeable" {
+			if mr != nil {
+				currentStatus = mr.DetailedMergeStatus
+			}
 			time.Sleep(time.Second * 2)
 			continue
 		}
 
-		return nil
+		return mr.DetailedMergeStatus, nil
 	}
 
-	return fmt.Errorf("merge status unavailable for pull request number: %d", number)
+	return currentStatus, fmt.Errorf("merge status %s for pull request number: %d", currentStatus, number)
 }
diff --git a/gitlab/integration_test.go b/gitlab/integration_test.go
@@ -40,7 +40,7 @@ import (
 	"gitlab.com/gitlab-org/api/client-go"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	testutils "github.com/fluxcd/go-git-providers/gitprovider/testutils"
+	"github.com/fluxcd/go-git-providers/gitprovider/testutils"
 )
 
 const (
@@ -601,7 +601,7 @@ var _ = Describe("GitLab Provider", func() {
 		Expect(err).ToNot(HaveOccurred())
 		Expect(len(keys)).To(Equal(0))
 
-		rsaGen := testutils.NewRSAGenerator(256)
+		rsaGen := testutils.NewRSAGenerator(1024)
 		keyPair1, err := rsaGen.Generate()
 		Expect(err).ToNot(HaveOccurred())
 		pubKey := keyPair1.PublicKey
diff --git a/go.mod b/go.mod
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/v66/github"`
	`22`	`+ "github.com/google/go-github/v71/github"`
`23`	`23`
`24`	`24`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`25`	`25`	`)`