Tidy up golangci-lint configuration

Author: twpayne

.golangci.yml

@@ -12,7 +12,6 @@ linters:
   - exportloopref
   - forbidigo
   - gci
-  - gochecknoinits
   - gocritic
   - godot
   - goerr113
@@ -29,7 +28,6 @@ linters:
   - interfacer
   - makezero
   - misspell
-  - paralleltest
   - prealloc
   - predeclared
   - rowserrcheck
@@ -39,7 +37,6 @@ linters:
   - structcheck
   - stylecheck
   - thelper
-  - tparallel
   - typecheck
   - unconvert
   - unparam
@@ -50,6 +47,7 @@ linters:
   - exhaustivestruct
   - funlen
   - gochecknoglobals
+  - gochecknoinits
   - gocognit
   - goconst
   - gocyclo
@@ -62,8 +60,10 @@ linters:
   - nestif
   - nlreturn
   - noctx
-  - nolintlint # FIXME renable
+  - nolintlint # FIXME re-enable
+  - paralleltest
   - testpackage
+  - tparallel
   - wrapcheck
   - wsl
 
@@ -82,30 +82,15 @@ issues:
     text: "do not define dynamic errors, use wrapped static errors instead"
   - linters:
     - dupl
-    path: "secretgopass.go"
-  - linters:
-    - dupl
-    path: "secretpass.go"
-  - linters:
-    - nolintlint
-    - paralleltest
-    path: "^main_test.go$"
+    path: "^cmd/secret(go)?pass\\.go$"
   - linters:
     - forbidigo
-    - gochecknoinits
-    - paralleltest
-    path: cmd/
-  - linters:
-    - gochecknoinits
-    path: internal/chezmoi/chezmoi_unix.go
+    path: ^cmd/
   - linters:
     - forbidigo
     - gosec
-    path: internal/cmd/
-  - linters:
-    - paralleltest
-    path: internal/
+    path: ^internal/cmd/
   - linters:
     - gosec
     - scopelint
-    path: "_test\\.go"
+    path: "_test\\.go$"

chezmoi2/cmd/keepassxctemplatefuncs.go

@@ -121,7 +121,6 @@ func (c *Config) keepassxcVersion() *semver.Version {
 func (c *Config) runKeepassxcCLICommand(name string, args []string) ([]byte, error) {
 	if c.Keepassxc.password == "" {
 		password, err := c.readPassword(fmt.Sprintf("Insert password to unlock %s: ", c.Keepassxc.Database))
-		fmt.Println()
 		if err != nil {
 			return nil, err
 		}

chezmoi2/internal/chezmoi/chezmoi_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/rs/zerolog/pkgerrors"
 )
 
-//nolint:gochecknoinits
 func init() {
 	log.Logger = log.Output(zerolog.ConsoleWriter{
 		Out:     os.Stderr,

chezmoi2/main_test.go

@@ -42,7 +42,6 @@ func TestMain(m *testing.M) {
 	}))
 }
 
-//nolint:paralleltest
 func TestScript(t *testing.T) {
 	testscript.Run(t, testscript.Params{
 		Dir: filepath.Join("testdata", "scripts"),

main_test.go

@@ -130,7 +130,6 @@ func cmdEdit(ts *testscript.TestScript, neg bool, args []string) {
 			ts.Fatalf("edit: %v", err)
 		}
 		data = append(data, []byte("# edited\n")...)
-		//nolint:gosec
 		if err := ioutil.WriteFile(filename, data, 0o666); err != nil {
 			ts.Fatalf("edit: %v", err)
 		}
@@ -266,7 +265,6 @@ func cmdRmFinalNewline(ts *testscript.TestScript, neg bool, args []string) {
 		if len(data) == 0 || data[len(data)-1] != '\n' {
 			continue
 		}
-		//nolint:gosec
 		if err := ioutil.WriteFile(filename, data[:len(data)-1], 0o666); err != nil {
 			ts.Fatalf("%s: %v", filename, err)
 		}
@@ -287,7 +285,6 @@ func cmdUNIX2DOS(ts *testscript.TestScript, neg bool, args []string) {
 		ts.Check(err)
 		dosData, err := unix2DOS(data)
 		ts.Check(err)
-		//nolint:gosec
 		if err := ioutil.WriteFile(filename, dosData, 0o666); err != nil {
 			ts.Fatalf("%s: %v", filename, err)
 		}