update linters (istio#10809)

Signed-off-by: Kuat Yessenov <[email protected]>
muqingCai · Jan 8, 2019 · 5169b97 · 5169b97
1 parent 45b6a79
commit 5169b97
Show file tree

Hide file tree

Showing 153 changed files with 428 additions and 420 deletions.
diff --git a/addons/servicegraph/promgen/promgen.go b/addons/servicegraph/promgen/promgen.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/api"
-	"github.com/prometheus/client_golang/api/prometheus/v1"
+	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 
 	"istio.io/istio/addons/servicegraph"

diff --git a/bin/linters.sh b/bin/linters.sh
@@ -87,7 +87,7 @@ function install_gometalinter() {
 }
 
 function install_golangcilint() {
-  GOLANGCI_VERSION="v1.12.2"
+  GOLANGCI_VERSION="v1.12.4"
   curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b "$GOPATH"/bin "$GOLANGCI_VERSION"
   golangci-lint --version
 }

diff --git a/galley/pkg/crd/validation/endpoint.go b/galley/pkg/crd/validation/endpoint.go
@@ -15,7 +15,7 @@
 package validation
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 )

diff --git a/galley/pkg/crd/validation/validation.go b/galley/pkg/crd/validation/validation.go
@@ -23,7 +23,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/go-multierror"
+	multierror "github.com/hashicorp/go-multierror"
 
 	"istio.io/istio/galley/cmd/shared"
 	"istio.io/istio/mixer/adapter"

