[Linter] Unify imports (#1042)

Author: ajanikow

.golangci.yaml

@@ -0,0 +1,34 @@
+---
+
+run:
+  issues-exit-code: 3
+  timeout: 30m
+  skip-dirs:
+    - vendor
+    - .gobuild
+    - deps
+    - tools
+
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - gosimple 
+    - govet 
+    - ineffassign 
+    - staticcheck 
+    - structcheck 
+    - typecheck 
+    - unconvert 
+    - unparam 
+    - unused 
+    - varcheck
+    - importas
+
+linters-settings:
+  importas:
+    alias:
+      - pkg: k8s.io/api/core/v1
+        alias: core
+      - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+        alias: meta

Makefile

@@ -182,10 +182,6 @@ allall: all
 # Tip: Run `eval $(minikube docker-env)` before calling make if you're developing on minikube.
 #
 
-GOLANGCI_ENABLED=deadcode gosimple govet ineffassign staticcheck structcheck typecheck unconvert unparam unused varcheck
-#GOLANGCI_ENABLED=gocyclo goconst golint maligned errcheck interfacer megacheck
-#GOLANGCI_ENABLED+=dupl - disable dupl check
-
 .PHONY: license-verify
 license-verify:
 	@echo ">> Verify license of files"
@@ -208,11 +204,11 @@ fmt-verify: license-verify
 
 .PHONY: linter
 linter:
-	$(GOPATH)/bin/golangci-lint run --build-tags "$(RELEASE_MODE)" --no-config --issues-exit-code=1 --deadline=30m --exclude-use-default=false \
-	--disable-all $(foreach EXCLUDE_DIR,$(EXCLUDE_DIRS),--skip-dirs $(EXCLUDE_DIR)) \
-	$(foreach MODE,$(GOLANGCI_ENABLED),--enable $(MODE)) \
-	$(foreach LINT_EXCLUDE,$(LINT_EXCLUDES),--exclude '$(LINT_EXCLUDE)') \
-	./...
+	$(GOPATH)/bin/golangci-lint run --build-tags "$(RELEASE_MODE)" $(foreach LINT_EXCLUDE,$(LINT_EXCLUDES),--exclude '$(LINT_EXCLUDE)') ./...
+
+.PHONY: linter-fix
+linter-fix:
+	$(GOPATH)/bin/golangci-lint run --fix --build-tags "$(RELEASE_MODE)" $(foreach LINT_EXCLUDE,$(LINT_EXCLUDES),--exclude '$(LINT_EXCLUDE)') ./...
 
 .PHONY: build
 build: docker manifests

cmd/admin.go

@@ -36,8 +36,8 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/util/globals"
 
 	"github.com/spf13/cobra"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	core "k8s.io/api/core/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/arangodb-helper/go-certificates"
 	"github.com/arangodb/go-driver/jwt"
@@ -314,16 +314,16 @@ func getCACertificate(ctx context.Context, secrets secretv1.ReadInterface, name
 	ctxChild, cancel := globals.GetGlobalTimeouts().Kubernetes().WithTimeout(ctx)
 	defer cancel()
 
-	s, err := secrets.Get(ctxChild, name, metav1.GetOptions{})
+	s, err := secrets.Get(ctxChild, name, meta.GetOptions{})
 	if err != nil {
 		return nil, errors.WithMessage(err, fmt.Sprintf("failed to get secret \"%s\"", name))
 	}
 
-	if data, ok := s.Data[v1.ServiceAccountRootCAKey]; ok {
+	if data, ok := s.Data[core.ServiceAccountRootCAKey]; ok {
 		return certificates.LoadCertPool(string(data))
 	}
 
-	return nil, errors.New(fmt.Sprintf("the \"%s\" does not exist in the secret \"%s\"", v1.ServiceAccountRootCAKey,
+	return nil, errors.New(fmt.Sprintf("the \"%s\" does not exist in the secret \"%s\"", core.ServiceAccountRootCAKey,
 		name))
 }
 
@@ -341,7 +341,7 @@ func getDeployment(ctx context.Context, namespace, deplName string) (api.ArangoD
 	ctxChild, cancel := globals.GetGlobalTimeouts().Kubernetes().WithTimeout(ctx)
 	defer cancel()
 
-	deployments, err := extCli.DatabaseV1().ArangoDeployments(namespace).List(ctxChild, metav1.ListOptions{})
+	deployments, err := extCli.DatabaseV1().ArangoDeployments(namespace).List(ctxChild, meta.ListOptions{})
 	if err != nil {
 		if api.IsNotFound(err) {
 			return api.ArangoDeployment{}, errors.WithMessage(err, "there are no deployments")

cmd/cmd.go

@@ -61,8 +61,8 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	core "k8s.io/api/core/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
@@ -448,7 +448,7 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper
 func getMyPodInfo(kubecli kubernetes.Interface, namespace, name string) (string, string, error) {
 	var image, sa string
 	op := func() error {
-		pod, err := kubecli.CoreV1().Pods(namespace).Get(context.Background(), name, metav1.GetOptions{})
+		pod, err := kubecli.CoreV1().Pods(namespace).Get(context.Background(), name, meta.GetOptions{})
 		if err != nil {
 			logger.
 				Err(err).
@@ -480,7 +480,7 @@ func createRecorder(kubecli kubernetes.Interface, name, namespace string) record
 	eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubecli.CoreV1().RESTClient()).Events(namespace)})
 	combinedScheme := runtime.NewScheme()
 	scheme.AddToScheme(combinedScheme)
-	v1.AddToScheme(combinedScheme)
+	core.AddToScheme(combinedScheme)
 	appsv1.AddToScheme(combinedScheme)
-	return eventBroadcaster.NewRecorder(combinedScheme, v1.EventSource{Component: name})
+	return eventBroadcaster.NewRecorder(combinedScheme, core.EventSource{Component: name})
 }

cmd/lifecycle.go

@@ -36,7 +36,7 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/version"
 
 	"github.com/spf13/cobra"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/shared"
 	"github.com/arangodb/kube-arangodb/pkg/util/constants"
@@ -119,7 +119,7 @@ func cmdLifecyclePreStopRunFinalizer(cmd *cobra.Command, args []string) {
 	pods := client.Kubernetes().CoreV1().Pods(namespace)
 	recentErrors := 0
 	for {
-		p, err := pods.Get(context.Background(), name, metav1.GetOptions{})
+		p, err := pods.Get(context.Background(), name, meta.GetOptions{})
 		if k8sutil.IsNotFound(err) {
 			logger.Warn("Pod not found")
 			return
@@ -218,7 +218,7 @@ func (c *cmdLifecyclePreStopRunPort) run(cmd *cobra.Command, args []string) erro
 
 		conn.Close()
 
-		p, err := pods.Get(context.Background(), name, metav1.GetOptions{})
+		p, err := pods.Get(context.Background(), name, meta.GetOptions{})
 		if k8sutil.IsNotFound(err) {
 			logger.Warn("Pod not found")
 			return nil

cmd/reboot.go

@@ -41,9 +41,9 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/util/kclient"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	corev1 "k8s.io/api/core/v1"
+	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/client-go/kubernetes"
 )
@@ -103,91 +103,91 @@ func runVolumeInspector(ctx context.Context, kube kubernetes.Interface, ns, name
 
 	deletePVC := true
 	claimname := "arangodb-reboot-pvc-" + name
-	pvcspec := corev1.PersistentVolumeClaim{
-		ObjectMeta: metav1.ObjectMeta{
+	pvcspec := core.PersistentVolumeClaim{
+		ObjectMeta: meta.ObjectMeta{
 			Name: claimname,
 			Labels: map[string]string{
 				"app":      "arangodb",
 				"rebooted": "yes",
 			},
 		},
-		Spec: corev1.PersistentVolumeClaimSpec{
-			AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+		Spec: core.PersistentVolumeClaimSpec{
+			AccessModes: []core.PersistentVolumeAccessMode{core.ReadWriteOnce},
 			VolumeName:  name,
-			Resources: corev1.ResourceRequirements{
-				Requests: corev1.ResourceList{
-					corev1.ResourceStorage: *resource.NewQuantity(1024*1024*1024, resource.DecimalSI),
+			Resources: core.ResourceRequirements{
+				Requests: core.ResourceList{
+					core.ResourceStorage: *resource.NewQuantity(1024*1024*1024, resource.DecimalSI),
 				},
 			},
 			StorageClassName: util.NewString(storageClassName),
 		},
 	}
 
-	_, err := kube.CoreV1().PersistentVolumeClaims(ns).Create(context.Background(), &pvcspec, metav1.CreateOptions{})
+	_, err := kube.CoreV1().PersistentVolumeClaims(ns).Create(context.Background(), &pvcspec, meta.CreateOptions{})
 	if err != nil {
 		return "", "", errors.Wrap(err, "failed to create pvc")
 	}
 	defer func() {
 		if deletePVC {
 			logger.Str("pvc-name", claimname).Debug("deleting pvc")
-			kube.CoreV1().PersistentVolumeClaims(ns).Delete(context.Background(), claimname, metav1.DeleteOptions{})
+			kube.CoreV1().PersistentVolumeClaims(ns).Delete(context.Background(), claimname, meta.DeleteOptions{})
 		}
 	}()
 
 	podname := "arangodb-reboot-pod-" + name
-	podspec := corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
+	podspec := core.Pod{
+		ObjectMeta: meta.ObjectMeta{
 			Name: podname,
 		},
-		Spec: corev1.PodSpec{
-			RestartPolicy: corev1.RestartPolicyNever,
-			Containers: []corev1.Container{
-				corev1.Container{
+		Spec: core.PodSpec{
+			RestartPolicy: core.RestartPolicyNever,
+			Containers: []core.Container{
+				core.Container{
 					Name:            "inspector",
 					Image:           image,
-					ImagePullPolicy: corev1.PullAlways,
+					ImagePullPolicy: core.PullAlways,
 					Command:         []string{"arangodb_operator"},
 					Args:            []string{"reboot", "inspect"},
-					Env: []corev1.EnvVar{
-						corev1.EnvVar{
+					Env: []core.EnvVar{
+						core.EnvVar{
 							Name:  constants.EnvOperatorPodNamespace,
 							Value: ns,
 						},
 					},
-					VolumeMounts: []corev1.VolumeMount{
-						corev1.VolumeMount{
+					VolumeMounts: []core.VolumeMount{
+						core.VolumeMount{
 							MountPath: "/data",
 							Name:      "data",
 						},
 					},
-					Ports: []corev1.ContainerPort{
-						corev1.ContainerPort{
+					Ports: []core.ContainerPort{
+						core.ContainerPort{
 							ContainerPort: 8080,
 						},
 					},
-					ReadinessProbe: &corev1.Probe{
-						Handler: corev1.Handler{
-							HTTPGet: &corev1.HTTPGetAction{
+					ReadinessProbe: &core.Probe{
+						Handler: core.Handler{
+							HTTPGet: &core.HTTPGetAction{
 								Path: "/info",
 								Port: intstr.FromInt(8080),
 							},
 						},
 					},
 				},
 			},
-			Volumes: []corev1.Volume{
+			Volumes: []core.Volume{
 				k8sutil.CreateVolumeWithPersitantVolumeClaim("data", claimname),
 			},
 		},
 	}
 
-	_, err = kube.CoreV1().Pods(ns).Create(context.Background(), &podspec, metav1.CreateOptions{})
+	_, err = kube.CoreV1().Pods(ns).Create(context.Background(), &podspec, meta.CreateOptions{})
 	if err != nil {
 		return "", "", errors.Wrap(err, "failed to create pod")
 	}
-	defer kube.CoreV1().Pods(ns).Delete(context.Background(), podname, metav1.DeleteOptions{})
+	defer kube.CoreV1().Pods(ns).Delete(context.Background(), podname, meta.DeleteOptions{})
 
-	podwatch, err := kube.CoreV1().Pods(ns).Watch(context.Background(), metav1.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", podname).String()})
+	podwatch, err := kube.CoreV1().Pods(ns).Watch(context.Background(), meta.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", podname).String()})
 	if err != nil {
 		return "", "", errors.Wrap(err, "failed to watch for pod")
 	}
@@ -204,18 +204,18 @@ func runVolumeInspector(ctx context.Context, kube kubernetes.Interface, ns, name
 			}
 
 			// get the pod
-			pod, ok := ev.Object.(*corev1.Pod)
+			pod, ok := ev.Object.(*core.Pod)
 			if !ok {
 				return "", "", fmt.Errorf("failed to get pod")
 			}
 
 			switch pod.Status.Phase {
-			case corev1.PodFailed:
+			case core.PodFailed:
 				return "", "", fmt.Errorf("pod failed: %s", pod.Status.Reason)
-			case corev1.PodRunning:
+			case core.PodRunning:
 				podReady := false
 				for _, c := range pod.Status.Conditions {
-					if c.Type == corev1.PodReady && c.Status == corev1.ConditionTrue {
+					if c.Type == core.PodReady && c.Status == core.ConditionTrue {
 						podReady = true
 					}
 				}
@@ -264,22 +264,22 @@ func doVolumeInspection(ctx context.Context, kube kubernetes.Interface, ns, name
 }
 
 func checkVolumeAvailable(kube kubernetes.Interface, vname string) (VolumeInfo, error) {
-	volume, err := kube.CoreV1().PersistentVolumes().Get(context.Background(), vname, metav1.GetOptions{})
+	volume, err := kube.CoreV1().PersistentVolumes().Get(context.Background(), vname, meta.GetOptions{})
 	if err != nil {
 		return VolumeInfo{}, errors.Wrapf(err, "failed to GET volume %s", vname)
 	}
 
 	switch volume.Status.Phase {
-	case corev1.VolumeAvailable:
+	case core.VolumeAvailable:
 		break
-	case corev1.VolumeReleased:
+	case core.VolumeReleased:
 		// we have to remove the claim reference
 		volume.Spec.ClaimRef = nil
-		if _, err := kube.CoreV1().PersistentVolumes().Update(context.Background(), volume, metav1.UpdateOptions{}); err != nil {
+		if _, err := kube.CoreV1().PersistentVolumes().Update(context.Background(), volume, meta.UpdateOptions{}); err != nil {
 			return VolumeInfo{}, errors.Wrapf(err, "failed to remove claim reference")
 		}
 	default:
-		return VolumeInfo{}, fmt.Errorf("Volume %s phase is %s, expected %s", vname, volume.Status.Phase, corev1.VolumeAvailable)
+		return VolumeInfo{}, fmt.Errorf("Volume %s phase is %s, expected %s", vname, volume.Status.Phase, core.VolumeAvailable)
 	}
 
 	return VolumeInfo{StorageClassName: volume.Spec.StorageClassName}, nil
@@ -306,7 +306,7 @@ func preflightChecks(kube kubernetes.Interface, volumes []string) (VolumeListInf
 }
 
 func getMyImage(kube kubernetes.Interface, ns, name string) (string, error) {
-	pod, err := kube.CoreV1().Pods(ns).Get(context.Background(), name, metav1.GetOptions{})
+	pod, err := kube.CoreV1().Pods(ns).Get(context.Background(), name, meta.GetOptions{})
 	if err != nil {
 		return "", err
 	}
@@ -330,7 +330,7 @@ func createArangoDeployment(cli acli.Interface, ns, deplname, arangoimage string
 	}
 
 	depl := deplv1.ArangoDeployment{
-		ObjectMeta: metav1.ObjectMeta{
+		ObjectMeta: meta.ObjectMeta{
 			Name: deplname,
 		},
 		Spec: deplv1.DeploymentSpec{
@@ -367,7 +367,7 @@ func createArangoDeployment(cli acli.Interface, ns, deplname, arangoimage string
 		})
 	}
 
-	if _, err := cli.DatabaseV1().ArangoDeployments(ns).Create(context.Background(), &depl, metav1.CreateOptions{}); err != nil {
+	if _, err := cli.DatabaseV1().ArangoDeployments(ns).Create(context.Background(), &depl, meta.CreateOptions{}); err != nil {
 		return errors.Wrap(err, "failed to create ArangoDeployment")
 	}