chore: add support for usetesting, nlreturn and exptostd (#4499)

Author: remyleone

.golangci.yml

@@ -19,6 +19,7 @@ linters:
     - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false]
     - errchkjson # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted. [fast: false, auto-fix: false]
     - errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false]
+    - exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix]
     - gci # Gci controls golang package import order and makes it always deterministic. [fast: true, auto-fix: false]
     - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false]
     - gochecksumtype # Run exhaustiveness checks on Go "sum types" [fast: false, auto-fix: false]
@@ -46,6 +47,7 @@ linters:
     - musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
     - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
     - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
+    - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
     - nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
     - nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL. [fast: true, auto-fix: false]
     - perfsprint # Checks that fmt.Sprintf can be replaced with a faster alternative. [fast: false, auto-fix: false]
@@ -70,6 +72,7 @@ linters:
     - unparam # Reports unused function parameters [fast: false, auto-fix: false]
     - unused #(megacheck): Checks Go code for unused constants, variables, functions and types [fast: false, auto-fix: false]
     - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library. [fast: true, auto-fix: false]
+    - usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
     - wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
     - whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
     - zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
@@ -92,7 +95,6 @@ linters:
     - maintidx # maintidx measures the maintainability index of each function. [fast: true, auto-fix: false]
     - nestif # Reports deeply nested if statements [fast: true, auto-fix: false]
     - nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value. [fast: false, auto-fix: false]
-    - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
     - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
     - wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
 

cmd/scw-sweeper/main.go

@@ -47,6 +47,7 @@ func getConfigProfile() *scw.Profile {
 	if err != nil {
 		return &scw.Profile{}
 	}
+
 	return profile
 }
 
@@ -189,12 +190,14 @@ func mainNoExit() int {
 	err = vpcgwSweeper.SweepAllLocalities(client)
 	if err != nil {
 		log.Fatalf("Error sweeping vpcgw: %s", err)
+
 		return -1
 	}
 
 	err = webhostingSweeper.SweepAllLocalities(client)
 	if err != nil {
 		log.Fatalf("Error sweeping webhosting: %s", err)
+
 		return -1
 	}
 

cmd/scw/main.go

@@ -56,8 +56,10 @@ func buildVersion() string {
 		if ok && buildInfos.Main.Version != "(devel)" && buildInfos.Main.Version != "" {
 			return buildInfos.Main.Version
 		}
+
 		return "v2+dev"
 	}
+
 	return Version
 }
 

core/alias.go

@@ -6,5 +6,6 @@ func aliasDisabled(cmd string) bool {
 	case "alias", "autocomplete", "init":
 		return true
 	}
+
 	return false
 }

core/arg_specs.go

@@ -24,6 +24,7 @@ func (s ArgSpecs) GetPositionalArg() *ArgSpec {
 			positionalArg = argSpec
 		}
 	}
+
 	return positionalArg
 }
 
@@ -35,6 +36,7 @@ func (s ArgSpecs) GetDeprecated(deprecated bool) ArgSpecs {
 			result = append(result, argSpec)
 		}
 	}
+
 	return result
 }
 
@@ -44,13 +46,15 @@ func (s ArgSpecs) GetByName(name string) *ArgSpec {
 			return spec
 		}
 	}
+
 	return nil
 }
 
 func (s *ArgSpecs) DeleteByName(name string) {
 	for i, spec := range *s {
 		if spec.Name == name {
 			*s = append((*s)[:i], (*s)[i+1:]...)
+
 			return
 		}
 	}
@@ -65,6 +69,7 @@ func (s *ArgSpecs) AddBefore(name string, argSpec *ArgSpec) {
 			newSpecs = append(newSpecs, argSpec)
 			newSpecs = append(newSpecs, (*s)[i:]...)
 			*s = newSpecs
+
 			return
 		}
 	}
