👷 Add golangci-lint and linter-pleasing

.github/workflows/lint.yml

@@ -0,0 +1,21 @@
+name: Go
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+  create:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: Lint
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Run golangci-lint
+        uses: actions-contrib/golangci-lint@v1

.golangci.yml

@@ -41,19 +41,43 @@ linters-settings:
       - dupImport # https://github.com/go-critic/go-critic/issues/845
 
 linters:
-  enable-all: true
-  disable:
-    - maligned
-    - prealloc
-    - gochecknoglobals
-    - nakedret
-    - goimports
+  disable-all: true
+  enable:
+    - bodyclose
+    - deadcode
+    - depguard
+    - dogsled
     - dupl
-    - interfacer
-    - unparam
-    - lll
-    - goconst
-    - gochecknoinits
+    - errcheck
+    - funlen
+#    - gochecknoinits
+#    - goconst
+    - gocritic
+    - gocyclo
+    - gofmt
+    - goimports
+    - golint
+#    - gomnd
+    - goprintffuncname
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+#    - interfacer
+#    - lll
+    - misspell
+#    - nakedret
+    - rowserrcheck
+    - scopelint
+    - staticcheck
+    - structcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+#    - unparam
+    - unused
+    - varcheck
+    - whitespace
 run:
   skip-dirs:
     - test/testdata_etc
@@ -68,9 +92,17 @@ issues:
         - dupl
         - gosec
         - scopelint
+        - dogsled
+        - funlen
+        - nakedret
     - path: cmd/dockmoor/markdown\.go
       linters:
         - errcheck
+        - dupl
+    - path: cmd/dockmoor/asciidoc\.go
+      linters:
+        - errcheck
+        - dupl
     - text: "singleCaseSwitch"
       linters:
         - gocritic
@@ -110,6 +142,12 @@ issues:
     - text: "getPredicate"
       linters:
         - gocyclo
+    - text: "SA5008"
+      linters:
+        - staticcheck
+    - text: "Function 'getPredicate' has too many statements"
+      linters:
+        - funlen
 
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration

cmd/dockmoor/00_main.go

