More linting (#2099)

* Address gocritic findings, enable it * Enable gosimple, no new findings to address

Author: scop

.golangci.yml

@@ -29,15 +29,15 @@ linters:
  - gas
  #- gochecknoinits
  - goconst
- #- gocritic
+ - gocritic
  #- gocyclo
  #- gofmt
  - goimports
  - golint
  #- gomnd
  #- goprintffuncname
  #- gosec
- #- gosimple
+ - gosimple
  - govet
  - ineffassign
  - interfacer

bash_completions.go

@@ -597,19 +597,16 @@ func writeRequiredFlag(buf io.StringWriter, cmd *Command) {
 if nonCompletableFlag(flag) {
 return
 }
-for key := range flag.Annotations {
-switch key {
-case BashCompOneRequiredFlag:
-format := " must_have_one_flag+=(\"--%s"
-if flag.Value.Type() != "bool" {
-format += "="
-}
-format += cbn
-WriteStringAndCheck(buf, fmt.Sprintf(format, flag.Name))
-
-if len(flag.Shorthand) > 0 {
-WriteStringAndCheck(buf, fmt.Sprintf(" must_have_one_flag+=(\"-%s"+cbn, flag.Shorthand))
-}
+if _, ok := flag.Annotations[BashCompOneRequiredFlag]; ok {
+format := " must_have_one_flag+=(\"--%s"
+if flag.Value.Type() != "bool" {
+format += "="
+}
+format += cbn
+WriteStringAndCheck(buf, fmt.Sprintf(format, flag.Name))
+
+if len(flag.Shorthand) > 0 {
+WriteStringAndCheck(buf, fmt.Sprintf(" must_have_one_flag+=(\"-%s"+cbn, flag.Shorthand))
 }
 }
 })

command_test.go

@@ -2777,7 +2777,7 @@ func TestFind(t *testing.T) {
 
 func TestUnknownFlagShouldReturnSameErrorRegardlessOfArgPosition(t *testing.T) {
 testCases := [][]string{
-//{"--unknown", "--namespace", "foo", "child", "--bar"}, // FIXME: This test case fails, returning the error `unknown command "foo" for "root"` instead of the expected error `unknown flag: --unknown`
+// {"--unknown", "--namespace", "foo", "child", "--bar"}, // FIXME: This test case fails, returning the error `unknown command "foo" for "root"` instead of the expected error `unknown flag: --unknown`
 {"--namespace", "foo", "--unknown", "child", "--bar"},
 {"--namespace", "foo", "child", "--unknown", "--bar"},
 {"--namespace", "foo", "child", "--bar", "--unknown"},

doc/man_docs.go

@@ -133,7 +133,7 @@ func fillHeader(header *GenManHeader, name string, disableAutoGen bool) error {
 }
 header.Date = &now
 }
-header.date = (*header.Date).Format("Jan 2006")
+header.date = header.Date.Format("Jan 2006")
 if header.Source == "" && !disableAutoGen {
 header.Source = "Auto generated by spf13/cobra"
 }

doc/util.go

@@ -40,7 +40,7 @@ func hasSeeAlso(cmd *cobra.Command) bool {
 // that do not contain \n.
 func forceMultiLine(s string) string {
 if len(s) > 60 && !strings.Contains(s, "\n") {
-s = s + "\n"
+s += "\n"
 }
 return s
 }

powershell_completions.go

@@ -28,8 +28,8 @@ import (
 func genPowerShellComp(buf io.StringWriter, name string, includeDesc bool) {
 // Variables should not contain a '-' or ':' character
 nameForVar := name
-nameForVar = strings.Replace(nameForVar, "-", "_", -1)
-nameForVar = strings.Replace(nameForVar, ":", "_", -1)
+nameForVar = strings.ReplaceAll(nameForVar, "-", "_")
+nameForVar = strings.ReplaceAll(nameForVar, ":", "_")
 
 compCmd := ShellCompRequestCmd
 if !includeDesc {