Add golintci and fix errors

cmoog · cmoog · commit 18ae0da88159 · 2020-10-22T10:58:28.000-05:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,17 @@
+# See https://golangci-lint.run/usage/configuration/
+linters-settings:
+  goconst:
+    min-len: 4 
+    min-occurrences: 3
+  gocognit:
+    min-complexity: 46
+  nestif:
+    min-complexity: 10
+  govet:
+    settings:
+      printf:
+        funcs: # Run `go tool vet help printf` to see available settings for `printf` analyzer.
+          - (cdr.dev/coder-cli/internal/clog).Tipf
+          - (cdr.dev/coder-cli/internal/clog).Hintf
+          - (cdr.dev/coder-cli/internal/clog).LogDebugf
+          - (cdr.dev/coder-cli/internal/clog).Causef
diff --git a/ci/image/Dockerfile b/ci/image/Dockerfile
@@ -5,4 +5,5 @@ ENV CI=true
 
 RUN go get golang.org/x/tools/cmd/goimports
 RUN go get golang.org/x/lint/golint
-RUN go get github.com/mattn/goveralls
+RUN go get github.com/mattn/goveralls
+RUN go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.27.0
diff --git a/ci/steps/lint.sh b/ci/steps/lint.sh
@@ -4,5 +4,11 @@ set -euo pipefail
 
 echo "Linting..."
 
+cd "$(dirname "$0")"
+cd ../../
+
 go vet ./...
 golint -set_exit_status ./...
+
+echo "--- golangci-lint"
+golangci-lint run -c .golangci.yml
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -81,12 +81,3 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin
 		clog.Tip("run \"coder envs ls\" to view your environments"),
 	)
 }
-
-type notFoundButDidFind struct {
-	needle   string
-	haystack []string
-}
-
-func (n notFoundButDidFind) Error() string {
-	return fmt.Sprintf("\"%s\" not found in %q: %v", n.needle, n.haystack, coder.ErrNotFound)
-}
diff --git a/internal/cmd/login.go b/internal/cmd/login.go
@@ -40,7 +40,7 @@ func makeLoginCmd() *cobra.Command {
 			// Don't return errors as it would print the usage.
 
 			if err := login(cmd, u, config.URL, config.Session); err != nil {
-				return xerrors.Errorf("Login error", err)
+				return xerrors.Errorf("login error: %w", err)
 			}
 			return nil
 		},
diff --git a/internal/cmd/rebuild.go b/internal/cmd/rebuild.go
@@ -75,7 +75,6 @@ coder envs rebuild backend-env --force`,
 func trailBuildLogs(ctx context.Context, client *coder.Client, envID string) error {
 	const check = "✅"
 	const failure = "❌"
-	const loading = "⌛"
 
 	newSpinner := func() *spinner.Spinner { return spinner.New(spinner.CharSets[11], 100*time.Millisecond) }
 
diff --git a/internal/cmd/resourcemanager.go b/internal/cmd/resourcemanager.go
@@ -318,13 +318,15 @@ func (a resources) String() string {
 	// )
 }
 
+//nolint:unused
 func (a resources) cpuUtilPercentage() string {
 	if a.cpuAllocation == 0 {
 		return "N/A"
 	}
 	return fmt.Sprintf("%.1f%%", a.cpuUtilization/a.cpuAllocation*100)
 }
 
+//nolint:unused
 func (a resources) memUtilPercentage() string {
 	if a.memAllocation == 0 {
 		return "N/A"

Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,3 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin`
`81`	`81`	`clog.Tip("run \"coder envs ls\" to view your environments"),`
`82`	`82`	`)`
`83`	`83`	`}`
`84`		`-`
`85`		`-type notFoundButDidFind struct {`
`86`		`- needle string`
`87`		`- haystack []string`
`88`		`-}`
`89`		`-`
`90`		`-func (n notFoundButDidFind) Error() string {`
`91`		`- return fmt.Sprintf("\"%s\" not found in %q: %v", n.needle, n.haystack, coder.ErrNotFound)`
`92`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func makeLoginCmd() *cobra.Command {`
`40`	`40`	`// Don't return errors as it would print the usage.`
`41`	`41`
`42`	`42`	`if err := login(cmd, u, config.URL, config.Session); err != nil {`
`43`		`- return xerrors.Errorf("Login error", err)`
	`43`	`+ return xerrors.Errorf("login error: %w", err)`
`44`	`44`	`}`
`45`	`45`	`return nil`
`46`	`46`	`},`
Original file line number	Diff line number	Diff line change
`@@ -318,13 +318,15 @@ func (a resources) String() string {`
`318`	`318`	`// )`
`319`	`319`	`}`
`320`	`320`
	`321`	`+//nolint:unused`
`321`	`322`	`func (a resources) cpuUtilPercentage() string {`
`322`	`323`	`if a.cpuAllocation == 0 {`
`323`	`324`	`return "N/A"`
`324`	`325`	`}`
`325`	`326`	`return fmt.Sprintf("%.1f%%", a.cpuUtilization/a.cpuAllocation*100)`
`326`	`327`	`}`
`327`	`328`
	`329`	`+//nolint:unused`
`328`	`330`	`func (a resources) memUtilPercentage() string {`
`329`	`331`	`if a.memAllocation == 0 {`
`330`	`332`	`return "N/A"`