@@ -3,16 +3,17 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"github.com/MeneDev/dockmoor/dockfmt"
-	_ "github.com/MeneDev/dockmoor/dockfmt/dockerfile"
-	"github.com/MeneDev/dockmoor/dockmoor"
-	"github.com/jessevdk/go-flags"
-	"github.com/sirupsen/logrus"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
+
+	"github.com/MeneDev/dockmoor/dockfmt"
+	_ "github.com/MeneDev/dockmoor/dockfmt/dockerfile"
+	"github.com/MeneDev/dockmoor/dockmoor"
+	"github.com/jessevdk/go-flags"
+	"github.com/sirupsen/logrus"
 )
 
 type ExitCodeCommander interface {

cmd/dockmoor/00_main_test.go

@@ -2,15 +2,16 @@ package main
 
 import (
 	"bytes"
-	"github.com/jessevdk/go-flags"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
+
+	"github.com/jessevdk/go-flags"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
 )
 
 var NotADockerfile = "notDocker"
@@ -99,7 +100,6 @@ func TestMarkdownIsNotError(t *testing.T) {
 }
 
 func TestOpensStdin(t *testing.T) {
-
 	optionsTest := mainOptionsTestNew()
 	opener := defaultReadableOpener(optionsTest.mainOptions)
 

cmd/dockmoor/acceptance_test.go

@@ -2,16 +2,17 @@ package main
 
 import (
 	"bytes"
-	"github.com/jessevdk/go-flags"
-	"github.com/mattn/go-shellwords"
-	"github.com/stretchr/testify/assert"
 	"html/template"
 	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
+
+	"github.com/jessevdk/go-flags"
+	"github.com/mattn/go-shellwords"
+	"github.com/stretchr/testify/assert"
 )
 
 func dockerfile(content string) (fileName string) {
@@ -133,7 +134,6 @@ func TestContainsInvalidOptions(t *testing.T) {
 }
 
 func TestMainVersion(t *testing.T) {
-
 	os.Args = []string{"exe", "--version"}
 
 	mainOptions := mainOptionsACNew(addContainsCommand)
@@ -143,7 +143,6 @@ func TestMainVersion(t *testing.T) {
 }
 
 func TestMainManpage(t *testing.T) {
-
 	os.Args = []string{"exe", "--manpage"}
 	mainOptions := mainOptionsACNew(addContainsCommand)
 	exitCode := doMain(mainOptions)
@@ -152,7 +151,6 @@ func TestMainManpage(t *testing.T) {
 }
 
 func TestMainMarkdown(t *testing.T) {
-
 	os.Args = []string{"exe", "--markdown"}
 
 	mainOptions := mainOptionsACNew()

cmd/dockmoor/asciidoc.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/jessevdk/go-flags"
 	"io"
 	"strings"
+
+	"github.com/jessevdk/go-flags"
 )
 
 func WriteASCIIDoc(parser *flags.Parser, writer io.Writer) {
@@ -34,12 +35,10 @@ func WriteASCIIDoc(parser *flags.Parser, writer io.Writer) {
 }
 
 func WriteASCIIDocUsage(commands []*flags.Command, writer io.Writer) {
-
 	commands = visibleCommands(commands)
 
 	mdPrintf(writer, "> ")
 	for idxCommand, command := range commands {
-
 		isFirstCommand := idxCommand == 0
 		isLastCommand := idxCommand+1 == len(commands)
 
@@ -92,7 +91,6 @@ func WriteASCIIDocUsage(commands []*flags.Command, writer io.Writer) {
 }
 
 func WriteASCIIDocGroups(writer io.Writer, groups []*flags.Group, level int) {
-
 	for _, group := range groups {
 		if group.Hidden {
 			continue

cmd/dockmoor/cmd_contains.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"errors"
+	"io"
+
 	"github.com/MeneDev/dockmoor/dockfmt"
 	"github.com/MeneDev/dockmoor/dockproc"
 	"github.com/MeneDev/dockmoor/dockref"
 	"github.com/jessevdk/go-flags"
-	"io"
 )
 
 type containsOptions struct {

cmd/dockmoor/cmd_contains_test.go

@@ -3,17 +3,18 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"testing"
+
 	"github.com/MeneDev/dockmoor/dockfmt"
 	"github.com/MeneDev/dockmoor/dockproc"
 	"github.com/MeneDev/dockmoor/dockref"
 	"github.com/jessevdk/go-flags"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"io"
-	"io/ioutil"
-	"os"
-	"testing"
 )
 
 type containsOptionsTest struct {
@@ -167,7 +168,6 @@ func TestExecuteReturnsErrorWithContains(t *testing.T) {
 }
 
 func TestMainMarkdownWithContains(t *testing.T) {
-
 	os.Args = []string{"exe", "--markdown"}
 
 	mainOptions := mainOptionsACNew(addContainsCommand)
@@ -181,7 +181,6 @@ func TestMainMarkdownWithContains(t *testing.T) {
 }
 
 func TestMainAsciiDocWithContains(t *testing.T) {
-
 	os.Args = []string{"exe", "--asciidoc-usage"}
 
 	mainOptions := mainOptionsACNew(addContainsCommand)
@@ -195,7 +194,6 @@ func TestMainAsciiDocWithContains(t *testing.T) {
 }
 
 func TestContainsHelpIsNotAnError(t *testing.T) {
-
 	os.Args = []string{"exe", "contains", "--help"}
 
 	mainOptions := mainOptionsACNew(addContainsCommand)

cmd/dockmoor/cmd_list.go

@@ -3,11 +3,12 @@ package main
 import (
 	"errors"
 	"fmt"
+	"io"
+
 	"github.com/MeneDev/dockmoor/dockfmt"
 	"github.com/MeneDev/dockmoor/dockproc"
 	"github.com/MeneDev/dockmoor/dockref"
 	"github.com/jessevdk/go-flags"
-	"io"
 )
 
 type listOptions struct {
@@ -71,7 +72,6 @@ func (lo *listOptions) ExecuteWithExitCode(args []string) (exitCode ExitCode, er
 }
 
 func (lo *listOptions) applyFormatProcessor(predicate dockproc.Predicate, processor dockfmt.FormatProcessor) error {
-
 	return processor.Process(func(r dockref.Reference) (dockref.Reference, error) {
 		if predicate.Matches(r) {
 			lo.matches = true

cmd/dockmoor/cmd_list_test.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	"bytes"
+	"io"
+	"os"
+	"testing"
+
 	"github.com/MeneDev/dockmoor/dockfmt"
 	"github.com/MeneDev/dockmoor/dockproc"
 	"github.com/MeneDev/dockmoor/dockref"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"io"
-	"os"
-	"testing"
 )
 
 type listOptionsTest struct {
@@ -49,7 +50,6 @@ func TestListCallsFindExecute(t *testing.T) {
 }
 
 func TestMainMarkdownWithList(t *testing.T) {
-
 	os.Args = []string{"exe", "--markdown"}
 
 	mainOptions := mainOptionsACNew(addListCommand)
@@ -63,7 +63,6 @@ func TestMainMarkdownWithList(t *testing.T) {
 }
 
 func TestMainAsciiDocWithList(t *testing.T) {
-
 	os.Args = []string{"exe", "--asciidoc-usage"}
 
 	mainOptions := mainOptionsACNew(addListCommand)
@@ -77,7 +76,6 @@ func TestMainAsciiDocWithList(t *testing.T) {
 }
 
 func TestListHelpIsNotAnError(t *testing.T) {
-
 	os.Args = []string{"exe", "list", "--help"}
 
 	mainOptions := mainOptionsACNew(addListCommand)