Lint import aliases using go-import-alias

FIxes #3021

Signed-off-by: Shayegan Hooshyari <sh.hooshyari@gmail.com>

apis/projectcontour/v1/httpproxy.go

@@ -14,8 +14,8 @@
 package v1
 
 import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	core_v1 "k8s.io/api/core/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // HTTPProxySpec defines the spec of the CRD.

apis/projectcontour/v1/kubeconditions.go

@@ -22,7 +22,7 @@ package v1
 // This should be removed once we update to a version of client-go
 // that includes a metav1.Condition type.
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type ConditionStatus string

apis/projectcontour/v1/register.go

@@ -13,7 +13,7 @@
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

apis/projectcontour/v1/tlscertificatedelegation.go

@@ -14,7 +14,7 @@
 package v1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // TLSCertificateDelegationSpec defines the spec of the CRD

apis/projectcontour/v1alpha1/extensionservice.go

@@ -15,7 +15,7 @@ package v1alpha1
 
 import (
 	contour_api_v1 "github.com/projectcontour/contour/apis/projectcontour/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // ExtensionProtocolVersion is the version of the GRPC protocol used

apis/projectcontour/v1alpha1/register.go

@@ -14,7 +14,7 @@
 package v1alpha1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

cmd/contour/bootstrap.go

@@ -15,7 +15,7 @@ package main
 
 import (
 	"github.com/projectcontour/contour/internal/envoy"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	kingpin_v2 "gopkg.in/alecthomas/kingpin.v2"
 )
 
 // registerBootstrap registers the bootstrap subcommand and flags

cmd/contour/certgen.go

@@ -22,8 +22,8 @@ import (
 	"github.com/projectcontour/contour/internal/certgen"
 	"github.com/projectcontour/contour/internal/k8s"
 	"github.com/sirupsen/logrus"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
-	corev1 "k8s.io/api/core/v1"
+	kingpin_v2 "gopkg.in/alecthomas/kingpin.v2"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
 )
 

cmd/contour/cli.go

@@ -20,11 +20,11 @@ import (
 	"io/ioutil"
 	"os"
 
-	v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
+	api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
 	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	kingpin_v2 "gopkg.in/alecthomas/kingpin.v2"
 )
 
 // Client holds the details for the cli client to connect to.

cmd/contour/contour.go

@@ -16,14 +16,14 @@ package main
 import (
 	"os"
 
-	resource "github.com/envoyproxy/go-control-plane/pkg/resource/v2"
+	resource_v2 "github.com/envoyproxy/go-control-plane/pkg/resource/v2"
 	"github.com/projectcontour/contour/internal/build"
 	envoy_v2 "github.com/projectcontour/contour/internal/envoy/v2"
 	envoy_v3 "github.com/projectcontour/contour/internal/envoy/v3"
 	"github.com/projectcontour/contour/internal/k8s"
 	"github.com/projectcontour/contour/pkg/config"
 	"github.com/sirupsen/logrus"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	kingpin_v2 "gopkg.in/alecthomas/kingpin.v2"
 )
 
 func main() {

cmd/contour/ingressstatus.go

@@ -21,7 +21,7 @@ import (
 	contour_api_v1 "github.com/projectcontour/contour/apis/projectcontour/v1"
 	"github.com/projectcontour/contour/internal/k8s"
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

cmd/contour/serve.go

@@ -49,9 +49,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/alecthomas/kingpin.v2"
-	corev1 "k8s.io/api/core/v1"
-	networking_api_v1beta1 "k8s.io/api/networking/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	core_v1 "k8s.io/api/core/v1"
+	networking_v1beta1 "k8s.io/api/networking/v1beta1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

hack/generate-metrics-doc.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/projectcontour/contour/internal/metrics"
 	"github.com/prometheus/client_golang/prometheus"
-	dto "github.com/prometheus/client_model/go"
+	go "github.com/prometheus/client_model/go"
 )
 
 // Collect all the label names for this metric and return them as

internal/annotation/annotations.go

@@ -18,10 +18,10 @@ import (
 	"strconv"
 	"strings"
 
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
 	"github.com/projectcontour/contour/internal/timeout"
 	"k8s.io/api/networking/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // DEFAULT_INGRESS_CLASS is the Contour default.

internal/certgen/certgen.go

@@ -21,9 +21,9 @@ import (
 	"path"
 
 	"github.com/projectcontour/contour/internal/dag"
-	corev1 "k8s.io/api/core/v1"
-	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	core_v1 "k8s.io/api/core/v1"
+	errors "k8s.io/apimachinery/pkg/api/errors"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 

internal/certgen/output.go

@@ -18,7 +18,7 @@ import (
 	"os"
 	"path"
 
-	corev1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/client-go/kubernetes/scheme"
 )

internal/contour/handler.go

@@ -25,7 +25,7 @@ import (
 	"github.com/projectcontour/contour/internal/dag"
 	"github.com/projectcontour/contour/internal/k8s"
 	"github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // EventHandler implements cache.ResourceEventHandler, filters k8s events towards

internal/dag/accessors.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/projectcontour/contour/internal/annotation"
 	"github.com/projectcontour/contour/internal/k8s"
-	v1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )

internal/dag/cache.go

@@ -24,12 +24,12 @@ import (
 	"github.com/projectcontour/contour/internal/annotation"
 	"github.com/projectcontour/contour/internal/k8s"
 	"github.com/sirupsen/logrus"
-	v1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/api/networking/v1beta1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/tools/cache"
-	serviceapis "sigs.k8s.io/service-apis/api/v1alpha1"
+	api_v1alpha1 "sigs.k8s.io/service-apis/api/v1alpha1"
 )
 
 // A KubernetesCache holds Kubernetes objects and associated configuration and produces

internal/dag/dag.go

@@ -22,12 +22,12 @@ import (
 	"strings"
 	"time"
 
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
 	contour_api_v1 "github.com/projectcontour/contour/apis/projectcontour/v1"
 	"github.com/projectcontour/contour/internal/status"
 	"github.com/projectcontour/contour/internal/timeout"
 	"github.com/projectcontour/contour/internal/xds"
-	v1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
 

internal/dag/extension_processor.go

@@ -23,7 +23,7 @@ import (
 	"github.com/projectcontour/contour/internal/status"
 	"github.com/projectcontour/contour/internal/xds"
 	"github.com/sirupsen/logrus"
-	corev1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )

internal/dag/httpproxy_processor.go

@@ -18,7 +18,7 @@ import (
 	"sort"
 	"strings"
 
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
 	contour_api_v1 "github.com/projectcontour/contour/apis/projectcontour/v1"
 	contour_api_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1"
 	"github.com/projectcontour/contour/internal/annotation"

internal/dag/ingress_processor.go

@@ -16,7 +16,7 @@ package dag
 import (
 	"strings"
 
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
 	"github.com/projectcontour/contour/internal/annotation"
 	"github.com/projectcontour/contour/internal/k8s"
 	"github.com/sirupsen/logrus"

internal/dag/secret.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	v1 "k8s.io/api/core/v1"
+	core_v1 "k8s.io/api/core/v1"
 )
 
 // CACertificateKey is the key name for accessing TLS CA certificate bundles in Kubernetes Secrets.

internal/envoy/v2/accesslog.go

@@ -14,8 +14,8 @@
 package v2
 
 import (
-	accesslogv2 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2"
-	accesslog "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2"
+	accesslog_v2 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2"
+	accesslog_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2"
 	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	"github.com/projectcontour/contour/internal/protobuf"

internal/envoy/v2/auth.go

@@ -14,8 +14,8 @@
 package v2
 
 import (
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
 	matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher"
 	"github.com/projectcontour/contour/internal/dag"
 	"github.com/projectcontour/contour/internal/envoy"

internal/envoy/v2/bootstrap.go

@@ -24,11 +24,11 @@ import (
 	"strings"
 	"time"
 
-	api "github.com/envoyproxy/go-control-plane/envoy/api/v2"
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
-	clusterv2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
-	envoy_api_bootstrap "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2"
+	api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	cluster_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	bootstrap_v2 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2"
 	matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher"
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/any"

internal/envoy/v2/cluster.go

@@ -17,9 +17,9 @@ import (
 	"strings"
 	"time"
 
-	v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
-	envoy_cluster "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
+	cluster_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/cluster"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
 	envoy_type "github.com/envoyproxy/go-control-plane/envoy/type"
 	"github.com/projectcontour/contour/internal/dag"
 	"github.com/projectcontour/contour/internal/envoy"

internal/envoy/v2/endpoint.go

@@ -14,9 +14,9 @@
 package v2
 
 import (
-	v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
-	envoy_api_v2_endpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint"
+	api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	endpoint_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint"
 	"github.com/projectcontour/contour/internal/protobuf"
 )
 

internal/envoy/v2/healthcheck.go

@@ -16,7 +16,7 @@ package v2
 import (
 	"time"
 
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
 	"github.com/golang/protobuf/ptypes/duration"
 	"github.com/projectcontour/contour/internal/dag"
 	"github.com/projectcontour/contour/internal/envoy"

internal/envoy/v2/listener.go

@@ -20,15 +20,15 @@ import (
 	"strings"
 	"time"
 
-	v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
-	envoy_api_v2_listener "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"
-	accesslog "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2"
+	api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	listener_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"
+	accesslog_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2"
 	envoy_config_filter_http_ext_authz_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2"
-	lua "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/lua/v2"
-	http "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2"
-	tcp "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2"
+	lua_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/lua/v2"
+	manager_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2"
+	proxy_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2"
 	envoy_type "github.com/envoyproxy/go-control-plane/envoy/type"
 	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 	"github.com/projectcontour/contour/internal/dag"

internal/envoy/v2/route.go

@@ -19,9 +19,9 @@ import (
 	"sort"
 	"strings"
 
-	v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
-	envoy_api_v2_route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route"
+	api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	route_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/route"
 	envoy_config_filter_http_ext_authz_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/ext_authz/v2"
 	matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher"
 	"github.com/golang/protobuf/ptypes/any"

internal/envoy/v2/secret.go

@@ -14,8 +14,8 @@
 package v2
 
 import (
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
 	"github.com/projectcontour/contour/internal/dag"
 	"github.com/projectcontour/contour/internal/envoy"
 )

internal/envoy/v2/socket.go

@@ -14,8 +14,8 @@
 package v2
 
 import (
-	envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
-	envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
+	auth_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
+	core_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
 	"github.com/projectcontour/contour/internal/protobuf"
 )