Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Use goimports for lint checking #213

Merged
merged 2 commits into from
Jan 18, 2018
Merged

Use goimports for lint checking #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
443dfdb
Use goimports for lint checking
Jan 17, 2018
78c1124
Run hack/update-lint.sh
Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#################################################
Expand Down
3 changes: 2 additions & 1 deletion cmd/pilot-cassandra/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 2 additions & 1 deletion cmd/pilot-cassandra/pilot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions cmd/pilot-elasticsearch/pilot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 19 additions & 0 deletions hack/update-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
26 changes: 26 additions & 0 deletions hack/verify-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion pkg/apis/navigator/v1alpha1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/cassandra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/cluster_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/nodepool/nodepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/nodepool/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package nodepool
import (
"fmt"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
apps "k8s.io/api/apps/v1beta1"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
)

const (
Expand Down
13 changes: 7 additions & 6 deletions pkg/controllers/cassandra/pilot/pilot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@ import (
"hash/fnv"
"reflect"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
navigator "github.com/jetstack/navigator/pkg/client/clientset/versioned"
navlisters "github.com/jetstack/navigator/pkg/client/listers/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
hashutil "github.com/jetstack/navigator/pkg/util/hash"
"k8s.io/api/core/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
appslisters "k8s.io/client-go/listers/apps/v1beta1"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/record"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
navigator "github.com/jetstack/navigator/pkg/client/clientset/versioned"
navlisters "github.com/jetstack/navigator/pkg/client/listers/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
hashutil "github.com/jetstack/navigator/pkg/util/hash"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/pilot/pilot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import (

"k8s.io/api/core/v1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/pilot"
casstesting "github.com/jetstack/navigator/pkg/controllers/cassandra/testing"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func clusterPod(cluster *v1alpha1.CassandraCluster, name string) *v1.Pod {
Expand Down
7 changes: 4 additions & 3 deletions pkg/controllers/cassandra/role/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package role

import (
"github.com/jetstack/navigator/pkg/apis/navigator"
"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
rbacv1 "k8s.io/api/rbac/v1beta1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
rbaclisters "k8s.io/client-go/listers/rbac/v1beta1"

"github.com/jetstack/navigator/pkg/apis/navigator"
"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"

"k8s.io/client-go/tools/record"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/rolebinding/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package rolebinding

import (
"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
rbacv1 "k8s.io/api/rbac/v1beta1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
rbaclisters "k8s.io/client-go/listers/rbac/v1beta1"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"

"k8s.io/client-go/tools/record"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/service/cql/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package cql

import (
v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
serviceutil "github.com/jetstack/navigator/pkg/controllers/cassandra/service/util"
"k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/record"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
serviceutil "github.com/jetstack/navigator/pkg/controllers/cassandra/service/util"
)

type Interface interface {
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/service/cql/control_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"fmt"
"testing"

apiv1 "k8s.io/api/core/v1"

"github.com/jetstack/navigator/pkg/controllers/cassandra/service/cql"
servicetesting "github.com/jetstack/navigator/pkg/controllers/cassandra/service/testing"
casstesting "github.com/jetstack/navigator/pkg/controllers/cassandra/testing"
apiv1 "k8s.io/api/core/v1"
)

func newFixture(t *testing.T) *casstesting.Fixture {
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/service/cql/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package cql

import (
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
serviceutil "github.com/jetstack/navigator/pkg/controllers/cassandra/service/util"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
)

func ServiceForCluster(
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/service/seedprovider/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package seedprovider
import (
serviceutil "github.com/jetstack/navigator/pkg/controllers/cassandra/service/util"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/record"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
)

type Interface interface {
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/service/seedprovider/control_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"fmt"
"testing"

apiv1 "k8s.io/api/core/v1"

"github.com/jetstack/navigator/pkg/controllers/cassandra/service/seedprovider"
servicetesting "github.com/jetstack/navigator/pkg/controllers/cassandra/service/testing"
casstesting "github.com/jetstack/navigator/pkg/controllers/cassandra/testing"
apiv1 "k8s.io/api/core/v1"
)

func newFixture(t *testing.T) *casstesting.Fixture {
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/service/seedprovider/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package seedprovider

import (
apiv1 "k8s.io/api/core/v1"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
serviceutil "github.com/jetstack/navigator/pkg/controllers/cassandra/service/util"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
apiv1 "k8s.io/api/core/v1"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/cassandra/service/testing/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package testing
import (
"testing"

casstesting "github.com/jetstack/navigator/pkg/controllers/cassandra/testing"
apiv1 "k8s.io/api/core/v1"

casstesting "github.com/jetstack/navigator/pkg/controllers/cassandra/testing"
)

type FixtureFactory func(t *testing.T) *casstesting.Fixture
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/service/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
corelisters "k8s.io/client-go/listers/core/v1"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"

v1alpha1 "github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
)

func SetStandardServiceAttributes(
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/cassandra/serviceaccount/control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package serviceaccount

import (
"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
"k8s.io/api/core/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/record"

"github.com/jetstack/navigator/pkg/apis/navigator/v1alpha1"
"github.com/jetstack/navigator/pkg/controllers/cassandra/util"
)

type Interface interface {
Expand Down
Loading