Merge pull request #1518 from saschagrunert/emptyStringTest

k8s-ci-robot · web-flow · commit d6569d31ef3f · 2024-07-23T04:44:24.000-07:00
Fix `emptyStringTest` linter
diff --git a/.golangci.yml b/.golangci.yml
@@ -139,6 +139,7 @@ linters-settings:
       - dynamicFmtString
       - emptyDecl
       - emptyFallthrough
+      - emptyStringTest
       - equalFold
       - evalOrder
       - exposedSyncMutex
@@ -186,7 +187,6 @@ linters-settings:
       - unnecessaryDefer
       - weakCond
       - yodaStyleExpr
-      # - emptyStringTest
       # - hugeParam
       # - importShadow
       # - octalLiteral
diff --git a/cmd/crictl/events.go b/cmd/crictl/events.go
@@ -51,7 +51,7 @@ var eventsCommand = &cli.Command{
 
 		switch format := c.String("output"); format {
 		case "json", "yaml":
-			if len(c.String("template")) > 0 {
+			if c.String("template") != "" {
 				return fmt.Errorf("template can't be used with %q format", format)
 			}
 		case "go-template":

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ var eventsCommand = &cli.Command{`
`51`	`51`
`52`	`52`	`switch format := c.String("output"); format {`
`53`	`53`	`case "json", "yaml":`
`54`		`- if len(c.String("template")) > 0 {`
	`54`	`+ if c.String("template") != "" {`
`55`	`55`	`return fmt.Errorf("template can't be used with %q format", format)`
`56`	`56`	`}`
`57`	`57`	`case "go-template":`