Fix all errors reported by golint-ci (#435)

mrnugget · web-flow · commit aa3db3c57307 · 2021-01-21T10:21:45.000+01:00
* Fix all errors reported by golint-ci

* See if that fixes the windows build

* Use os.Chmod() instead of (*os.File).Chmod() to fix windows
diff --git a/cmd/src/campaigns_new.go b/cmd/src/campaigns_new.go
@@ -62,11 +62,11 @@ Examples:
 		// Try to get better default values from git, ignore any errors.
 		if err := checkExecutable("git", "version"); err == nil {
 			var gitAuthorName, gitAuthorEmail string
+			var err1, err2 error
+			gitAuthorName, err1 = getGitConfig("user.name")
+			gitAuthorEmail, err2 = getGitConfig("user.email")
 
-			gitAuthorName, err = getGitConfig("user.name")
-			gitAuthorEmail, err = getGitConfig("user.email")
-
-			if err == nil && gitAuthorName != "" && gitAuthorEmail != "" {
+			if err1 == nil && err2 == nil && gitAuthorName != "" && gitAuthorEmail != "" {
 				author.Name = gitAuthorName
 				author.Email = gitAuthorEmail
 			}
diff --git a/cmd/src/doc.go b/cmd/src/doc.go
@@ -34,7 +34,9 @@ Examples:
 	`
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		out := output.NewOutput(flagSet.Output(), output.OutputOpts{Verbose: *verbose})
 		if *outputFlag == "" {
@@ -97,7 +99,9 @@ Examples:
 					}
 					defer file.Close()
 
-					file.WriteString(content)
+					if _, err := file.WriteString(content); err != nil {
+						return err
+					}
 					count++
 					subcommands[name] = name + ".md"
 				} else {
@@ -116,7 +120,9 @@ Examples:
 			}
 			defer file.Close()
 
-			file.WriteString(content)
+			if _, err := file.WriteString(content); err != nil {
+				return err
+			}
 			count++
 		}
 
diff --git a/cmd/src/extensions_get.go b/cmd/src/extensions_get.go
@@ -32,7 +32,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		tmpl, err := parseTemplate(*formatFlag)
 		if err != nil {
diff --git a/cmd/src/extensions_list.go b/cmd/src/extensions_list.go
@@ -40,7 +40,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		tmpl, err := parseTemplate(*formatFlag)
 		if err != nil {
diff --git a/cmd/src/extensions_publish.go b/cmd/src/extensions_publish.go
@@ -55,7 +55,9 @@ Notes:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		manifest, err := ioutil.ReadFile(*manifestFlag)
 		if err != nil {
diff --git a/cmd/src/extsvc_edit.go b/cmd/src/extsvc_edit.go
@@ -48,8 +48,9 @@ Examples:
 	)
 
 	handler := func(args []string) (err error) {
-		flagSet.Parse(args)
-
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 		ctx := context.Background()
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/extsvc_list.go b/cmd/src/extsvc_list.go
@@ -35,7 +35,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		first := *firstFlag
 		if first == -1 {
diff --git a/cmd/src/format.go b/cmd/src/format.go
@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"os"
 	"strings"
 	"text/template"
@@ -117,17 +116,3 @@ func execTemplate(tmpl *template.Template, data interface{}) error {
 func marshalIndent(v interface{}) ([]byte, error) {
 	return json.MarshalIndent(v, "", "  ")
 }
-
-func resolveURL(endpoint, u string) (string, error) {
-	parsed, err := url.Parse(u)
-	if err != nil {
-		return "", err
-	}
-
-	base, err := url.Parse(endpoint)
-	if err != nil {
-		return "", err
-	}
-
-	return base.ResolveReference(parsed).String(), nil
-}
diff --git a/cmd/src/lsif_upload.go b/cmd/src/lsif_upload.go
@@ -75,7 +75,9 @@ Examples:
 	flags.associatedIndexID = flagSet.Int("associated-index-id", -1, "ID of the associated index record for this upload. For internal use only.")
 
 	parseAndValidateFlags := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		type inferError struct {
 			argument string
@@ -203,11 +205,11 @@ Examples:
 				return
 			}
 
-			pentimento.PrintProgress(func(p *pentimento.Printer) error {
+			_ = pentimento.PrintProgress(func(p *pentimento.Printer) error {
 				for event := range opts.UploadProgressEvents {
 					content := pentimento.NewContent()
 					content.AddLine(formatProgressBar(event.TotalProgress, fmt.Sprintf("%d/%d", event.Part, event.NumParts)))
-					p.WriteContent(content)
+					_ = p.WriteContent(content)
 				}
 
 				_ = p.Reset()
@@ -323,14 +325,6 @@ func formatProgressBar(progress float64, suffix string) string {
 	)
 }
 
-// digits returns the number of digits of n.
-func digits(n int) int {
-	if n >= 10 {
-		return 1 + digits(n/10)
-	}
-	return 1
-}
-
 type errorWithHint struct {
 	err  error
 	hint string
diff --git a/cmd/src/orgs_create.go b/cmd/src/orgs_create.go
@@ -31,7 +31,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/orgs_delete.go b/cmd/src/orgs_delete.go
@@ -38,7 +38,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/orgs_get.go b/cmd/src/orgs_get.go
@@ -35,7 +35,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/orgs_list.go b/cmd/src/orgs_list.go
@@ -40,7 +40,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/orgs_members_add.go b/cmd/src/orgs_members_add.go
@@ -31,7 +31,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/orgs_members_remove.go b/cmd/src/orgs_members_remove.go
@@ -30,7 +30,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/repos_delete.go b/cmd/src/repos_delete.go
@@ -52,7 +52,9 @@ Examples:
 	}
 
 	deleteRepositories := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		ctx := context.Background()
 		client := cfg.apiClient(apiFlags, flagSet.Output())
diff --git a/cmd/src/repos_enable_disable.go b/cmd/src/repos_enable_disable.go
@@ -64,7 +64,9 @@ func initReposEnableDisable(cmdName string, enable bool, usage string) {
 	}
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		ctx := context.Background()
 		client := cfg.apiClient(apiFlags, flagSet.Output())
diff --git a/cmd/src/repos_get.go b/cmd/src/repos_get.go
@@ -31,7 +31,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/repos_list.go b/cmd/src/repos_list.go
@@ -53,7 +53,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/search.go b/cmd/src/search.go
@@ -57,7 +57,9 @@ Other tips:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		if *explainJSONFlag {
 			fmt.Println(searchJSONExplanation)
diff --git a/cmd/src/users_create.go b/cmd/src/users_create.go
@@ -32,7 +32,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/users_delete.go b/cmd/src/users_delete.go
@@ -38,7 +38,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/users_get.go b/cmd/src/users_get.go
@@ -31,7 +31,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/users_list.go b/cmd/src/users_list.go
@@ -45,7 +45,9 @@ Examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		ctx := context.Background()
 		client := cfg.apiClient(apiFlags, flagSet.Output())
diff --git a/cmd/src/users_tag.go b/cmd/src/users_tag.go
@@ -42,7 +42,9 @@ Related examples:
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
diff --git a/cmd/src/validate.go b/cmd/src/validate.go
@@ -73,7 +73,9 @@ Please visit https://docs.sourcegraph.com/admin/validation for documentation of
 	)
 
 	handler := func(args []string) error {
-		flagSet.Parse(args)
+		if err := flagSet.Parse(args); err != nil {
+			return err
+		}
 
 		client := cfg.apiClient(apiFlags, flagSet.Output())
 
@@ -98,6 +100,9 @@ Please visit https://docs.sourcegraph.com/admin/validation for documentation of
 		if !isatty.IsTerminal(os.Stdin.Fd()) {
 			// stdin is a pipe not a terminal
 			script, err = ioutil.ReadAll(os.Stdin)
+			if err != nil {
+				return err
+			}
 			isYaml = true
 		}
 
diff --git a/internal/api/api.go b/internal/api/api.go
@@ -165,8 +165,8 @@ func (r *request) do(ctx context.Context, result interface{}) (bool, error) {
 		if err != nil {
 			return false, err
 		}
-		r.client.opts.Out.Write([]byte(curl + "\n"))
-		return false, nil
+		_, err = r.client.opts.Out.Write([]byte(curl + "\n"))
+		return false, err
 	}
 
 	if *r.client.opts.Flags.dump {
@@ -217,7 +217,10 @@ func (r *request) do(ctx context.Context, result interface{}) (bool, error) {
 
 	// Check trace header before we potentially early exit
 	if *r.client.opts.Flags.trace {
-		r.client.opts.Out.Write([]byte(fmt.Sprintf("x-trace: %s\n", resp.Header.Get("x-trace"))))
+		_, err := r.client.opts.Out.Write([]byte(fmt.Sprintf("x-trace: %s\n", resp.Header.Get("x-trace"))))
+		if err != nil {
+			return false, err
+		}
 	}
 
 	// Our request may have failed before reaching the GraphQL endpoint, so
@@ -242,7 +245,7 @@ func (r *request) do(ctx context.Context, result interface{}) (bool, error) {
 		body = ioaux.TeeReadCloser(resp.Body, &buf)
 		defer func() {
 			var out bytes.Buffer
-			json.Indent(&out, buf.Bytes(), "    ", "    ")
+			_ = json.Indent(&out, buf.Bytes(), "    ", "    ")
 			fmt.Fprintf(r.client.opts.Out, "--> %s\n\n", out.String())
 		}()
 	}
diff --git a/internal/campaigns/bind_workspace.go b/internal/campaigns/bind_workspace.go
diff --git a/internal/campaigns/executor.go b/internal/campaigns/executor.go
diff --git a/internal/campaigns/run_steps.go b/internal/campaigns/run_steps.go
diff --git a/internal/campaigns/service_test.go b/internal/campaigns/service_test.go
diff --git a/internal/exec/exec.go b/internal/exec/exec.go
diff --git a/internal/exec/expect/expect.go b/internal/exec/expect/expect.go
diff --git a/internal/output/block.go b/internal/output/block.go
diff --git a/internal/output/line.go b/internal/output/line.go
diff --git a/internal/output/style.go b/internal/output/style.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ Examples:`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`handler := func(args []string) error {`
`35`		`- flagSet.Parse(args)`
	`35`	`+ if err := flagSet.Parse(args); err != nil {`
	`36`	`+ return err`
	`37`	`+ }`
`36`	`38`
`37`	`39`	`tmpl, err := parseTemplate(*formatFlag)`
`38`	`40`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ Examples:`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`handler := func(args []string) error {`
`43`		`- flagSet.Parse(args)`
	`43`	`+ if err := flagSet.Parse(args); err != nil {`
	`44`	`+ return err`
	`45`	`+ }`
`44`	`46`
`45`	`47`	`tmpl, err := parseTemplate(*formatFlag)`
`46`	`48`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@ Notes:`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`handler := func(args []string) error {`
`58`		`- flagSet.Parse(args)`
	`58`	`+ if err := flagSet.Parse(args); err != nil {`
	`59`	`+ return err`
	`60`	`+ }`
`59`	`61`
`60`	`62`	`manifest, err := ioutil.ReadFile(*manifestFlag)`
`61`	`63`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ Examples:`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`handler := func(args []string) error {`
`38`		`- flagSet.Parse(args)`
	`38`	`+ if err := flagSet.Parse(args); err != nil {`
	`39`	`+ return err`
	`40`	`+ }`
`39`	`41`
`40`	`42`	`first := *firstFlag`
`41`	`43`	`if first == -1 {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ Examples:`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`handler := func(args []string) error {`
`34`		`- flagSet.Parse(args)`
	`34`	`+ if err := flagSet.Parse(args); err != nil {`
	`35`	`+ return err`
	`36`	`+ }`
`35`	`37`
`36`	`38`	`client := cfg.apiClient(apiFlags, flagSet.Output())`
`37`	`39`