Apply suggestions from code review

Co-authored-by: Stephen Lewis (Burrows) <[email protected]>
GoogleCloudPlatform · Mar 5, 2024 · 924bd7f · 924bd7f
1 parent 7ed4c2a
commit 924bd7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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")