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

Jump to bottom

chore(deps): upgrade go-github to v61 #1102

Merged
merged 1 commit into from
Apr 9, 2024
Merged

chore(deps): upgrade go-github to v61 #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/native/compile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"github.com/go-vela/types/constants"
"github.com/go-vela/types/raw"

"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"

"testing"
"time"
Expand Down Expand Up @@ -1815,7 +1815,7 @@
}

compiler.WithMetadata(m)
compiler.WithRepo(&library.Repo{PipelineType: &tt.args.pipelineType})

Check failure on line 1818 in compiler/native/compile_test.go

View workflow job for this annotation

GitHub Actions / diff-review 

G601: Implicit memory aliasing in for loop. (gosec)

Check failure on line 1818 in compiler/native/compile_test.go

View workflow job for this annotation

GitHub Actions / full-review 

G601: Implicit memory aliasing in for loop. (gosec)

Check failure on line 1818 in compiler/native/compile_test.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] compiler/native/compile_test.go#L1818 

G601: Implicit memory aliasing in for loop. (gosec)
Raw output 
compiler/native/compile_test.go:1818:50: G601: Implicit memory aliasing in for loop. (gosec)
			compiler.WithRepo(&library.Repo{PipelineType: &tt.args.pipelineType})
			                                              ^

got, _, err := compiler.Compile(yaml)
if err != nil {
Expand Down Expand Up @@ -2964,7 +2964,7 @@
compiler.WithMetadata(m)

if tt.args.pipelineType != "" {
compiler.WithRepo(&library.Repo{PipelineType: &tt.args.pipelineType})

Check failure on line 2967 in compiler/native/compile_test.go

View workflow job for this annotation

GitHub Actions / diff-review 

G601: Implicit memory aliasing in for loop. (gosec)

Check failure on line 2967 in compiler/native/compile_test.go

View workflow job for this annotation

GitHub Actions / full-review 

G601: Implicit memory aliasing in for loop. (gosec)

Check failure on line 2967 in compiler/native/compile_test.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] compiler/native/compile_test.go#L2967 

G601: Implicit memory aliasing in for loop. (gosec)
Raw output 
compiler/native/compile_test.go:2967:51: G601: Implicit memory aliasing in for loop. (gosec)
				compiler.WithRepo(&library.Repo{PipelineType: &tt.args.pipelineType})
				                                              ^
}

got, _, err := compiler.Compile(yaml)
Expand Down
2 changes: 1 addition & 1 deletion compiler/registry/github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/url"
"strings"

"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
"golang.org/x/oauth2"
)

Expand Down
2 changes: 1 addition & 1 deletion compiler/registry/github/github_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
"golang.org/x/oauth2"
)

Expand Down
2 changes: 1 addition & 1 deletion compiler/registry/github/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/go-vela/types/library"

"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// Template captures the templated pipeline configuration from the GitHub repo.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/go-vela/types v0.23.4-0.20240402153726-f16c3e4cb5fb
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v59 v59.0.0
github.com/google/go-github/v61 v61.0.0
github.com/google/uuid v1.6.0
github.com/goware/urlx v0.3.2
github.com/hashicorp/go-cleanhttp v0.5.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
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/v59 v59.0.0 h1:7h6bgpF5as0YQLLkEiVqpgtJqjimMYhBkD4jT5aN3VA=
github.com/google/go-github/v59 v59.0.0/go.mod h1:rJU4R0rQHFVFDOkqGWxfLNo6vEk4dv40oDjhV/gH6wM=
github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
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=
Expand Down
2 changes: 1 addition & 1 deletion scm/github/access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"github.com/sirupsen/logrus"

"github.com/go-vela/types/library"
"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// OrgAccess captures the user's access level for an org.
Expand All @@ -31,7 +31,7 @@
}

// create GitHub OAuth client with user's token
client := c.newClientToken(*u.Token)

Check failure on line 34 in scm/github/access.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] scm/github/access.go#L34 

Function `newClientToken` should pass the context parameter (contextcheck)
Raw output 
scm/github/access.go:34:28: Function `newClientToken` should pass the context parameter (contextcheck)
	client := c.newClientToken(*u.Token)
	                          ^

// send API call to capture org access level for user
membership, _, err := client.Organizations.GetOrgMembership(ctx, *u.Name, org)
Expand Down Expand Up @@ -100,7 +100,7 @@
}

// create GitHub OAuth client with user's token
client := c.newClientToken(u.GetToken())

Check failure on line 103 in scm/github/access.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] scm/github/access.go#L103 

Function `newClientToken` should pass the context parameter (contextcheck)
Raw output 
scm/github/access.go:103:28: Function `newClientToken` should pass the context parameter (contextcheck)
	client := c.newClientToken(u.GetToken())
	                          ^
teams := []*github.Team{}

// set the max per page for the options to capture the list of repos
Expand Down Expand Up @@ -150,7 +150,7 @@
}).Tracef("capturing %s team membership for org %s", u.GetName(), org)

// create GitHub OAuth client with user's token
client := c.newClientToken(u.GetToken())

Check failure on line 153 in scm/github/access.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] scm/github/access.go#L153 

Function `newClientToken` should pass the context parameter (contextcheck)
Raw output 
scm/github/access.go:153:28: Function `newClientToken` should pass the context parameter (contextcheck)
	client := c.newClientToken(u.GetToken())
	                          ^
