Skip to content
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

Jump to bottom

Fix linter suggestions #142

Merged
merged 1 commit into from
Apr 28, 2023
Merged

Fix linter suggestions #142

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion aconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func (l *Loader) postFlagCheck(values map[string]interface{}, dupls map[string]s
return nil
}

// TODO(cristaloleg): revisit
// TODO(cristaloleg): revisit.
func (l *Loader) setField(field *fieldData, name string, values map[string]interface{}, dupls map[string]struct{}) error {
if !l.config.AllowDuplicates {
if _, ok := dupls[name]; ok {
Expand Down
67 changes: 31 additions & 36 deletions aconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,13 @@ func TestNoFileFlagValue(t *testing.T) {
}

func TestEnv(t *testing.T) {
setEnv(t, "TST_STR", "str-env")
setEnv(t, "TST_BYTES", "bytes-env")
setEnv(t, "TST_INT", "121")
setEnv(t, "TST_HTTP_PORT", "3000")
setEnv(t, "TST_SUB_FLOAT", "222.333")
setEnv(t, "TST_ANON_IS_ANON", "true")
setEnv(t, "TST_EM", "em-env")
t.Setenv("TST_STR", "str-env")
t.Setenv("TST_BYTES", "bytes-env")
t.Setenv("TST_INT", "121")
t.Setenv("TST_HTTP_PORT", "3000")
t.Setenv("TST_SUB_FLOAT", "222.333")
t.Setenv("TST_ANON_IS_ANON", "true")
t.Setenv("TST_EM", "em-env")
defer os.Clearenv()

var cfg TestConfig
Expand Down Expand Up @@ -442,8 +442,8 @@ func TestFlag(t *testing.T) {
}

func TestExactName(t *testing.T) {
setEnv(t, "STR", "str-env")
setEnv(t, "TST_STR", "bar-env")
t.Setenv("STR", "str-env")
t.Setenv("TST_STR", "bar-env")
defer os.Clearenv()

type Foo struct {
Expand Down Expand Up @@ -475,8 +475,8 @@ func TestExactName(t *testing.T) {
}

func TestSkipName(t *testing.T) {
setEnv(t, "STR", "str-env")
setEnv(t, "BAR", "bar-env")
t.Setenv("STR", "str-env")
t.Setenv("BAR", "bar-env")
defer os.Clearenv()

type Foo struct {
Expand Down Expand Up @@ -505,7 +505,7 @@ func TestSkipName(t *testing.T) {
}

func TestDuplicatedName(t *testing.T) {
setEnv(t, "FOO_BAR", "str-env")
t.Setenv("FOO_BAR", "str-env")
defer os.Clearenv()

type Foo struct {
Expand Down Expand Up @@ -719,7 +719,7 @@ func TestFailOnFileNotFound(t *testing.T) {
}

func TestBadEnvs(t *testing.T) {
setEnv(t, "TST_HTTP_PORT", "30a00")
t.Setenv("TST_HTTP_PORT", "30a00")
defer os.Clearenv()

loader := LoaderFor(&TestConfig{}, Config{
Expand Down Expand Up @@ -766,9 +766,9 @@ func TestUnknownFields(t *testing.T) {
}

func TestUnknownEnvs(t *testing.T) {
setEnv(t, "TST_STR", "defined")
setEnv(t, "TST_UNKNOWN", "42")
setEnv(t, "JUST_ENV", "JUST_VALUE")
t.Setenv("TST_STR", "defined")
t.Setenv("TST_UNKNOWN", "42")
t.Setenv("JUST_ENV", "JUST_VALUE")
defer os.Clearenv()

var cfg TestConfig
Expand All @@ -788,8 +788,8 @@ func TestUnknownEnvs(t *testing.T) {
}

func TestUnknownEnvsWithEmptyPrefix(t *testing.T) {
setEnv(t, "STR", "defined")
setEnv(t, "UNKNOWN", "42")
t.Setenv("STR", "defined")
t.Setenv("UNKNOWN", "42")
defer os.Clearenv()

var cfg TestConfig
Expand Down Expand Up @@ -857,7 +857,7 @@ func TestUnknownFlagsWithEmptyPrefix(t *testing.T) {
failIfErr(t, loader.Load())
}

// flag.FlagSet already fails on undefined flag
// flag.FlagSet already fails on undefined flag.
func TestUnknownFlagsStdlib(t *testing.T) {
loader := LoaderFor(&TestConfig{}, Config{
SkipDefaults: true,
Expand Down Expand Up @@ -902,8 +902,8 @@ func TestCustomNames(t *testing.T) {
C int `default:"-1" env:"three" flag:"four"`
}

setEnv(t, "ONE", "1")
setEnv(t, "three", "3")
t.Setenv("ONE", "1")
t.Setenv("three", "3")
defer os.Clearenv()

var cfg TestConfig
Expand Down Expand Up @@ -1087,10 +1087,6 @@ func TestBadRequiredTag(t *testing.T) {
f(&TestConfig{})
}

func setEnv(t *testing.T, key, value string) {
failIfErr(t, os.Setenv(key, value))
}

func int32Ptr(a int32) *int32 {
return &a
}
Expand Down Expand Up @@ -1336,8 +1332,7 @@ func TestBad(t *testing.T) {
Params url.Values
}
var cfg TestConfig
os.Setenv("PARAMS", "foo:bar")
defer os.Unsetenv("PARAMS")
t.Setenv("PARAMS", "foo:bar")

loader := LoaderFor(&cfg, Config{
SkipFlags: true,
Expand Down Expand Up @@ -1417,23 +1412,23 @@ func TestSliceOfStructsWithSliceOfPrimitives(t *testing.T) {
mustEqual(t, cfg, want)
}

func failIfOk(t testing.TB, err error) {
t.Helper()
func failIfOk(tb testing.TB, err error) {
tb.Helper()
if err == nil {
t.Fatal("must be non-nil")
tb.Fatal("must be non-nil")
}
}

func failIfErr(t testing.TB, err error) {
t.Helper()
func failIfErr(tb testing.TB, err error) {
tb.Helper()
if err != nil {
t.Fatal(err)
tb.Fatal(err)
}
}

func mustEqual(t testing.TB, got, want interface{}) {
t.Helper()
func mustEqual(tb testing.TB, got, want interface{}) {
tb.Helper()
if !reflect.DeepEqual(got, want) {
t.Fatalf("\nhave %+v\nwant %+v", got, want)
tb.Fatalf("\nhave %+v\nwant %+v", got, want)
}
}
2 changes: 1 addition & 1 deletion utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func sliceToString(curr interface{}) string {
if i > 0 {
b.WriteByte(',')
}
b.WriteString(fmt.Sprint(v))
fmt.Fprint(b, v)
}
return b.String()
case string:
Expand Down