From 8676d279db5880e57dd13932900ebb29519c5609 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 13 Jul 2022 19:26:02 +0200 Subject: [PATCH] Fix nolint issues Reference -> https://golangci-lint.run/usage/false-positives/#nolint-directive Signed-off-by: Ulysses Souza --- dotenv/godotenv.go | 2 +- loader/loader.go | 2 +- loader/merge.go | 4 ++-- loader/windows_path.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dotenv/godotenv.go b/dotenv/godotenv.go index a156a544..7e705e09 100644 --- a/dotenv/godotenv.go +++ b/dotenv/godotenv.go @@ -183,7 +183,7 @@ func Marshal(envMap map[string]string) (string, error) { if d, err := strconv.Atoi(v); err == nil { lines = append(lines, fmt.Sprintf(`%s=%d`, k, d)) } else { - lines = append(lines, fmt.Sprintf(`%s="%s"`, k, doubleQuoteEscape(v))) // nolint Cannot use %q here + lines = append(lines, fmt.Sprintf(`%s="%s"`, k, doubleQuoteEscape(v))) //nolint // Cannot use %q here } } sort.Strings(lines) diff --git a/loader/loader.go b/loader/loader.go index eb05df2d..2394ed15 100644 --- a/loader/loader.go +++ b/loader/loader.go @@ -637,7 +637,7 @@ func resolveEnvironment(serviceConfig *types.ServiceConfig, workingDir string, l } // Do not defer to avoid it inside a loop - file.Close() // nolint:errcheck + file.Close() //nolint:errcheck fileVars, err := dotenv.ParseWithLookup(bytes.NewBuffer(b), dotenv.LookupFn(lookupEnv)) if err != nil { diff --git a/loader/merge.go b/loader/merge.go index f6138ca2..bf10cf77 100644 --- a/loader/merge.go +++ b/loader/merge.go @@ -299,7 +299,7 @@ func mergeLoggingConfig(dst, src reflect.Value) error { return nil } -// nolint: unparam +//nolint: unparam func mergeUlimitsConfig(dst, src reflect.Value) error { if src.Interface() != reflect.Zero(reflect.TypeOf(src.Interface())).Interface() { dst.Elem().Set(src.Elem()) @@ -307,7 +307,7 @@ func mergeUlimitsConfig(dst, src reflect.Value) error { return nil } -// nolint: unparam +//nolint: unparam func mergeServiceNetworkConfig(dst, src reflect.Value) error { if src.Interface() != reflect.Zero(reflect.TypeOf(src.Interface())).Interface() { dst.Elem().FieldByName("Aliases").Set(src.Elem().FieldByName("Aliases")) diff --git a/loader/windows_path.go b/loader/windows_path.go index 5094f5b5..e8826108 100644 --- a/loader/windows_path.go +++ b/loader/windows_path.go @@ -44,7 +44,7 @@ func isAbs(path string) (b bool) { // volumeNameLen returns length of the leading volume name on Windows. // It returns 0 elsewhere. -// nolint: gocyclo +//nolint: gocyclo func volumeNameLen(path string) int { if len(path) < 2 { return 0