From 924bd7fe3b7606e37f88d00f5509e735cdcb9976 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Tue, 5 Mar 2024 13:15:55 -0800 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Stephen Lewis (Burrows) --- .ci/magician/cmd/generate_comment.go | 7 +++---- .ci/magician/cmd/test_terraform_vcr.go | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.ci/magician/cmd/generate_comment.go b/.ci/magician/cmd/generate_comment.go index b78bbf35fd3c..e3cf08a549ed 100644 --- a/.ci/magician/cmd/generate_comment.go +++ b/.ci/magician/cmd/generate_comment.go @@ -71,11 +71,10 @@ var generateCommentCmd = &cobra.Command{ for _, tokenName := range []string{"GITHUB_TOKEN_DOWNSTREAMS", "GITHUB_TOKEN_MAGIC_MODULES"} { val, ok := lookupGithubTokenOrFallback(tokenName) - if !ok { - fmt.Printf("Did not provide %s or GITHUB_TOKEN environment variable\n", tokenName) - os.Exit(1) + if ok { + env[tokenName] = val + break } - env[tokenName] = val } gh := github.NewClient(env["GITHUB_TOKEN_MAGIC_MODULES"]) rnr, err := exec.NewRunner() diff --git a/.ci/magician/cmd/test_terraform_vcr.go b/.ci/magician/cmd/test_terraform_vcr.go index 60fda5577d82..a85d520c6f47 100644 --- a/.ci/magician/cmd/test_terraform_vcr.go +++ b/.ci/magician/cmd/test_terraform_vcr.go @@ -55,11 +55,10 @@ var testTerraformVCRCmd = &cobra.Command{ for _, tokenName := range []string{"GITHUB_TOKEN_DOWNSTREAMS", "GITHUB_TOKEN_MAGIC_MODULES"} { val, ok := lookupGithubTokenOrFallback(tokenName) - if !ok { - fmt.Printf("Did not provide %s or GITHUB_TOKEN environment variable\n", tokenName) - os.Exit(1) + if ok { + env[tokenName] = val + break } - env[tokenName] = val } baseBranch := os.Getenv("BASE_BRANCH")