teams := []*github.Team{}

// set the max per page for the options to capture the list of repos
Expand Down
2 changes: 1 addition & 1 deletion scm/github/authentication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

"github.com/go-vela/server/random"
"github.com/go-vela/types/library"
"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// Authorize uses the given access token to authorize the user.
Expand Down Expand Up @@ -55,7 +55,7 @@

// Authenticate completes the authentication workflow for the session
// and returns the remote user details.
func (c *client) Authenticate(ctx context.Context, w http.ResponseWriter, r *http.Request, oAuthState string) (*library.User, error) {

Check failure on line 58 in scm/github/authentication.go

View workflow job for this annotation

GitHub Actions / diff-review 

unused-parameter: parameter 'w' seems to be unused, consider removing or renaming it as _ (revive)

Check failure on line 58 in scm/github/authentication.go

View workflow job for this annotation

GitHub Actions / full-review 

unused-parameter: parameter 'w' seems to be unused, consider removing or renaming it as _ (revive)

Check failure on line 58 in scm/github/authentication.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] scm/github/authentication.go#L58 

unused-parameter: parameter 'w' seems to be unused, consider removing or renaming it as _ (revive)
Raw output 
scm/github/authentication.go:58:52: unused-parameter: parameter 'w' seems to be unused, consider removing or renaming it as _ (revive)
func (c *client) Authenticate(ctx context.Context, w http.ResponseWriter, r *http.Request, oAuthState string) (*library.User, error) {
                                                   ^
c.Logger.Trace("authenticating user")

// get the OAuth code
Expand Down
2 changes: 1 addition & 1 deletion scm/github/changeset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/sirupsen/logrus"

"github.com/go-vela/types/library"
"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// Changeset captures the list of files changed for a commit.
Expand Down
2 changes: 1 addition & 1 deletion scm/github/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/go-vela/types/library"
"github.com/go-vela/types/raw"
"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// GetDeployment gets a deployment from the GitHub repo.
Expand Down
2 changes: 1 addition & 1 deletion scm/github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"net/url"

"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
"github.com/sirupsen/logrus"

"golang.org/x/oauth2"
Expand Down
2 changes: 1 addition & 1 deletion scm/github/github_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
"golang.org/x/oauth2"
)

Expand Down
23 changes: 10 additions & 13 deletions scm/github/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

"github.com/go-vela/types/constants"
"github.com/go-vela/types/library"
"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// ConfigBackoff is a wrapper for Config that will retry five times if the function
Expand Down Expand Up @@ -122,11 +122,8 @@
continue
}

// cast url from hook configuration to string
hookURL := hook.Config["url"].(string)

// capture hook ID if the hook url matches
if hookURL == fmt.Sprintf("%s/webhook", c.config.ServerWebhookAddress) {
if strings.EqualFold(hook.GetConfig().GetURL(), fmt.Sprintf("%s/webhook", c.config.ServerWebhookAddress)) {
ids = append(ids, hook.GetID())
}
}
Expand Down Expand Up @@ -192,10 +189,10 @@
// create the hook object to make the API call
hook := &github.Hook{
Events: events,
Config: map[string]interface{}{
"url": fmt.Sprintf("%s/webhook", c.config.ServerWebhookAddress),
"content_type": "form",
"secret": r.GetHash(),
Config: &github.HookConfig{
URL: github.String(fmt.Sprintf("%s/webhook", c.config.ServerWebhookAddress)),
ContentType: github.String("form"),
Secret: github.String(r.GetHash()),
},
Active: github.Bool(true),
}
Expand Down Expand Up @@ -266,10 +263,10 @@
// create the hook object to make the API call
hook := &github.Hook{
Events: events,
Config: map[string]interface{}{
"url": fmt.Sprintf("%s/webhook", c.config.ServerWebhookAddress),
"content_type": "form",
"secret": r.GetHash(),
Config: &github.HookConfig{
URL: github.String(fmt.Sprintf("%s/webhook", c.config.ServerWebhookAddress)),
ContentType: github.String("form"),
Secret: github.String(r.GetHash()),
},
Active: github.Bool(true),
}
Expand Down Expand Up @@ -524,7 +521,7 @@
// loop to capture *ALL* the repos
for {
// send API call to capture the user's repos
repos, resp, err := client.Repositories.List(ctx, "", opts)

Check failure on line 524 in scm/github/repo.go

View workflow job for this annotation

GitHub Actions / golangci

[golangci] scm/github/repo.go#L524 

SA1019: client.Repositories.List is deprecated: Use RepositoriesService.ListByUser or RepositoriesService.ListByAuthenticatedUser instead. (staticcheck)
Raw output 
scm/github/repo.go:524:23: SA1019: client.Repositories.List is deprecated: Use RepositoriesService.ListByUser or RepositoriesService.ListByAuthenticatedUser instead. (staticcheck)
		repos, resp, err := client.Repositories.List(ctx, "", opts)
		                    ^
if err != nil {
return nil, fmt.Errorf("unable to list user repos: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion scm/github/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/go-vela/types"
"github.com/go-vela/types/constants"
"github.com/go-vela/types/library"
"github.com/google/go-github/v59/github"
"github.com/google/go-github/v61/github"
)

// ProcessWebhook parses the webhook from a repo.
Expand Down
Loading