Add more linters

Also restore the check on imports being organised in 3 groups. Signed-off-by: David Gageot <david@gageot.net>
mdelillo · Oct 15, 2019 · 6228387 · 6228387
1 parent 74c59d5
commit 6228387
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/builder/config_test.go b/builder/config_test.go
@@ -90,7 +90,6 @@ func testConfig(t *testing.T, when spec.G, it spec.S) {
 					h.AssertEq(t, len(warns), 1)
 					h.AssertSliceContains(t, warns, "'latest' field on a buildpack is obsolete and will be ignored")
 				})
-
 			})
 
 			when("'groups' field is used", func() {

diff --git a/commands/inspect_builder_test.go b/commands/inspect_builder_test.go
@@ -31,7 +31,6 @@ func TestInspectBuilderCommand(t *testing.T) {
 }
 
 func testInspectBuilderCommand(t *testing.T, when spec.G, it spec.S) {
-
 	var (
 		command        *cobra.Command
 		logger         logging.Logger

diff --git a/commands/set_default_builder_test.go b/commands/set_default_builder_test.go
@@ -27,7 +27,6 @@ func TestSetDefaultBuilder(t *testing.T) {
 }
 
 func testSetDefaultBuilderCommand(t *testing.T, when spec.G, it spec.S) {
-
 	var (
 		command        *cobra.Command
 		logger         logging.Logger

diff --git a/dist/buildpack_test.go b/dist/buildpack_test.go
@@ -114,7 +114,6 @@ id = "some.stack.id"
 			it("returns error", func() {
 				_, err := dist.NewBuildpack(blob.NewBlob(tmpBpDir))
 				h.AssertError(t, err, "'buildpack.version' is required")
-
 			})
 		})
 

diff --git a/golangci.yaml b/golangci.yaml
@@ -7,6 +7,7 @@ linters:
   enable:
     - bodyclose
     - deadcode
+    - dogsled
     - gocritic
     - goimports
     - golint
@@ -15,11 +16,17 @@ linters:
     - ineffassign
     - maligned
     - misspell
+    - nakedret
+    - scopelint
     - staticcheck
     - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unused
     - varcheck
-    - scopelint
+    - whitespace
+
+linters-settings:
+  goimports:
+    local-prefixes: github.com/buildpack/pack
diff --git a/internal/archive/archive_test.go b/internal/archive/archive_test.go
@@ -148,7 +148,6 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
 		})
 
 		when("is posix", func() {
-
 			it.Before(func() {
 				h.SkipIf(t, runtime.GOOS == "windows", "Skipping on windows")
 			})
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,6 @@ func testConfig(t *testing.T, when spec.G, it spec.S) { @@
     					h.AssertEq(t, len(warns), 1)
     					h.AssertSliceContains(t, warns, "'latest' field on a buildpack is obsolete and will be ignored")
     				})
     			})
     			when("'groups' field is used", func() {
@@ Expand Down @@