refactor: Move environment variables to constants (#98)

obalunenko · web-flow · commit 81bbf52ef54a · 2022-02-18T20:02:50.000+03:00
diff --git a/cmd/aoc-cli/flags.go b/cmd/aoc-cli/flags.go
@@ -2,6 +2,8 @@ package main
 
 import (
 	"github.com/urfave/cli/v2"
+
+	"github.com/obalunenko/advent-of-code/internal/puzzles"
 )
 
 const (
@@ -48,7 +50,7 @@ func cmdRunFlags() []cli.Flag {
 		Name:        flagSession,
 		Aliases:     []string{flagShortSession},
 		Usage:       "AOC auth session to get inputs",
-		EnvVars:     []string{"AOC_SESSION"},
+		EnvVars:     []string{puzzles.AOCSession},
 		FilePath:    "",
 		Required:    true,
 		Hidden:      false,
diff --git a/internal/puzzles/constants.go b/internal/puzzles/constants.go
@@ -61,4 +61,7 @@ const (
 	unsolved   = "not solved"
 	undefined  = "undefined"
 	inProgress = "in progress"
+
+	// AOCSession env variable name.
+	AOCSession = "AOC_SESSION"
 )
diff --git a/tests/regression_test.go b/tests/regression_test.go
@@ -25,15 +25,19 @@ type testcase struct {
 	wantErr bool
 }
 
+const (
+	regressionEnabled = "AOC_REGRESSION_ENABLED"
+)
+
 // Regression tests for all puzzles. Check that answers still correct.
 func TestRun(t *testing.T) {
-	if !getenv.BoolOrDefault("AOC_REGRESSION_ENABLED", false) {
-		t.Skip("Regression test disabled")
+	if !getenv.BoolOrDefault(regressionEnabled, false) {
+		t.Skipf("%s disabled", regressionEnabled)
 	}
 
-	session := getenv.StringOrDefault("AOC_SESSION", "")
+	session := getenv.StringOrDefault(puzzles.AOCSession, "")
 	if session == "" {
-		t.Fatal("AOC_SESSION not set")
+		t.Fatalf("%s not set", puzzles.AOCSession)
 	}
 
 	ctx := command.ContextWithSession(context.Background(), session)

Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,7 @@ const (`
`61`	`61`	`unsolved = "not solved"`
`62`	`62`	`undefined = "undefined"`
`63`	`63`	`inProgress = "in progress"`
	`64`	`+`
	`65`	`+ // AOCSession env variable name.`
	`66`	`+ AOCSession = "AOC_SESSION"`
`64`	`67`	`)`