Merge pull request #213 from munnerz/goimports

Automatic merge from submit-queue.

 Use goimports for lint checking

This switches us to use goimports for linting of files. It performs the same role as gofmt, plus also checks import paths and makes sure they are grouped according to guidelines.

For reference, the 'correct' format:

```go
import (
    // stdlib packages
    "fmt"
    "os/exec"

    // external packages
    "github.com/golang/glog"
    "k8s.io/apimachinery/pkg/apis/meta/v1"

    // packages belonging to our repo
    "github.com/jetstack/navigator/pkg/apis/v1alpha1"
)
```

**Release note**:
```release-note
NONE
```

Author: jetstack-ci-bot

Makefile

@@ -88,13 +88,7 @@ go_test:
 	go test -v $$(go list ./... | grep -v '/vendor/')
 
 go_fmt:
-	@set -e; \
-	GO_FMT=$$(git ls-files *.go | grep -v 'vendor/' | xargs gofmt -d); \
-	if [ -n "$${GO_FMT}" ] ; then \
-		echo "Please run go fmt"; \
-		echo "$$GO_FMT"; \
-		exit 1; \
-	fi
+	./hack/verify-lint.sh
 
 # This section contains the code generation stuff
 #################################################

cmd/pilot-cassandra/main.go

@@ -6,9 +6,10 @@ import (
 	"runtime"
 
 	"github.com/golang/glog"
-	"github.com/jetstack/navigator/pkg/pilot/genericpilot/signals"
 	"k8s.io/apiserver/pkg/util/logs"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+
+	"github.com/jetstack/navigator/pkg/pilot/genericpilot/signals"
 )
 
 func main() {

cmd/pilot-cassandra/pilot.go

@@ -3,8 +3,9 @@ package main
 import (
 	"io"
 
-	"github.com/jetstack/navigator/pkg/pilot/cassandra/v3"
 	"github.com/spf13/cobra"
+
+	"github.com/jetstack/navigator/pkg/pilot/cassandra/v3"
 )
 
 // NewCommandStartPilot provides a CLI handler for the pilot

cmd/pilot-elasticsearch/pilot.go

@@ -1,9 +1,11 @@
 package main
 
 import (
-	"github.com/jetstack/navigator/pkg/pilot/elasticsearch/v5"
-	"github.com/spf13/cobra"
 	"io"
+
+	"github.com/spf13/cobra"
+
+	"github.com/jetstack/navigator/pkg/pilot/elasticsearch/v5"
 )
 
 // NewCommandStartPilot provides a CLI handler for the pilot

hack/update-lint.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REPO_ROOT=$(dirname "${BASH_SOURCE}")/..
+cd "${REPO_ROOT}"
+
+# TODO: remove nasty grepping
+LINT_PKGS=$(find . -type f \
+    ! -name 'zz_generated.*' \
+    ! -path './pkg/client/*' \
+    ! -path './vendor/*' | grep '\.go'
+)
+
+goimports -w \
+    -local github.com/jetstack/navigator \
+    ${LINT_PKGS}

hack/verify-lint.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REPO_ROOT=$(dirname "${BASH_SOURCE}")/..
+cd "${REPO_ROOT}"
+
+# TODO: remove nasty grepping
+LINT_PKGS=$(find . -type f \
+    ! -name 'zz_generated.*' \
+    ! -path './pkg/client/*' \
+    ! -path './vendor/*' | grep '\.go'
+)
+
+GO_IMPORTS=$(goimports -d \
+    -local github.com/jetstack/navigator \
+    ${LINT_PKGS} \
+)
+
+if [ -n "${GO_IMPORTS}" ] ; then \
+    echo "Please run ./hack/update-lint.sh"; \
+    echo "$GO_IMPORTS"; \
+    exit 1; \
+fi

pkg/apis/navigator/v1alpha1/register.go

@@ -17,10 +17,11 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"github.com/jetstack/navigator/pkg/apis/navigator"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/jetstack/navigator/pkg/apis/navigator"
 )
 
 // SchemeGroupVersion is group version used to register these objects

pkg/controllers/cassandra/cassandra.go

@@ -18,6 +18,8 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
 
+	rbacinformers "k8s.io/client-go/informers/rbac/v1beta1"
+
 	navigatorclientset "github.com/jetstack/navigator/pkg/client/clientset/versioned"
 	navigatorinformers "github.com/jetstack/navigator/pkg/client/informers/externalversions/navigator/v1alpha1"
 	listersv1alpha1 "github.com/jetstack/navigator/pkg/client/listers/navigator/v1alpha1"
@@ -29,7 +31,6 @@ import (
 	servicecql "github.com/jetstack/navigator/pkg/controllers/cassandra/service/cql"
 	serviceseedprovider "github.com/jetstack/navigator/pkg/controllers/cassandra/service/seedprovider"
 	"github.com/jetstack/navigator/pkg/controllers/cassandra/serviceaccount"
-	rbacinformers "k8s.io/client-go/informers/rbac/v1beta1"
 )
 
 // NewCassandra returns a new CassandraController that can be used

pkg/controllers/cassandra/cluster_control.go

@@ -2,6 +2,9 @@ package cassandra
 
 import (
 	"github.com/golang/glog"
+	apiv1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/tools/record"
+
 	v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
 	"github.com/jetstack/navigator/pkg/controllers/cassandra/nodepool"
 	"github.com/jetstack/navigator/pkg/controllers/cassandra/pilot"
@@ -10,8 +13,6 @@ import (
 	servicecql "github.com/jetstack/navigator/pkg/controllers/cassandra/service/cql"
 	serviceseedprovider "github.com/jetstack/navigator/pkg/controllers/cassandra/service/seedprovider"
 	"github.com/jetstack/navigator/pkg/controllers/cassandra/serviceaccount"
-	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/client-go/tools/record"
 )
 
 const (

pkg/controllers/cassandra/nodepool/nodepool.go

@@ -1,12 +1,13 @@
 package nodepool
 
 import (
-	v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
-	"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
 	appslisters "k8s.io/client-go/listers/apps/v1beta1"
 	"k8s.io/client-go/tools/record"
+
+	v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
+	"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
 )
 
 type Interface interface {