From b6bab7618f73cabc79a6f4e35d61683456d20ad5 Mon Sep 17 00:00:00 2001 From: dwertent Date: Thu, 24 Mar 2022 12:15:54 +0200 Subject: [PATCH] loading github token from env --- .github/workflows/build.yaml | 2 ++ .github/workflows/build_dev.yaml | 2 ++ .github/workflows/master_pr_checks.yaml | 2 ++ core/pkg/resourcehandler/repositoryscanner.go | 17 ++++++++++++----- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 247f1e2b..96643595 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,6 +38,8 @@ jobs: run: cd cmd && go test -v ./... - name: Test core pkg + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: cd core && go test -v ./... - name: Test httphandler pkg diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 51526340..805dd659 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -22,6 +22,8 @@ jobs: run: cd cmd && go test -v ./... - name: Test core pkg + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: cd core && go test -v ./... - name: Test httphandler pkg diff --git a/.github/workflows/master_pr_checks.yaml b/.github/workflows/master_pr_checks.yaml index 1cc5d873..91245d8d 100644 --- a/.github/workflows/master_pr_checks.yaml +++ b/.github/workflows/master_pr_checks.yaml @@ -23,6 +23,8 @@ jobs: run: cd cmd && go test -v ./... - name: Test core pkg + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: cd core && go test -v ./... - name: Test httphandler pkg diff --git a/core/pkg/resourcehandler/repositoryscanner.go b/core/pkg/resourcehandler/repositoryscanner.go index 9997e3b1..0ba5e9da 100644 --- a/core/pkg/resourcehandler/repositoryscanner.go +++ b/core/pkg/resourcehandler/repositoryscanner.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "net/http" + "os" "path/filepath" "strings" @@ -40,6 +41,7 @@ type GitHubRepository struct { repo string // branch string path string + token string isFile bool tree tree } @@ -49,8 +51,8 @@ type githubDefaultBranchAPI struct { func NewGitHubRepository() *GitHubRepository { return &GitHubRepository{ - host: "github.com", - // name: rep, + host: "github.com", + token: os.Getenv("GITHUB_TOKEN"), } } @@ -165,7 +167,7 @@ func (g *GitHubRepository) setBranch(branchOptional string) error { if g.branch != "" { return nil } - body, err := getter.HttpGetter(&http.Client{}, g.defaultBranchAPI(), nil) + body, err := getter.HttpGetter(&http.Client{}, g.defaultBranchAPI(), g.getHeaders()) if err != nil { return err } @@ -185,9 +187,14 @@ func joinOwnerNRepo(owner, repo string) string { func (g *GitHubRepository) defaultBranchAPI() string { return fmt.Sprintf("https://api.github.com/repos/%s", joinOwnerNRepo(g.owner, g.repo)) } - +func (g *GitHubRepository) getHeaders() map[string]string { + if g.token == "" { + return nil + } + return map[string]string{"Authorization": fmt.Sprintf("token %s", g.token)} +} func (g *GitHubRepository) setTree() error { - body, err := getter.HttpGetter(&http.Client{}, g.treeAPI(), nil) + body, err := getter.HttpGetter(&http.Client{}, g.treeAPI(), g.getHeaders()) if err != nil { return err }