Merge pull request #286 from fluxcd/update-go-github-63

stefanprodan · web-flow · commit f0872501d11f · 2024-08-28T11:48:51.000+03:00
Update dependencies
diff --git a/github/auth.go b/github/auth.go
@@ -19,7 +19,7 @@ package github
 import (
 	"fmt"
 
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
@@ -111,7 +111,7 @@ func (c *Client) HasTokenPermission(ctx context.Context, permission gitprovider.
 	}
 
 	// The X-OAuth-Scopes header is returned for any API calls, using Meta here to keep things simple.
-	_, res, err := c.c.Client().APIMeta(ctx)
+	_, res, err := c.c.Client().Meta.Get(ctx)
 	if err != nil {
 		return false, err
 	}
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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/github"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
 )
diff --git a/github/client_repository_branch.go b/github/client_repository_branch.go
@@ -19,8 +19,9 @@ package github
 import (
 	"context"
 
+	"github.com/google/go-github/v64/github"
+
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	"github.com/google/go-github/v61/github"
 )
 
 // BranchClient implements the gitprovider.BranchClient interface.
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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	gogithub "github.com/google/go-github/v64/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/v61/github"
+	gogithub "github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/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/v61/github"
+	"github.com/google/go-github/v64/github"
 )
 
 func Test_validateAPIObject(t *testing.T) {
diff --git a/gitlab/util.go b/gitlab/util.go
@@ -6,9 +6,10 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/xanzy/go-gitlab"
+
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	"github.com/fluxcd/go-git-providers/validation"
-	"github.com/xanzy/go-gitlab"
 )
 
 const (
@@ -226,6 +227,11 @@ func handleHTTPError(err error) error {
 	if err == nil {
 		return nil
 	}
+
+	if errors.Is(err, gitlab.ErrNotFound) {
+		return validation.NewMultiError(err, gitprovider.ErrNotFound)
+	}
+
 	glErrorResponse := &gitlab.ErrorResponse{}
 	if errors.As(err, &glErrorResponse) {
 		httpErr := gitprovider.HTTPError{
diff --git a/go.mod b/go.mod
@@ -2,61 +2,61 @@ module github.com/fluxcd/go-git-providers
 
 go 1.22
 
+// Includes fix: https://github.com/google/go-github/pull/3249
+replace github.com/google/go-github/v64 => github.com/google/go-github/v64 v64.0.1-0.20240826145430-da7d01467641
+
 require (
-	code.gitea.io/sdk/gitea v0.17.1
+	code.gitea.io/sdk/gitea v0.19.0
 	github.com/ProtonMail/go-crypto v1.0.0
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.12.0
-	github.com/go-logr/logr v1.4.1
+	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-github/v61 v61.0.0
+	github.com/google/go-github/v64 v64.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.5
-	github.com/ktrysmt/go-bitbucket v0.9.77
+	github.com/hashicorp/go-retryablehttp v0.7.7
+	github.com/ktrysmt/go-bitbucket v0.9.80
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.32.0
-	github.com/xanzy/go-gitlab v0.101.0
+	github.com/xanzy/go-gitlab v0.107.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.21.0
-	golang.org/x/oauth2 v0.18.0
+	golang.org/x/crypto v0.26.0
+	golang.org/x/oauth2 v0.20.0
 	golang.org/x/time v0.5.0
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57
 )
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/cloudflare/circl v1.3.9 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.1 // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-version v1.6.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/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
+	google.golang.org/protobuf v1.34.2 // 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/v61/github"`
	`22`	`+ "github.com/google/go-github/v64/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/v61/github"`
	`23`	`+ "github.com/google/go-github/v64/github"`
`24`	`24`
`25`	`25`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`26`	`26`	`)`
`@@ -111,7 +111,7 @@ func (c *Client) HasTokenPermission(ctx context.Context, permission gitprovider.`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// The X-OAuth-Scopes header is returned for any API calls, using Meta here to keep things simple.`
`114`		`- _, res, err := c.c.Client().APIMeta(ctx)`
	`114`	`+ _, res, err := c.c.Client().Meta.Get(ctx)`
`115`	`115`	`if err != nil {`
`116`	`116`	`return false, err`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,9 @@ package github`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`	`21`
	`22`	`+ "github.com/google/go-github/v64/github"`
	`23`	`+`
`22`	`24`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`23`		`- "github.com/google/go-github/v61/github"`
`24`	`25`	`)`
`25`	`26`
`26`	`27`	`// BranchClient implements the gitprovider.BranchClient interface.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`
`23`	`23`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`24`		`- "github.com/google/go-github/v61/github"`
	`24`	`+ "github.com/google/go-github/v64/github"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`var githubNewFileMode = "100644"`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"io"`
`24`	`24`
`25`	`25`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`26`		`- "github.com/google/go-github/v61/github"`
	`26`	`+ "github.com/google/go-github/v64/github"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// FileClient implements the gitprovider.FileClient interface.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/fluxcd/go-git-providers/github"`
`9`	`9`	`"github.com/fluxcd/go-git-providers/gitprovider"`
`10`		`- gogithub "github.com/google/go-github/v61/github"`
	`10`	`+ gogithub "github.com/google/go-github/v64/github"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// checkErr is used for examples in this repository.`