diff --git a/galley/pkg/crd/validation/webhook.go b/galley/pkg/crd/validation/webhook.go
@@ -30,7 +30,7 @@ import (
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	"k8s.io/api/admissionregistration/v1beta1"
 	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/galley/pkg/crd/validation/webhook_test.go b/galley/pkg/crd/validation/webhook_test.go
@@ -30,7 +30,7 @@ import (
 	"github.com/ghodss/yaml"
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

diff --git a/galley/pkg/kube/resourcespec.go b/galley/pkg/kube/resourcespec.go
@@ -17,7 +17,7 @@ package kube
 import (
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	sc "k8s.io/apimachinery/pkg/runtime/schema"
 
 	"istio.io/istio/galley/pkg/kube/converter"

diff --git a/galley/pkg/kube/resourcespec_test.go b/galley/pkg/kube/resourcespec_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	sc "k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/galley/pkg/kube/source/init.go b/galley/pkg/kube/source/init.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/go-multierror"
+	multierror "github.com/hashicorp/go-multierror"
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/galley/pkg/server/configmap.go b/galley/pkg/server/configmap.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/fsnotify/fsnotify"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	"istio.io/istio/pkg/filewatcher"
 	"istio.io/istio/pkg/mcp/server"

diff --git a/galley/pkg/testing/testdata/dataset.gen.go b/galley/pkg/testing/testdata/dataset.gen.go
diff --git a/istioctl/cmd/istioctl/deprecated_cmd.go b/istioctl/cmd/istioctl/deprecated_cmd.go
@@ -29,9 +29,9 @@ import (
 	"time"
 
 	"github.com/ghodss/yaml"
-	"github.com/hashicorp/go-multierror"
+	multierror "github.com/hashicorp/go-multierror"
 	"github.com/spf13/cobra"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/istioctl/cmd/istioctl/main.go b/istioctl/cmd/istioctl/main.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	// import all known client auth plugins
 	_ "k8s.io/client-go/plugin/pkg/client/auth"

diff --git a/istioctl/cmd/istioctl/metrics.go b/istioctl/cmd/istioctl/metrics.go
@@ -31,7 +31,7 @@ import (
 	promv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 	"github.com/spf13/cobra"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/portforward"

diff --git a/istioctl/cmd/istioctl/proxyconfig.go b/istioctl/cmd/istioctl/proxyconfig.go
@@ -19,7 +19,7 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	"istio.io/istio/istioctl/pkg/writer/envoy/clusters"
 	"istio.io/istio/istioctl/pkg/writer/envoy/configdump"

diff --git a/istioctl/pkg/kubernetes/client.go b/istioctl/pkg/kubernetes/client.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"

diff --git a/istioctl/pkg/writer/pilot/auth.go b/istioctl/pkg/writer/pilot/auth.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"text/tabwriter"
 
-	"istio.io/istio/pilot/pkg/proxy/envoy/v2"
+	v2 "istio.io/istio/pilot/pkg/proxy/envoy/v2"
 )
 
 // TLSCheckWriter enables printing of tls-check using a single Pilot response

diff --git a/istioctl/pkg/writer/pilot/auth_test.go b/istioctl/pkg/writer/pilot/auth_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"istio.io/istio/pilot/pkg/proxy/envoy/v2"
+	v2 "istio.io/istio/pilot/pkg/proxy/envoy/v2"
 	"istio.io/istio/tests/util"
 )
 

diff --git a/istioctl/pkg/writer/pilot/status.go b/istioctl/pkg/writer/pilot/status.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"istio.io/istio/pilot/pkg/proxy/envoy/v2"
+	v2 "istio.io/istio/pilot/pkg/proxy/envoy/v2"
 )
 
 // StatusWriter enables printing of sync status using multiple []byte Pilot responses

diff --git a/istioctl/pkg/writer/pilot/status_test.go b/istioctl/pkg/writer/pilot/status_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"istio.io/istio/pilot/pkg/proxy/envoy/v2"
+	v2 "istio.io/istio/pilot/pkg/proxy/envoy/v2"
 	"istio.io/istio/tests/util"
 )
 

diff --git a/mixer/adapter/kubernetesenv/cache.go b/mixer/adapter/kubernetesenv/cache.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"

diff --git a/mixer/adapter/kubernetesenv/cache_test.go b/mixer/adapter/kubernetesenv/cache_test.go
@@ -17,7 +17,7 @@ package kubernetesenv
 import (
 	"testing"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"

diff --git a/mixer/adapter/kubernetesenv/kubernetesenv.go b/mixer/adapter/kubernetesenv/kubernetesenv.go
@@ -33,7 +33,7 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	k8s "k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth" // needed for auth
 	"k8s.io/client-go/tools/cache"

diff --git a/mixer/adapter/kubernetesenv/kubernetesenv_test.go b/mixer/adapter/kubernetesenv/kubernetesenv_test.go
@@ -24,7 +24,7 @@ import (
 
 	messagediff "gopkg.in/d4l3k/messagediff.v1"
 	appsv1 "k8s.io/api/apps/v1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"

diff --git a/.../vendor/cloud.google.com/go/contextgraph/apiv1alpha1/context_graph_client_example_test.go b/.../vendor/cloud.google.com/go/contextgraph/apiv1alpha1/context_graph_client_example_test.go
diff --git a/mixer/pkg/attribute/list.gen.go b/mixer/pkg/attribute/list.gen.go
diff --git a/mixer/pkg/config/mcp/backend_test.go b/mixer/pkg/config/mcp/backend_test.go
@@ -31,7 +31,7 @@ import (
 	"istio.io/istio/mixer/pkg/config/store"
 	"istio.io/istio/mixer/pkg/runtime/config/constant"
 	"istio.io/istio/pkg/mcp/snapshot"
-	"istio.io/istio/pkg/mcp/testing"
+	mcptest "istio.io/istio/pkg/mcp/testing"
 )
 
 var (

diff --git a/mixer/pkg/il/interpreter/interpreterBenchmark_test.go b/mixer/pkg/il/interpreter/interpreterBenchmark_test.go
@@ -17,7 +17,7 @@ package interpreter
 import (
 	"testing"
 
-	"istio.io/istio/mixer/pkg/il/testing"
+	ilt "istio.io/istio/mixer/pkg/il/testing"
 	"istio.io/istio/mixer/pkg/il/text"
 )
 

diff --git a/mixer/pkg/il/interpreter/interpreter_test.go b/mixer/pkg/il/interpreter/interpreter_test.go
@@ -23,7 +23,7 @@ import (
 
 	"istio.io/istio/mixer/pkg/attribute"
 	"istio.io/istio/mixer/pkg/il"
-	"istio.io/istio/mixer/pkg/il/testing"
+	ilt "istio.io/istio/mixer/pkg/il/testing"
 	"istio.io/istio/mixer/pkg/il/text"
 )
 

diff --git a/mixer/pkg/lang/compiled/expressionBenchmark_test.go b/mixer/pkg/lang/compiled/expressionBenchmark_test.go
@@ -17,7 +17,7 @@ package compiled
 import (
 	"testing"
 
-	"istio.io/istio/mixer/pkg/il/testing"
+	ilt "istio.io/istio/mixer/pkg/il/testing"
 	"istio.io/istio/mixer/pkg/lang/ast"
 )
 

diff --git a/mixer/pkg/lang/compiled/expressionbuilder_test.go b/mixer/pkg/lang/compiled/expressionbuilder_test.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	istio_mixer_v1_config_descriptor "istio.io/api/policy/v1beta1"
-	"istio.io/istio/mixer/pkg/il/testing"
+	ilt "istio.io/istio/mixer/pkg/il/testing"
 	"istio.io/istio/mixer/pkg/lang/ast"
 )