From c0ee8db84eb2710e19d9a1b67125c895f501bf6e Mon Sep 17 00:00:00 2001 From: laurentsimon Date: Thu, 16 Jun 2022 23:29:34 +0000 Subject: [PATCH] updates --- options/env.go | 9 +++++---- options/options.go | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/options/env.go b/options/env.go index 33354ccf..26879799 100644 --- a/options/env.go +++ b/options/env.go @@ -37,10 +37,11 @@ const ( // TODO(input): INPUT_ constants should be removed in a future release once // they have replacements in upstream scorecard. - EnvInputRepoToken = "INPUT_REPO_TOKEN" //nolint:gosec - EnvInputResultsFile = "INPUT_RESULTS_FILE" - EnvInputResultsFormat = "INPUT_RESULTS_FORMAT" - EnvInputPublishResults = "INPUT_PUBLISH_RESULTS" + EnvInputRepoToken = "INPUT_REPO_TOKEN" //nolint:gosec + EnvInputInternalRepoToken = "INPUT_INTERNAL_DEFAULT_TOKEN" //nolint:gosec + EnvInputResultsFile = "INPUT_RESULTS_FILE" + EnvInputResultsFormat = "INPUT_RESULTS_FORMAT" + EnvInputPublishResults = "INPUT_PUBLISH_RESULTS" ) // Errors diff --git a/options/options.go b/options/options.go index ab19218a..649636e7 100644 --- a/options/options.go +++ b/options/options.go @@ -143,10 +143,10 @@ func (o *Options) Print() { func (o *Options) setScorecardOpts() { o.ScorecardOpts = scopts.New() - // GITHUB_AUTH_TOKEN - _, tokenSet := os.LookupEnv(EnvGithubAuthToken) - if !tokenSet { - inputToken := os.Getenv(EnvInputRepoToken) + // Set GITHUB_AUTH_TOKEN + inputToken := os.Getenv(EnvInputRepoToken) + if inputToken == "" { + inputToken := os.Getenv(EnvInputInternalRepoToken) os.Setenv(EnvGithubAuthToken, inputToken) }