@@ -127,6 +132,7 @@ func ZoneArgSpec(zones ...scw.Zone) *ArgSpec {
 	for _, zone := range zones {
 		enumValues = append(enumValues, zone.String())
 	}
+
 	return &ArgSpec{
 		Name:       "zone",
 		Short:      "Zone to target. If none is passed will use default zone from the config",
@@ -140,6 +146,7 @@ func ZoneArgSpec(zones ...scw.Zone) *ArgSpec {
 			if validation.IsZone(value.(scw.Zone).String()) {
 				return nil
 			}
+
 			return &CliError{
 				Err:  fmt.Errorf("invalid zone %s", value),
 				Hint: "Zone format should look like XX-XXX-X (e.g. fr-par-1)",
@@ -148,6 +155,7 @@ func ZoneArgSpec(zones ...scw.Zone) *ArgSpec {
 		Default: func(ctx context.Context) (value string, doc string) {
 			client := ExtractClient(ctx)
 			zone, _ := client.GetDefaultZone()
+
 			return zone.String(), zone.String()
 		},
 	}
@@ -158,6 +166,7 @@ func RegionArgSpec(regions ...scw.Region) *ArgSpec {
 	for _, region := range regions {
 		enumValues = append(enumValues, region.String())
 	}
+
 	return &ArgSpec{
 		Name:       "region",
 		Short:      "Region to target. If none is passed will use default region from the config",
@@ -171,6 +180,7 @@ func RegionArgSpec(regions ...scw.Region) *ArgSpec {
 			if validation.IsRegion(value.(scw.Region).String()) {
 				return nil
 			}
+
 			return &CliError{
 				Err:  fmt.Errorf("invalid region %s", value),
 				Hint: "Region format should look like XX-XXX (e.g. fr-par)",
@@ -179,6 +189,7 @@ func RegionArgSpec(regions ...scw.Region) *ArgSpec {
 		Default: func(ctx context.Context) (value string, doc string) {
 			client := ExtractClient(ctx)
 			region, _ := client.GetDefaultRegion()
+
 			return region.String(), region.String()
 		},
 	}

core/autocomplete.go

@@ -67,6 +67,7 @@ func (node *AutoCompleteNode) addFlags(flags []FlagSpec) {
 // newAutoCompleteResponse builds a new AutocompleteResponse
 func newAutoCompleteResponse(suggestions []string) *AutocompleteResponse {
 	sort.Strings(suggestions)
+
 	return &AutocompleteResponse{
 		Suggestions: suggestions,
 	}
@@ -80,6 +81,7 @@ func NewAutoCompleteCommandNode(flags []FlagSpec) *AutoCompleteNode {
 		Type:     AutoCompleteNodeTypeCommand,
 	}
 	node.addFlags(flags)
+
 	return node
 }
 
@@ -128,6 +130,7 @@ func NewAutoCompleteFlagNode(parent *AutoCompleteNode, flagSpec *FlagSpec) *Auto
 	if len(node.Children) == 0 {
 		node.Children = parent.Children
 	}
+
 	return node
 }
 
@@ -142,6 +145,7 @@ func (node *AutoCompleteNode) GetChildOrCreate(name string, aliases []string, fl
 			node.Children[alias] = childNode
 		}
 	}
+
 	return node.Children[name]
 }
 
@@ -164,6 +168,7 @@ func (node *AutoCompleteNode) GetChildMatch(name string) (*AutoCompleteNode, boo
 			return child, true
 		}
 	}
+
 	return nil, false
 }
 
@@ -178,6 +183,7 @@ func (node *AutoCompleteNode) isLeafCommand() bool {
 			return false
 		}
 	}
+
 	return true
 }
 
@@ -205,6 +211,7 @@ func BuildAutoCompleteTree(ctx context.Context, commands *Commands) *AutoComplet
 		for _, argSpec := range nonDeprecatedArgs {
 			if argSpec.Positional {
 				node.Children[positionalValueNodeID] = NewAutoCompleteArgNode(cmd, argSpec)
+
 				continue
 			}
 			node.Children[argSpec.Name+"="] = NewAutoCompleteArgNode(cmd, argSpec)
@@ -322,6 +329,7 @@ func AutoComplete(ctx context.Context, leftWords []string, wordToComplete string
 					suggestions = append(suggestions, positionalSuggestion)
 				}
 			}
+
 			continue
 		}
 
@@ -346,6 +354,7 @@ func AutoComplete(ctx context.Context, leftWords []string, wordToComplete string
 				continue
 			}
 			suggestions = append(suggestions, key)
+
 			continue
 		}
 
@@ -391,16 +400,19 @@ func AutoCompleteArgValue(ctx context.Context, cmd *Command, argSpec *ArgSpec, a
 			suggestions = append(suggestions, value)
 		}
 	}
+
 	return suggestions
 }
 
 func isCompletingArgValue(wordToComplete string) bool {
 	wordParts := strings.SplitN(wordToComplete, "=", 2)
+
 	return len(wordParts) == 2
 }
 
 func splitArgWord(wordToComplete string) (string, string) {
 	wordParts := strings.SplitN(wordToComplete, "=", 2)
+
 	return wordParts[0] + "=", wordParts[1]
 }
 
@@ -413,6 +425,7 @@ func wordValue(word string) string {
 	if len(words) >= 2 {
 		return words[1]
 	}
+
 	return ""
 }
 
