Skip to content

Commit

Permalink
upgraded github.com/google/go-github from v42 to v64
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Horton <[email protected]>
  • Loading branch information
madpah committed Sep 13, 2024
1 parent f3a9c0f commit c6ab19b
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion db/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"

"github.com/DATA-DOG/go-sqlmock"
"github.com/google/go-github/v42/github"
"github.com/google/go-github/v64/github"
"github.com/sonatype-nexus-community/the-cla/types"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"go.uber.org/zap"

"github.com/bradleyfalzon/ghinstallation/v2"
"github.com/google/go-github/v42/github"
"github.com/google/go-github/v64/github"
"github.com/sonatype-nexus-community/the-cla/db"
"github.com/sonatype-nexus-community/the-cla/types"
webhook "gopkg.in/go-playground/webhooks.v5/github"
Expand Down
2 changes: 1 addition & 1 deletion github/github_mocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"os"
"testing"

"github.com/google/go-github/v42/github"
"github.com/google/go-github/v64/github"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion github/github_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
"testing"
"time"

"github.com/google/go-github/v64/github"
"github.com/sonatype-nexus-community/the-cla/db"
"github.com/sonatype-nexus-community/the-cla/types"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"

"github.com/google/go-github/v42/github"
"github.com/stretchr/testify/assert"
webhook "gopkg.in/go-playground/webhooks.v5/github"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/DATA-DOG/go-sqlmock v1.5.2
github.com/bradleyfalzon/ghinstallation/v2 v2.11.0
github.com/golang-migrate/migrate/v4 v4.17.1
github.com/google/go-github/v42 v42.0.0
github.com/google/go-github/v64 v64.0.0
github.com/google/uuid v1.6.0
github.com/joho/godotenv v1.5.1
github.com/labstack/echo/v4 v4.12.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
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/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec=
github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg=
github.com/google/go-github/v62 v62.0.0 h1:/6mGCaRywZz9MuHyw9gD1CwsbmBX8GWsbFkwMmHdhl4=
github.com/google/go-github/v62 v62.0.0/go.mod h1:EMxeUqGJq2xRu9DYBMwel/mr7kZrzUOfQmmpYrZn2a4=
github.com/google/go-github/v64 v64.0.0 h1:4G61sozmY3eiPAjjoOHponXDBONm+utovTKbyUb2Qdg=
github.com/google/go-github/v64 v64.0.0/go.mod h1:xB3vqMQNdHzilXBiO2I+M7iEFtHf+DP/omBOv6tQzVo=
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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
Expand Down
5 changes: 3 additions & 2 deletions oauth/oauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ package oauth

import (
"context"
"go.uber.org/zap"
"net/http"

"github.com/google/go-github/v42/github"
"go.uber.org/zap"

"github.com/google/go-github/v64/github"
ourGithub "github.com/sonatype-nexus-community/the-cla/github"
"golang.org/x/oauth2"
githuboauth "golang.org/x/oauth2/github"
Expand Down
11 changes: 7 additions & 4 deletions oauth/oauth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ package oauth

import (
"context"
"github.com/google/go-github/v42/github"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
"golang.org/x/oauth2"
"net/http"
"os"
"testing"

"github.com/google/go-github/v64/github"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
"golang.org/x/oauth2"

"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -75,12 +76,14 @@ type OAuthMock struct {
var _ OAuthInterface = (*OAuthMock)(nil)

// Exchange takes the code and returns a real token.
//
//goland:noinspection GoUnusedParameter
func (o *OAuthMock) Exchange(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error) {
return o.exchangeToken, o.exchangeError
}

// Client returns a new http.Client.
//
//goland:noinspection GoUnusedParameter
func (o *OAuthMock) Client(ctx context.Context, t *oauth2.Token) *http.Client {
return &http.Client{}
Expand Down
2 changes: 1 addition & 1 deletion server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"time"

"github.com/DATA-DOG/go-sqlmock"
"github.com/google/go-github/v42/github"
"github.com/google/go-github/v64/github"
"github.com/labstack/echo/v4"
"github.com/sonatype-nexus-community/the-cla/db"
ourGithub "github.com/sonatype-nexus-community/the-cla/github"
Expand Down

0 comments on commit c6ab19b

Please sign in to comment.