Skip to content

Commit 686bc50

Browse files
committed
Use Client.WithAuthToken
google/go-github#2904 added support for bypassing github.com/x/oauth2. Use it.
1 parent 5ac37d1 commit 686bc50

3 files changed

Lines changed: 11 additions & 47 deletions

File tree

‎cmd/coverpkg-gha/comment.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@ import (
1111
"strings"
1212
"text/template"
1313

14-
"github.com/google/go-github/v34/github"
15-
"golang.org/x/oauth2"
14+
"github.com/google/go-github/v57/github"
1615

1716
"github.com/mutility/diag"
1817
)
1918

2019
func loadMeta(ctx diag.Context, event *GitHubEvent, name, file string, detail *details) error {
21-
tok := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: detail.APIToken})
22-
2320
artifacts := wfartifacts{
24-
client: github.NewClient(oauth2.NewClient(ctx, tok)),
21+
client: github.NewClient(nil).WithAuthToken(detail.APIToken),
2522
owner: event.String(ctx, "repository.owner.login"),
2623
repo: event.String(ctx, "repository.name"),
2724
}
@@ -83,7 +80,7 @@ func (a *wfartifacts) find(ctx diag.Context, runID int64, name string) *github.A
8380
}
8481

8582
func (a *wfartifacts) download(ctx diag.Context, art *github.Artifact) *url.URL {
86-
url, _, err := a.client.Actions.DownloadArtifact(ctx, a.owner, a.repo, art.GetID(), true)
83+
url, _, err := a.client.Actions.DownloadArtifact(ctx, a.owner, a.repo, art.GetID(), 5)
8784
if err != nil {
8885
diag.Warning(ctx, "sourcing artifact:", err)
8986
return nil
@@ -97,9 +94,8 @@ func doComment(ctx diag.Context, event *GitHubEvent, detail *details) (int64, er
9794
return 0, nil
9895
}
9996

100-
tok := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: detail.APIToken})
10197
prcomment := issuecomments{
102-
client: github.NewClient(oauth2.NewClient(ctx, tok)),
98+
client: github.NewClient(nil).WithAuthToken(detail.APIToken),
10399
owner: event.String(ctx, "repository.owner.login"),
104100
repo: event.String(ctx, "repository.name"),
105101
issue: detail.IssueNumber,

‎go.mod‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,14 @@ go 1.18
44

55
require (
66
github.com/google/go-cmp v0.6.0
7-
github.com/google/go-github/v34 v34.0.0
7+
github.com/google/go-github/v57 v57.0.0
88
github.com/mutility/diag v1.2.0
99
github.com/urfave/cli/v2 v2.27.1
10-
golang.org/x/oauth2 v0.15.0
1110
)
1211

1312
require (
1413
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
15-
github.com/golang/protobuf v1.5.3 // indirect
16-
github.com/google/go-querystring v1.0.0 // indirect
14+
github.com/google/go-querystring v1.1.0 // indirect
1715
github.com/russross/blackfriday/v2 v2.1.0 // indirect
1816
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
19-
golang.org/x/crypto v0.16.0 // indirect
20-
golang.org/x/net v0.19.0 // indirect
21-
google.golang.org/appengine v1.6.7 // indirect
22-
google.golang.org/protobuf v1.31.0 // indirect
2317
)

‎go.sum‎

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
22
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
3-
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
4-
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
5-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
6-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
7-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
8-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
3+
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
94
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
105
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
11-
github.com/google/go-github/v34 v34.0.0 h1:/siYFImY8KwGc5QD1gaPf+f8QX6tLwxNIco2RkYxoFA=
12-
github.com/google/go-github/v34 v34.0.0/go.mod h1:w/2qlrXUfty+lbyO6tatnzIw97v1CM+/jZcwXMDiPQQ=
13-
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
14-
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
6+
github.com/google/go-github/v57 v57.0.0 h1:L+Y3UPTY8ALM8x+TV0lg+IEBI+upibemtBD8Q9u7zHs=
7+
github.com/google/go-github/v57 v57.0.0/go.mod h1:s0omdnye0hvK/ecLvpsGfJMiRt85PimQh4oygmLIxHw=
8+
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
9+
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
1510
github.com/mutility/diag v1.2.0 h1:gns22xpIi+0CWOx+FP2ch1kK/339o9ATg8TulhwB+4g=
1611
github.com/mutility/diag v1.2.0/go.mod h1:e8VmlykIpHZwpkJn9+sUs2uNXZdcMAJdATW+6CrGnuc=
1712
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -20,25 +15,4 @@ github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
2015
github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
2116
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
2217
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
23-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
24-
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
25-
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
26-
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
27-
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
28-
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
29-
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
30-
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
31-
golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
32-
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
33-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
34-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
35-
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
36-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
3718
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
38-
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
39-
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
40-
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
41-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
42-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
43-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
44-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

0 commit comments

Comments
 (0)