@@ -447,6 +460,7 @@ func hasPrefix(key, wordToComplete string) bool {
 	if leftKey == leftWord || leftKey == sliceSchema || leftKey == mapSchema {
 		return hasPrefix(rightKey, rightWord)
 	}
+
 	return false
 }
 
@@ -473,6 +487,7 @@ func keySuggestion(key string, completedArg map[string]string, wordToComplete st
 				return []string{}
 			}
 		}
+
 		return []string{newKey}
 	}
 
@@ -518,6 +533,7 @@ func keySuggestion(key string, completedArg map[string]string, wordToComplete st
 				for k := 1; k <= j; k++ {
 					baseIndex[len(baseIndex)-k] = "0"
 				}
+
 				break
 			}
 			if strings.HasSuffix(newKey, ".") {
@@ -535,5 +551,6 @@ func keySuggestion(key string, completedArg map[string]string, wordToComplete st
 			baseIndex[len(baseIndex)-j-1] = strconv.Itoa(newIndex + 1)
 		}
 	}
+
 	return finalKeys
 }

core/autocomplete_utils.go

@@ -76,6 +76,7 @@ func AutocompleteProfileName() AutoCompleteArgFunc {
 		if strings.HasPrefix(scw.DefaultProfileName, prefix) { //nolint:gocritic
 			res = append(res, scw.DefaultProfileName)
 		}
+
 		return res
 	}
 }
@@ -202,6 +203,7 @@ func listRawArgsLocalities(completedArgs map[string]string, cmd *Command) []stri
 			listRawArgs = append(listRawArgs, arg+value)
 		}
 	}
+
 	return listRawArgs
 }
 

core/bootstrap.go

@@ -132,6 +132,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 	})
 	if err != nil {
 		_, _ = fmt.Fprintln(config.Stderr, err)
+
 		return 1, nil, err
 	}
 	interactive.SetOutputWriter(config.Stderr) // set printer for interactive function (always stderr).
@@ -154,6 +155,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 			if printErr != nil {
 				_, _ = fmt.Fprintln(config.Stderr, printErr)
 			}
+
 			return 1, nil, err
 		}
 	}
@@ -205,6 +207,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 		if printErr != nil {
 			_, _ = fmt.Fprintln(config.Stderr, printErr)
 		}
+
 		return 1, nil, err
 	}
 	meta.CliConfig = cliCfg
@@ -217,6 +220,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 		})
 		if err != nil {
 			_, _ = fmt.Fprintln(config.Stderr, err)
+
 			return 1, nil, err
 		}
 	}
@@ -243,6 +247,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 	// ShellMode
 	if len(config.Args) >= 2 && config.Args[1] == "shell" {
 		RunShell(ctx, printer, meta, rootCmd, config.Args)
+
 		return 0, meta.result, nil
 	}
 
@@ -273,6 +278,7 @@ func Bootstrap(config *BootstrapConfig) (exitCode int, result interface{}, err e
 		if printErr != nil {
 			_, _ = fmt.Fprintln(os.Stderr, err)
 		}
+
 		return errorCode, nil, err
 	}
 

core/build_info.go

@@ -25,6 +25,7 @@ type BuildInfo struct {
 
 func (b *BuildInfo) MarshalJSON() ([]byte, error) {
 	type Tmp BuildInfo
+
 	return json.Marshal(
 		struct {
 			Tmp
@@ -50,6 +51,7 @@ func (b *BuildInfo) GetUserAgent() string {
 	if b.Version != nil {
 		return b.UserAgentPrefix + "/" + b.Version.String()
 	}
+
 	return b.UserAgentPrefix
 }
 
@@ -65,13 +67,15 @@ func (b *BuildInfo) Tags() map[string]string {
 func (b *BuildInfo) checkVersion(ctx context.Context) {
 	if !b.IsRelease() || ExtractEnv(ctx, scwDisableCheckVersionEnv) == "true" {
 		ExtractLogger(ctx).Debug("skipping check version")
+
 		return
 	}
 
 	// pull latest version
 	latestVersion, err := getLatestVersion(ExtractHTTPClient(ctx))
 	if err != nil {
 		ExtractLogger(ctx).Debugf("failed to retrieve latest version: %s\n", err)
+
 		return
 	}
 

core/build_info_test.go

@@ -84,6 +84,7 @@ func Test_CheckVersion(t *testing.T) {
 			err := core.CreateAndCloseFile(filePath)
 			require.NoError(t, err)
 			twoDaysAgo := time.Now().Local().Add(-2 * time.Hour * 24)
+
 			return os.Chtimes(filePath, twoDaysAgo, twoDaysAgo)
 		},
 		Cmd: "scw plop",