Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency update #382

Merged
merged 2 commits into from
Dec 14, 2021
Merged

Dependency update #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f17216c
update dependencies
hendrikKahl Nov 29, 2021
48503d3
upgrade used gh client to v39
hendrikKahl Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 7 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/Microsoft/hcsshim v0.8.14 // indirect
github.com/argoproj/argo/v2 v2.12.10
github.com/bradleyfalzon/ghinstallation v1.1.1
github.com/bradleyfalzon/ghinstallation/v2 v2.0.3
github.com/containerd/containerd v1.4.3 // indirect
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
github.com/docker/cli v20.10.3+incompatible // indirect
github.com/emicklei/go-restful v2.11.1+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9
Expand All @@ -25,8 +22,10 @@ require (
github.com/go-logr/logr v0.4.0
github.com/go-logr/zapr v0.3.0
github.com/go-openapi/spec v0.19.8
github.com/golang-jwt/jwt/v4 v4.1.0 // indirect
github.com/golang/mock v1.5.0
github.com/google/go-github/v27 v27.0.4
github.com/google/go-github/v39 v39.2.0 // indirect
github.com/google/uuid v1.1.2
github.com/gorilla/mux v1.7.3
github.com/gorilla/sessions v1.1.3
Expand All @@ -40,17 +39,16 @@ require (
github.com/olekukonko/tablewriter v0.0.4
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/opencontainers/runc v0.1.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.2.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.8.1
go.uber.org/zap v1.17.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
google.golang.org/api v0.44.0
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
Expand All @@ -71,7 +69,7 @@ require (
replace (
// helm dependencies
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
github.com/docker/docker => github.com/moby/moby v20.10.11+incompatible
github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega => github.com/onsi/gomega v1.5.0
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
Expand All @@ -80,5 +78,5 @@ replace (
k8s.io/apimachinery => k8s.io/apimachinery v0.19.9
k8s.io/client-go => k8s.io/client-go v0.19.9
k8s.io/code-generator => k8s.io/code-generator v0.19.9
k8s.io/helm => k8s.io/helm v2.13.1+incompatible
k8s.io/helm => k8s.io/helm v2.17.0+incompatible
)
73 changes: 26 additions & 47 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/testmachinery/locations/location/gitlocation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

argov1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"

tmv1beta1 "github.com/gardener/test-infra/pkg/apis/testmachinery/v1beta1"
"github.com/gardener/test-infra/pkg/testmachinery"
Expand Down
4 changes: 2 additions & 2 deletions pkg/testrunner/result/status-uploader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/Masterminds/semver/v3"
"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"
"github.com/pkg/errors"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down Expand Up @@ -313,7 +313,7 @@ func downloadReleaseAssetByName(log logr.Logger, component ComponentExtended, fi
if err != nil {
return errors.Wrapf(err, "failed to get github asset ID of %s in %s", filename, component.Name)
}
assetReader, redirectURL, err := component.GithubClient.Repositories.DownloadReleaseAsset(context.Background(), component.Owner, component.Name, remoteAssetID)
assetReader, redirectURL, err := component.GithubClient.Repositories.DownloadReleaseAsset(context.Background(), component.Owner, component.Name, remoteAssetID, nil)
if assetReader != nil {
defer assetReader.Close()
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/tm-bot/github/authorization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (c *client) isInRequestedTeam(ctx context.Context, event *GenericRequestEve

// use default team if there is no requested team
if c.defaultTeam != nil && len(pr.RequestedTeams) == 0 {
membership, _, err := c.client.Teams.GetTeamMembership(ctx, c.defaultTeam.GetID(), event.GetAuthorName())
membership, _, err := c.client.Teams.GetTeamMembershipByID(ctx, c.defaultTeam.Organization.GetID(), c.defaultTeam.GetID(), event.GetAuthorName())
if err != nil {
c.log.V(3).Info(err.Error(), "team", c.defaultTeam.GetName())
return false
Expand All @@ -90,7 +90,7 @@ func (c *client) isInRequestedTeam(ctx context.Context, event *GenericRequestEve
}

for _, team := range pr.RequestedTeams {
membership, _, err := c.client.Teams.GetTeamMembership(ctx, team.GetID(), event.GetAuthorName())
membership, _, err := c.client.Teams.GetTeamMembershipByID(ctx, team.Organization.GetID(), team.GetID(), event.GetAuthorName())
if err != nil {
c.log.V(3).Info(err.Error(), "team", team.GetName())
return false
Expand All @@ -108,7 +108,7 @@ func (c *client) isInDefaultTeam(ctx context.Context, event *GenericRequestEvent
c.log.Info("no default team defined", "repository", event.GetRepositoryName(), "owner", event.GetOwnerName())
return false
}
membership, _, err := c.client.Teams.GetTeamMembership(ctx, c.defaultTeam.GetID(), event.GetAuthorName())
membership, _, err := c.client.Teams.GetTeamMembershipByID(ctx, c.defaultTeam.Organization.GetID(), c.defaultTeam.GetID(), event.GetAuthorName())
if err != nil {
c.log.V(3).Info(err.Error(), "team", c.defaultTeam.GetName())
return false
Expand Down
2 changes: 1 addition & 1 deletion pkg/tm-bot/github/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/Masterminds/semver/v3"
"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"
"github.com/pkg/errors"
"sigs.k8s.io/yaml"

Expand Down
4 changes: 2 additions & 2 deletions pkg/tm-bot/github/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"encoding/json"
"net/http"

"github.com/bradleyfalzon/ghinstallation"
"github.com/bradleyfalzon/ghinstallation/v2"
"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"
"sigs.k8s.io/yaml"

"github.com/gardener/test-infra/pkg/apis/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tm-bot/github/mocks/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/tm-bot/github/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/Masterminds/semver/v3"
"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"

"github.com/gardener/test-infra/pkg/apis/config"
"github.com/gardener/test-infra/pkg/tm-bot/github/ghval"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tm-bot/hook/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"net/http"

"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"
"github.com/pkg/errors"

ghutils "github.com/gardener/test-infra/pkg/tm-bot/github"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tm-bot/tests/tests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package tests_test

import (
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

Expand Down
2 changes: 1 addition & 1 deletion pkg/tm-bot/ui/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http"
"time"

"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"

github2 "github.com/gardener/test-infra/pkg/tm-bot/github"

Expand Down
2 changes: 1 addition & 1 deletion pkg/tm-bot/ui/pages/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
"github.com/go-logr/logr"
github2 "github.com/google/go-github/v27/github"
github2 "github.com/google/go-github/v39/github"
"github.com/gorilla/mux"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"time"

"github.com/go-logr/logr"
"github.com/google/go-github/v27/github"
"github.com/google/go-github/v39/github"
"github.com/pkg/errors"
netv1beta1 "k8s.io/api/networking/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/Microsoft/go-winio/.gitignore
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/github.com/Microsoft/go-winio/LICENSE
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/github.com/Microsoft/go-winio/README.md
View file
Open in desktop

This file was deleted.

Loading