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.

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

Re-add support for github auth from the GITHUB_TOKEN env variable. #1556

Merged
merged 1 commit into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion cmd/pullrequest-init/github.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
package main

import (
"context"
"fmt"
"net/url"
"os"
"strconv"
"strings"

"golang.org/x/oauth2"

"github.com/jenkins-x/go-scm/scm/driver/github"
"go.uber.org/zap"
)

func NewGitHubHandler(logger *zap.SugaredLogger, raw string) (*Handler, error) {
func NewGitHubHandler(ctx context.Context, logger *zap.SugaredLogger, raw string) (*Handler, error) {
u, err := url.Parse(raw)
if err != nil {
return nil, err
Expand All @@ -26,6 +30,14 @@ func NewGitHubHandler(logger *zap.SugaredLogger, raw string) (*Handler, error) {
}

client := github.NewDefault()
token := os.Getenv("GITHUB_TOKEN")
if token != "" {
ts := oauth2.StaticTokenSource(
&oauth2.Token{AccessToken: token},
)
hc := oauth2.NewClient(ctx, ts)
client.Client = hc
}
ownerRepo := fmt.Sprintf("%s/%s", owner, repo)
return NewHandler(logger, client, ownerRepo, prNumber), nil
}
3 changes: 2 additions & 1 deletion cmd/pullrequest-init/github_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"context"
"testing"

"go.uber.org/zap"
Expand All @@ -13,7 +14,7 @@ func TestNewGitHubHandler(t *testing.T) {
"https://github.tekton.dev/foo/bar/pull/1",
} {
t.Run(url, func(t *testing.T) {
h, err := NewGitHubHandler(zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())).Sugar(), url)
h, err := NewGitHubHandler(context.Background(), zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller())).Sugar(), url)
if err != nil {
t.Fatalf("error creating GitHubHandler: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/pullrequest-init/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func main() {
defer logger.Sync()
ctx := context.Background()

client, err := NewGitHubHandler(logger, *prURL)
client, err := NewGitHubHandler(ctx, logger, *prURL)
if err != nil {
logger.Fatalf("error creating GitHub client: %v", err)
}
Expand Down