这是indexloc提供的服务，不要输入任何密码
Skip to content

Generate uppercase env var names in LoadEnv #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2019
Merged

Generate uppercase env var names in LoadEnv #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion com.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func Run(main interface{}) error {
var replacer *strings.Replacer = strings.NewReplacer("-", "_", ".", "_")

func envNorm(name string) string {
return replacer.Replace(name)
return strings.ToUpper(replacer.Replace(name))
}

// loadEnv visits each flag in the FlagSet and sets its value based on
Expand Down
16 changes: 8 additions & 8 deletions com_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ func TestLoadEnv(t *testing.T) {

// set up environment
prefix := "COMMANDEER_"
err = os.Setenv("COMMANDEER_one", "z")
err = os.Setenv("COMMANDEER_ONE", "z")
if err != nil {
t.Fatalf("setting up environment for set: %v", err)
}
defer os.Unsetenv("COMMANDEER_one")
defer os.Unsetenv("COMMANDEER_ONE")

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

// reload environment
err = os.Setenv("COMMANDEER_five", "56")
err = os.Setenv("COMMANDEER_FIVE", "56")
if err != nil {
t.Fatalf("setting up environment for set: %v", err)
}
defer os.Unsetenv("COMMANDEER_five")
defer os.Unsetenv("COMMANDEER_FIVE")

err = os.Setenv("COMMANDEER_two", "23")
err = os.Setenv("COMMANDEER_TWO", "23")
if err != nil {
t.Fatalf("setting up environment for set: %v", err)
}
defer os.Unsetenv("COMMANDEER_two")
defer os.Unsetenv("COMMANDEER_TWO")

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

func TestLoadArgsEnv(t *testing.T) {
mm := test.NewSimpleMain()
mustSetenv(t, "COMMANDEER_one", "envone")
mustSetenv(t, "COMMANDEER_two", "32")
mustSetenv(t, "COMMANDEER_ONE", "envone")
mustSetenv(t, "COMMANDEER_TWO", "32")

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