Use 'goimports' provided by 'golangci-lint' (#1162)

kudobuilder · Dec 13, 2019 · 3778b5c · 3778b5c
1 parent 3556419
commit 3778b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -12,4 +12,5 @@ run:
     - pkg/client
 linters-settings:
   goimports:
-    local-prefixes: github.com/kudobuilder/kudo
+    # Don't use 'github.com/kudobuilder/kudo', it'll result in unreliable output!
+    local-prefixes: github.com/kudobuilder
diff --git a/Makefile b/Makefile
@@ -131,7 +131,10 @@ docker-push:
 .PHONY: imports
 # used to update imports on project.  NOT a linter.
 imports:
-	goimports --local github.com/kudobuilder -w .
+ifeq (, $(shell which golangci-lint))
+	./hack/install-golangcilint.sh
+endif
+	golangci-lint run --disable-all -E goimports --fix
 
 .PHONY: todo
 # Show to-do items per file.