From 91202855fd762d451557b005f524b3cf0a7b747a Mon Sep 17 00:00:00 2001 From: laurentsimon <64505099+laurentsimon@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:16:38 -0700 Subject: [PATCH] Fix e2e branch (#1835) --- clients/githubrepo/branches_e2e_test.go | 2 ++ clients/githubrepo/githubrepo_suite_test.go | 26 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/clients/githubrepo/branches_e2e_test.go b/clients/githubrepo/branches_e2e_test.go index e905dd80..fa617817 100644 --- a/clients/githubrepo/branches_e2e_test.go +++ b/clients/githubrepo/branches_e2e_test.go @@ -33,6 +33,8 @@ var _ = Describe("E2E TEST: githubrepo.branchesHandler", func() { }) Context("E2E TEST: Validate query cost", func() { + skipIfTokenIsNot(githubWorkflowDefaultTokenType, "GITHUB_TOKEN only") + It("Should not have increased for HEAD query", func() { repourl := &repoURL{ owner: "ossf", diff --git a/clients/githubrepo/githubrepo_suite_test.go b/clients/githubrepo/githubrepo_suite_test.go index 13ecb8fb..1fbb72b4 100644 --- a/clients/githubrepo/githubrepo_suite_test.go +++ b/clients/githubrepo/githubrepo_suite_test.go @@ -16,6 +16,7 @@ package githubrepo import ( "context" + "fmt" "net/http" "os" "testing" @@ -39,6 +40,21 @@ func TestGithubrepo(t *testing.T) { var graphClient *githubv4.Client +type tokenType int + +const ( + patTokenType tokenType = iota + githubWorkflowDefaultTokenType +) + +var tokType tokenType + +func skipIfTokenIsNot(t tokenType, msg string) { + if tokType != t { + Skip(msg) + } +} + var _ = BeforeSuite(func() { ctx := context.Background() logger := log.NewLogger(log.DebugLevel) @@ -47,4 +63,14 @@ var _ = BeforeSuite(func() { Transport: rt, } graphClient = githubv4.NewClient(httpClient) + + tt := os.Getenv("TOKEN_TYPE") + switch tt { + case "PAT": + tokType = patTokenType + case "GITHUB_TOKEN": + tokType = githubWorkflowDefaultTokenType + default: + panic(fmt.Sprintf("invald TOKEN_TYPE: %s", tt)) + } })