chore: bump golangci-lint and fix linting issues

Nothing big, mostly `wsl`.

Signed-off-by: Andrey Smirnov <[email protected]>

cmd/root.go

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// Package cmd provides CLI commands.
 package cmd
 
 import (

cmd/version.go

@@ -73,6 +73,7 @@ func PrintLongVersion() {
 	}
 
 	var wr bytes.Buffer
+
 	tmpl, err := template.New("version").Parse(versionTemplate)
 	if err != nil {
 		fmt.Println(err)
@@ -88,5 +89,5 @@ func PrintLongVersion() {
 
 // PrintShortVersion prints the tag and sha.
 func PrintShortVersion() {
-	fmt.Println(fmt.Sprintf("%s %s-%s", constants.AppName, Tag, SHA))
+	fmt.Printf("%s %s-%s\n", constants.AppName, Tag, SHA)
 }

hack/golangci-lint.yaml

@@ -101,6 +101,9 @@ linters:
     - typecheck
     - gochecknoglobals
     - gochecknoinits
+    - funlen
+    - gomnd
+    - gocognit
   disable-all: false
   fast: false
 

hack/test.sh

@@ -7,7 +7,7 @@ CGO_ENABLED=1
 lint_packages() {
   if [ "${lint}" = true ]; then
     echo "linting packages"
-    curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.16.0
+    curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.24.0
     golangci-lint run --config "${BASH_SOURCE%/*}/golangci-lint.yaml"
   fi
 }

internal/constants/constants.go

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// Package constants defines common values.
 package constants
 
 const (

internal/enforcer/enforcer.go

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// Package enforcer defines policy enforcement.
 package enforcer
 
 import (
@@ -51,6 +52,7 @@ func New(r string) (*Conform, error) {
 		if err != nil {
 			return nil, err
 		}
+
 		c.reporter = s
 	default:
 		c.reporter = &reporter.Noop{}
@@ -60,6 +62,7 @@ func New(r string) (*Conform, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	err = yaml.Unmarshal(configBytes, c)
 	if err != nil {
 		return nil, err
@@ -77,22 +80,27 @@ func (c *Conform) Enforce(setters ...policy.Option) error {
 	fmt.Fprintln(w, "POLICY\tCHECK\tSTATUS\tMESSAGE\t")
 
 	pass := true
+
 	for _, p := range c.Policies {
 		report, err := c.enforce(p, opts)
 		if err != nil {
 			log.Fatal(err)
 		}
+
 		for _, check := range report.Checks() {
 			if len(check.Errors()) != 0 {
 				for _, err := range check.Errors() {
 					fmt.Fprintf(w, "%s\t%s\t%s\t%v\t\n", p.Type, check.Name(), "FAILED", err)
 				}
+
 				if err := c.reporter.SetStatus("failure", p.Type, check.Name(), check.Message()); err != nil {
 					log.Printf("WARNING: report failed: %+v", err)
 				}
+
 				pass = false
 			} else {
 				fmt.Fprintf(w, "%s\t%s\t%s\t%s\t\n", p.Type, check.Name(), "PASS", "<none>")
+
 				if err := c.reporter.SetStatus("success", p.Type, check.Name(), check.Message()); err != nil {
 					log.Printf("WARNING: report failed: %+v", err)
 				}

internal/git/git.go

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// Package git provides helpers for SCM.
 package git
 
 import (
@@ -36,10 +37,12 @@ func NewGit() (g *Git, err error) {
 	if err != nil {
 		return
 	}
+
 	repo, err := git.PlainOpen(path.Dir(p))
 	if err != nil {
 		return
 	}
+
 	g = &Git{repo: repo}
 
 	return g, err
@@ -52,18 +55,23 @@ func (g *Git) Message() (message string, err error) {
 	if err != nil {
 		return
 	}
+
 	commit, err := g.repo.CommitObject(ref.Hash())
 	if err != nil {
 		return
 	}
+
 	if commit.NumParents() > 1 {
 		parents := commit.Parents()
+
 		for i := 1; i <= commit.NumParents(); i++ {
 			var next *object.Commit
+
 			next, err = parents.Next()
 			if err != nil {
 				return
 			}
+
 			if i == commit.NumParents() {
 				message = next.Message
 			}
@@ -82,6 +90,7 @@ func (g *Git) HasGPGSignature() (ok bool, err error) {
 	if err != nil {
 		return false, err
 	}
+
 	commit, err := g.repo.CommitObject(ref.Hash())
 	if err != nil {
 		return false, err
@@ -100,6 +109,7 @@ func (g *Git) FetchPullRequest(remote string, number int) (err error) {
 			config.RefSpec(fmt.Sprintf("refs/pull/%d/head:pr/%d", number, number)),
 		},
 	}
+
 	if err = g.repo.Fetch(opts); err != nil {
 		return err
 	}
@@ -131,6 +141,7 @@ func (g *Git) SHA() (sha string, err error) {
 	if err != nil {
 		return sha, err
 	}
+
 	sha = ref.Hash().String()
 
 	return sha, nil
@@ -155,7 +166,9 @@ func (g *Git) AheadBehind(ref string) (ahead int, behind int, err error) {
 	}
 
 	var count int
+
 	iter := object.NewCommitPreorderIter(commit2, nil, nil)
+
 	err = iter.ForEach(func(comm *object.Commit) error {
 		if comm.Hash != ref1.Hash() {
 			count++
@@ -164,6 +177,7 @@ func (g *Git) AheadBehind(ref string) (ahead int, behind int, err error) {
 
 		return storer.ErrStop
 	})
+
 	if err != nil {
 		return 0, 0, nil
 	}

internal/policy/commit/check_body.go

@@ -31,6 +31,7 @@ func (h Body) Message() string {
 	if len(h.errors) != 0 {
 		return h.errors[0].Error()
 	}
+
 	return "Commit body is valid"
 }
 
@@ -45,10 +46,12 @@ func (c Commit) ValidateBody() policy.Check {
 
 	lines := strings.Split(strings.TrimPrefix(c.msg, "\n"), "\n")
 	valid := false
+
 	for _, line := range lines[1:] {
 		if DCORegex.MatchString(strings.TrimSpace(line)) {
 			continue
 		}
+
 		if line != "" {
 			valid = true
 			break

internal/policy/commit/check_conventional_commit.go

@@ -50,6 +50,7 @@ func (c ConventionalCommitCheck) Message() string {
 	if len(c.errors) != 0 {
 		return c.errors[0].Error()
 	}
+
 	return "Commit message is a valid conventional commit"
 }
 
@@ -63,18 +64,21 @@ func (c ConventionalCommitCheck) Errors() []error {
 func (c Commit) ValidateConventionalCommit() policy.Check {
 	check := &ConventionalCommitCheck{}
 	groups := parseHeader(c.msg)
+
 	if len(groups) != 6 {
 		check.errors = append(check.errors, errors.Errorf("Invalid conventional commits format: %q", c.msg))
 		return check
 	}
 
 	c.Conventional.Types = append(c.Conventional.Types, TypeFeat, TypeFix)
 	typeIsValid := false
+
 	for _, t := range c.Conventional.Types {
 		if t == groups[1] {
 			typeIsValid = true
 		}
 	}
+
 	if !typeIsValid {
 		check.errors = append(check.errors, errors.Errorf("Invalid type %q: allowed types are %v", groups[1], c.Conventional.Types))
 		return check
@@ -83,13 +87,15 @@ func (c Commit) ValidateConventionalCommit() policy.Check {
 	// Scope is optional.
 	if groups[3] != "" {
 		scopeIsValid := false
+
 		for _, scope := range c.Conventional.Scopes {
 			re := regexp.MustCompile(scope)
 			if re.Match([]byte(groups[3])) {
 				scopeIsValid = true
 				break
 			}
 		}
+
 		if !scopeIsValid {
 			check.errors = append(check.errors, errors.Errorf("Invalid scope %q: allowed scopes are %v", groups[3], c.Conventional.Scopes))
 			return check
@@ -100,9 +106,11 @@ func (c Commit) ValidateConventionalCommit() policy.Check {
 	if c.Conventional.DescriptionLength == 0 {
 		c.Conventional.DescriptionLength = 72
 	}
+
 	if len(groups[4]) <= c.Conventional.DescriptionLength && len(groups[4]) != 0 {
 		return check
 	}
+
 	check.errors = append(check.errors, errors.Errorf("Invalid description: %s", groups[4]))
 
 	return check

internal/policy/commit/check_dco.go

@@ -31,6 +31,7 @@ func (d DCOCheck) Message() string {
 	if len(d.errors) != 0 {
 		return d.errors[0].Error()
 	}
+
 	return "Developer Certificate of Origin was found"
 }
 
@@ -42,6 +43,7 @@ func (d DCOCheck) Errors() []error {
 // ValidateDCO checks the commit message for a Developer Certificate of Origin.
 func (c Commit) ValidateDCO() policy.Check {
 	check := &DCOCheck{}
+
 	for _, line := range strings.Split(c.msg, "\n") {
 		if DCORegex.MatchString(strings.TrimSpace(line)) {
 			return check

internal/policy/commit/check_gpg_signature.go

@@ -25,6 +25,7 @@ func (g GPGCheck) Message() string {
 	if len(g.errors) != 0 {
 		return g.errors[0].Error()
 	}
+
 	return "GPG signature found"
 }
 

internal/policy/commit/check_header_case.go

@@ -28,6 +28,7 @@ func (h HeaderCaseCheck) Message() string {
 	if len(h.errors) != 0 {
 		return h.errors[0].Error()
 	}
+
 	return "Header case is valid"
 }
 
@@ -53,6 +54,7 @@ func (c Commit) ValidateHeaderCase() policy.Check {
 	}
 
 	var valid bool
+
 	switch c.Header.Case {
 	case "upper":
 		valid = unicode.IsUpper(first)
@@ -62,8 +64,10 @@ func (c Commit) ValidateHeaderCase() policy.Check {
 		check.errors = append(check.errors, errors.Errorf("Invalid configured case %s", c.Header.Case))
 		return check
 	}
+
 	if !valid {
 		check.errors = append(check.errors, errors.Errorf("Commit header case is not %s", c.Header.Case))
 	}
+
 	return check
 }

internal/policy/commit/check_header_last_character.go

@@ -27,6 +27,7 @@ func (h HeaderLastCharacterCheck) Message() string {
 	if len(h.errors) != 0 {
 		return h.errors[0].Error()
 	}
+
 	return "Header last character is valid"
 }
 

internal/policy/commit/check_imperative_verb.go

@@ -28,6 +28,7 @@ func (i ImperativeCheck) Message() string {
 	if len(i.errors) != 0 {
 		return i.errors[0].Error()
 	}
+
 	return "Commit begins with imperative verb"
 }
 
@@ -39,25 +40,31 @@ func (i ImperativeCheck) Errors() []error {
 // ValidateImperative checks the commit message for a GPG signature.
 func (c Commit) ValidateImperative() policy.Check {
 	check := &ImperativeCheck{}
+
 	var (
 		word string
 		err  error
 	)
+
 	if word, err = c.firstWord(); err != nil {
 		check.errors = append(check.errors, err)
 		return check
 	}
+
 	doc, err := prose.NewDocument("I " + strings.ToLower(word))
 	if err != nil {
 		check.errors = append(check.errors, errors.Errorf("Failed to create document: %v", err))
 		return check
 	}
+
 	if len(doc.Tokens()) != 2 {
 		check.errors = append(check.errors, errors.Errorf("Expected 2 tokens, got %d", len(doc.Tokens())))
 		return check
 	}
+
 	tokens := doc.Tokens()
 	tok := tokens[1]
+
 	for _, tag := range []string{"VBD", "VBG", "VBZ"} {
 		if tok.Tag == tag {
 			check.errors = append(check.errors, errors.Errorf("First word of commit must be an imperative verb: %q is invalid", word))

internal/policy/commit/check_number_of_commits.go

@@ -30,6 +30,7 @@ func (h NumberOfCommits) Message() string {
 	if len(h.errors) != 0 {
 		return h.errors[0].Error()
 	}
+
 	return fmt.Sprintf("HEAD is %d commit(s) ahead of %s", h.ahead, h.ref)
 }
 
@@ -46,6 +47,7 @@ func (c Commit) ValidateNumberOfCommits(g *git.Git, ref string) policy.Check {
 
 	var err error
 	check.ahead, _, err = g.AheadBehind(ref)
+
 	if err != nil {
 		check.errors = append(check.errors, err)
 		return check