From 5b780ad995f5b8fcb810555f0e80cb67a2aee7c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 19:57:40 +0000 Subject: [PATCH 1/2] Update module github.com/google/go-github/v54 to v57 --- go.mod | 2 +- go.sum | 4 ++-- .../controller/applicationhealthdeployment_controller_test.go | 2 +- .../controller/applicationphasedeployment_controller_test.go | 2 +- internal/controller/mocks_test.go | 2 +- internal/github/client.go | 2 +- internal/github/comment.go | 2 +- internal/github/deployment.go | 2 +- internal/github/types.go | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 53ac150a..99b90712 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/argoproj/gitops-engine v0.7.1-0.20230906152414-b0fffe419a0f github.com/go-logr/logr v1.3.0 github.com/google/go-cmp v0.6.0 - github.com/google/go-github/v54 v54.0.0 + github.com/google/go-github/v57 v57.0.0 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 github.com/int128/oauth2-github-app v1.1.0 github.com/onsi/ginkgo/v2 v2.13.2 diff --git a/go.sum b/go.sum index 4c0fa06b..3f69d0bd 100644 --- a/go.sum +++ b/go.sum @@ -412,8 +412,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI= github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao= -github.com/google/go-github/v54 v54.0.0 h1:OZdXwow4EAD5jEo5qg+dGFH2DpkyZvVsAehjvJuUL/c= -github.com/google/go-github/v54 v54.0.0/go.mod h1:Sw1LXWHhXRZtzJ9LI5fyJg9wbQzYvFhW8W5P2yaAQ7s= +github.com/google/go-github/v57 v57.0.0 h1:L+Y3UPTY8ALM8x+TV0lg+IEBI+upibemtBD8Q9u7zHs= +github.com/google/go-github/v57 v57.0.0/go.mod h1:s0omdnye0hvK/ecLvpsGfJMiRt85PimQh4oygmLIxHw= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= diff --git a/internal/controller/applicationhealthdeployment_controller_test.go b/internal/controller/applicationhealthdeployment_controller_test.go index 1509a08a..2d829484 100644 --- a/internal/controller/applicationhealthdeployment_controller_test.go +++ b/internal/controller/applicationhealthdeployment_controller_test.go @@ -6,7 +6,7 @@ import ( argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/argoproj/gitops-engine/pkg/health" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/applicationphasedeployment_controller_test.go b/internal/controller/applicationphasedeployment_controller_test.go index 7ffd99fa..d2699554 100644 --- a/internal/controller/applicationphasedeployment_controller_test.go +++ b/internal/controller/applicationphasedeployment_controller_test.go @@ -7,7 +7,7 @@ import ( argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/argoproj/gitops-engine/pkg/health" synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/mocks_test.go b/internal/controller/mocks_test.go index 2978af27..f5e3d87e 100644 --- a/internal/controller/mocks_test.go +++ b/internal/controller/mocks_test.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/internal/github/client.go b/internal/github/client.go index fb9af539..30dc9e27 100644 --- a/internal/github/client.go +++ b/internal/github/client.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" "github.com/gregjones/httpcache" "github.com/int128/oauth2-github-app" "golang.org/x/oauth2" diff --git a/internal/github/comment.go b/internal/github/comment.go index 35ced63a..d18acd86 100644 --- a/internal/github/comment.go +++ b/internal/github/comment.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" ) type Comment struct { diff --git a/internal/github/deployment.go b/internal/github/deployment.go index d613f1c8..596e798e 100644 --- a/internal/github/deployment.go +++ b/internal/github/deployment.go @@ -6,7 +6,7 @@ import ( "regexp" "strconv" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" ) type Deployment struct { diff --git a/internal/github/types.go b/internal/github/types.go index ba2eb29d..963836ae 100644 --- a/internal/github/types.go +++ b/internal/github/types.go @@ -5,7 +5,7 @@ import ( "errors" "regexp" - "github.com/google/go-github/v54/github" + "github.com/google/go-github/v57/github" ) type Client interface { From 3301babb183c66c73ed02fe73d80ed34c0a87768 Mon Sep 17 00:00:00 2001 From: Hidetake Iwata Date: Tue, 5 Dec 2023 20:20:58 +0900 Subject: [PATCH 2/2] Fix deprecation --- internal/github/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/github/client.go b/internal/github/client.go index 30dc9e27..4411b03c 100644 --- a/internal/github/client.go +++ b/internal/github/client.go @@ -60,7 +60,7 @@ func newOAuth2Client(ctx context.Context) (*http.Client, error) { func newGitHubClient(hc *http.Client) (*github.Client, error) { ghesURL := os.Getenv("GITHUB_ENTERPRISE_URL") if ghesURL != "" { - ghc, err := github.NewEnterpriseClient(ghesURL, ghesURL, hc) + ghc, err := github.NewClient(hc).WithEnterpriseURLs(ghesURL, ghesURL) if err != nil { return nil, fmt.Errorf("could not create a GitHub Enterprise client: %w", err) }