Skip to content

Commit a2b0bda

Browse files
committed
change github auth to use oauth token instead of basic.
1 parent 9f8bb1b commit a2b0bda

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/gobuffalo/here v0.6.0
2323
github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556
2424
github.com/gofrs/uuid v4.0.0+incompatible // indirect
25-
github.com/google/go-github/v35 v35.2.0
25+
github.com/google/go-github/v39 v39.2.0
2626
github.com/gorilla/mux v1.7.4 // indirect
2727
github.com/hashicorp/go-multierror v1.1.0
2828
github.com/jackc/pgconn v1.8.0
@@ -48,6 +48,7 @@ require (
4848
go.uber.org/atomic v1.6.0
4949
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
5050
golang.org/x/net v0.0.0-20211013171255-e13a2654a71e // indirect
51+
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
5152
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect
5253
golang.org/x/tools v0.1.5
5354
google.golang.org/api v0.51.0

go.sum

+4-3
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,11 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
515515
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
516516
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
517517
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
518-
github.com/google/go-github/v35 v35.2.0 h1:s/soW8jauhjUC3rh8JI0FePuocj0DEI9DNBg/bVplE8=
519-
github.com/google/go-github/v35 v35.2.0/go.mod h1:s0515YVTI+IMrDoy9Y4pHt9ShGpzHvHO8rZ7L7acgvs=
520-
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
518+
github.com/google/go-github/v39 v39.2.0 h1:rNNM311XtPOz5rDdsJXAp2o8F67X9FnROXTvto3aSnQ=
519+
github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE=
521520
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
521+
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
522+
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
522523
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
523524
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
524525
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=

source/github/github.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package github
33
import (
44
"context"
55
"fmt"
6+
"golang.org/x/oauth2"
67
"io"
78
"io/ioutil"
89
"net/http"
@@ -12,7 +13,7 @@ import (
1213
"strings"
1314

1415
"github.com/golang-migrate/migrate/v4/source"
15-
"github.com/google/go-github/v35/github"
16+
"github.com/google/go-github/v39/github"
1617
)
1718

1819
func init() {
@@ -54,12 +55,11 @@ func (g *Github) Open(url string) (source.Driver, error) {
5455
if !ok {
5556
return nil, ErrNoUserInfo
5657
}
58+
ts := oauth2.StaticTokenSource(
59+
&oauth2.Token{AccessToken: password},
60+
)
61+
client = oauth2.NewClient(context.Background(), ts)
5762

58-
tr := &github.BasicAuthTransport{
59-
Username: u.User.Username(),
60-
Password: password,
61-
}
62-
client = tr.Client()
6363
}
6464

6565
gn := &Github{

source/github_ee/github_ee.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/golang-migrate/migrate/v4/source"
1212
gh "github.com/golang-migrate/migrate/v4/source/github"
1313

14-
"github.com/google/go-github/v35/github"
14+
"github.com/google/go-github/v39/github"
1515
)
1616

1717
func init() {

0 commit comments

Comments
 (0)