Skip to content

Commit 602aa37

Browse files
codysoylandjaffee
authored andcommitted
Generate uppercase env var names in LoadEnv (#8)
1 parent 4d43b78 commit 602aa37

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

com.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func Run(main interface{}) error {
6767
var replacer *strings.Replacer = strings.NewReplacer("-", "_", ".", "_")
6868

6969
func envNorm(name string) string {
70-
return replacer.Replace(name)
70+
return strings.ToUpper(replacer.Replace(name))
7171
}
7272

7373
// loadEnv visits each flag in the FlagSet and sets its value based on

com_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func TestLoadEnv(t *testing.T) {
3636

3737
// set up environment
3838
prefix := "COMMANDEER_"
39-
err = os.Setenv("COMMANDEER_one", "z")
39+
err = os.Setenv("COMMANDEER_ONE", "z")
4040
if err != nil {
4141
t.Fatalf("setting up environment for set: %v", err)
4242
}
43-
defer os.Unsetenv("COMMANDEER_one")
43+
defer os.Unsetenv("COMMANDEER_ONE")
4444

4545
// change values on instance by reading environment
4646
err = loadEnv(fs, prefix)
@@ -71,17 +71,17 @@ func TestLoadEnv(t *testing.T) {
7171
mm.Five = 55
7272

7373
// reload environment
74-
err = os.Setenv("COMMANDEER_five", "56")
74+
err = os.Setenv("COMMANDEER_FIVE", "56")
7575
if err != nil {
7676
t.Fatalf("setting up environment for set: %v", err)
7777
}
78-
defer os.Unsetenv("COMMANDEER_five")
78+
defer os.Unsetenv("COMMANDEER_FIVE")
7979

80-
err = os.Setenv("COMMANDEER_two", "23")
80+
err = os.Setenv("COMMANDEER_TWO", "23")
8181
if err != nil {
8282
t.Fatalf("setting up environment for set: %v", err)
8383
}
84-
defer os.Unsetenv("COMMANDEER_two")
84+
defer os.Unsetenv("COMMANDEER_TWO")
8585

8686
err = loadEnv(fs, prefix)
8787
if err != nil {
@@ -113,8 +113,8 @@ func TestLoadEnv(t *testing.T) {
113113

114114
func TestLoadArgsEnv(t *testing.T) {
115115
mm := test.NewSimpleMain()
116-
mustSetenv(t, "COMMANDEER_one", "envone")
117-
mustSetenv(t, "COMMANDEER_two", "32")
116+
mustSetenv(t, "COMMANDEER_ONE", "envone")
117+
mustSetenv(t, "COMMANDEER_TWO", "32")
118118

119119
fs := flag.NewFlagSet("", flag.ExitOnError)
120120
err := LoadArgsEnv(fs, mm, []string{"-two=24", "-seven", "7.3", "-nine", "a,b,c"}, "COMMANDEER_", nil)

0 commit comments

Comments
 (0)