feat(ci): add alias rules for golangci-lint

images/dvcr-artifact/.golangci.yaml

@@ -39,6 +39,34 @@ linters-settings:
     # Enable to require nolint directives to mention the specific linter being suppressed.
     # Default: false
     require-specific: true
+  importas:
+    # Do not allow unaliased imports of aliased packages.
+    # Default: false
+    no-unaliased: true
+    # Do not allow non-required aliases.
+    # Default: false
+    no-extra-aliases: false
+    # List of aliases
+    # Default: []
+    alias:
+      - pkg: github.com/deckhouse/virtualization/api/core/v1alpha2
+        alias: ""
+      - pkg: github.com/deckhouse/virtualization/api/subresources/v1alpha2
+        alias: "sub1alpha2"
+      - pkg: kubevirt.io/api/core/v1
+        alias: virtv1
+      - pkg: k8s.io/api/core/v1
+        alias: corev1
+      - pkg: k8s.io/api/authentication/v1
+        alias: authnv1
+      - pkg: k8s.io/api/storage/v1
+        alias: storagev1
+      - pkg: k8s.io/api/networking/v1
+        alias: netv1
+      - pkg: k8s.io/api/policy/v1
+        alias: policyv1
+      - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+        alias: metav1
 
 linters:
   disable-all: true
@@ -77,3 +105,4 @@ linters:
     - tparallel # detects inappropriate usage of t.Parallel() method in your Go test codes
     - whitespace # detects leading and trailing whitespace
     - wastedassign # Finds wasted assignment statements.
+    - importas # checks import aliases against the configured convention

images/virtualization-artifact/.golangci.yaml

@@ -39,6 +39,34 @@ linters-settings:
     # Enable to require nolint directives to mention the specific linter being suppressed.
     # Default: false
     require-specific: true
+  importas:
+    # Do not allow unaliased imports of aliased packages.
+    # Default: false
+    no-unaliased: true
+    # Do not allow non-required aliases.
+    # Default: false
+    no-extra-aliases: false
+    # List of aliases
+    # Default: []
+    alias:
+      - pkg: github.com/deckhouse/virtualization/api/core/v1alpha2
+        alias: ""
+      - pkg: github.com/deckhouse/virtualization/api/subresources/v1alpha2
+        alias: "sub1alpha2"
+      - pkg: kubevirt.io/api/core/v1
+        alias: virtv1
+      - pkg: k8s.io/api/core/v1
+        alias: corev1
+      - pkg: k8s.io/api/authentication/v1
+        alias: authnv1
+      - pkg: k8s.io/api/storage/v1
+        alias: storagev1
+      - pkg: k8s.io/api/networking/v1
+        alias: netv1
+      - pkg: k8s.io/api/policy/v1
+        alias: policyv1
+      - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+        alias: metav1
 
 linters:
   disable-all: true
@@ -77,3 +105,4 @@ linters:
     - tparallel # detects inappropriate usage of t.Parallel() method in your Go test codes
     - whitespace # detects leading and trailing whitespace
     - wastedassign # Finds wasted assignment statements.
+    - importas # checks import aliases against the configured convention

images/virtualization-artifact/cmd/virtualization-controller/main.go

@@ -63,7 +63,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/migration"
 	"github.com/deckhouse/virtualization-controller/pkg/version"
 	"github.com/deckhouse/virtualization/api/client/kubeclient"
-	virtv2alpha1 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 const (
@@ -212,7 +212,7 @@ func main() {
 	for _, f := range []func(*apiruntime.Scheme) error{
 		clientgoscheme.AddToScheme,
 		extv1.AddToScheme,
-		virtv2alpha1.AddToScheme,
+		v1alpha2.AddToScheme,
 		cdiv1beta1.AddToScheme,
 		virtv1.AddToScheme,
 		vsv1.AddToScheme,

images/virtualization-artifact/pkg/apiserver/api/install.go

@@ -32,7 +32,7 @@ import (
 	virtlisters "github.com/deckhouse/virtualization/api/client/generated/listers/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/subresources"
 	"github.com/deckhouse/virtualization/api/subresources/install"
-	"github.com/deckhouse/virtualization/api/subresources/v1alpha2"
+	sub1alpha2 "github.com/deckhouse/virtualization/api/subresources/v1alpha2"
 )
 
 var (
@@ -68,7 +68,7 @@ func Build(store *storage.VirtualMachineStorage) genericapiserver.APIGroupInfo {
 		"virtualmachines/unfreeze":         store.UnfreezeREST(),
 		"virtualmachines/cancelevacuation": store.CancelEvacuationREST(),
 	}
-	apiGroupInfo.VersionedResourcesStorageMap[v1alpha2.SchemeGroupVersion.Version] = resources
+	apiGroupInfo.VersionedResourcesStorageMap[sub1alpha2.SchemeGroupVersion.Version] = resources
 	return apiGroupInfo
 }
 

images/virtualization-artifact/pkg/apiserver/registry/vm/rest/stream.go

@@ -34,7 +34,7 @@ import (
 
 	"github.com/deckhouse/virtualization-controller/pkg/tls/certmanager"
 	virtlisters "github.com/deckhouse/virtualization/api/client/generated/listers/core/v1alpha2"
-	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 const (
@@ -67,10 +67,10 @@ func (p pather) Path(namespace, name string) string {
 	return fmt.Sprintf(p.template, namespace, name, p.subresource)
 }
 
-type preconditionVirtualMachine func(vm *virtv2.VirtualMachine) error
+type preconditionVirtualMachine func(vm *v1alpha2.VirtualMachine) error
 
-func virtualMachineNeedRunning(vm *virtv2.VirtualMachine) error {
-	if vm == nil || vm.Status.Phase != virtv2.MachineRunning {
+func virtualMachineNeedRunning(vm *v1alpha2.VirtualMachine) error {
+	if vm == nil || vm.Status.Phase != v1alpha2.MachineRunning {
 		return fmt.Errorf("VirtualMachine is not Running")
 	}
 	return nil

images/virtualization-artifact/pkg/apiserver/registry/vm/storage/storage.go

@@ -36,7 +36,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/tls/certmanager"
 	versionedv1alpha2 "github.com/deckhouse/virtualization/api/client/generated/clientset/versioned/typed/core/v1alpha2"
 	virtlisters "github.com/deckhouse/virtualization/api/client/generated/listers/core/v1alpha2"
-	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 type VirtualMachineStorage struct {
@@ -138,7 +138,7 @@ func (store VirtualMachineStorage) CancelEvacuationREST() *vmrest.CancelEvacuati
 
 // New implements rest.Storage interface
 func (store VirtualMachineStorage) New() runtime.Object {
-	return &virtv2.VirtualMachine{}
+	return &v1alpha2.VirtualMachine{}
 }
 
 // Destroy implements rest.Storage interface
@@ -173,7 +173,7 @@ func (store VirtualMachineStorage) Get(ctx context.Context, name string, _ *meta
 }
 
 func (store VirtualMachineStorage) NewList() runtime.Object {
-	return &virtv2.VirtualMachineList{}
+	return &v1alpha2.VirtualMachineList{}
 }
 
 func (store VirtualMachineStorage) List(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
@@ -199,8 +199,8 @@ func (store VirtualMachineStorage) List(ctx context.Context, options *internalve
 		return nil, k8serrors.NewInternalError(err)
 	}
 
-	filtered := &virtv2.VirtualMachineList{}
-	filtered.Items = make([]virtv2.VirtualMachine, 0, len(items))
+	filtered := &v1alpha2.VirtualMachineList{}
+	filtered.Items = make([]v1alpha2.VirtualMachine, 0, len(items))
 	for _, vm := range items {
 		if matches(vm, name) {
 			filtered.Items = append(filtered.Items, *vm)

images/virtualization-artifact/pkg/apiserver/server/config.go

@@ -30,7 +30,7 @@ import (
 	vmrest "github.com/deckhouse/virtualization-controller/pkg/apiserver/registry/vm/rest"
 	"github.com/deckhouse/virtualization-controller/pkg/tls/certmanager/filesystem"
 	virtClient "github.com/deckhouse/virtualization/api/client/generated/clientset/versioned"
-	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 var ErrConfigInvalid = errors.New("configuration is invalid")
@@ -89,7 +89,7 @@ func (c Config) Complete() (*Server, error) {
 	if err != nil {
 		return nil, err
 	}
-	crd, err := kubeclient.CustomResourceDefinitions().Get(context.Background(), virtv2.Resource(virtv2.VirtualMachineResource).String(), metav1.GetOptions{})
+	crd, err := kubeclient.CustomResourceDefinitions().Get(context.Background(), v1alpha2.Resource(v1alpha2.VirtualMachineResource).String(), metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}

images/virtualization-artifact/pkg/audit/events/vm/vm_access_test.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/deckhouse/virtualization-controller/pkg/audit/events"
 	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
-	v1alpha "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 type vmAccessTestArgs struct {
@@ -50,8 +50,8 @@ type vmAccessTestArgs struct {
 
 var _ = Describe("VMOP Events", func() {
 	var event *audit.Event
-	var vm *v1alpha.VirtualMachine
-	var vd *v1alpha.VirtualDisk
+	var vm *v1alpha2.VirtualMachine
+	var vd *v1alpha2.VirtualDisk
 	var node *corev1.Node
 
 	currentTime := time.Now()
@@ -77,29 +77,29 @@ var _ = Describe("VMOP Events", func() {
 			},
 		}
 
-		vm = &v1alpha.VirtualMachine{
+		vm = &v1alpha2.VirtualMachine{
 			ObjectMeta: metav1.ObjectMeta{Name: "test-vm", Namespace: "test", UID: "0000-0000-4567"},
-			Spec: v1alpha.VirtualMachineSpec{
-				BlockDeviceRefs: []v1alpha.BlockDeviceSpecRef{
-					{Kind: v1alpha.VirtualDiskKind, Name: "test-disk"},
-					{Kind: v1alpha.VirtualImageKind, Name: "test-image"},
+			Spec: v1alpha2.VirtualMachineSpec{
+				BlockDeviceRefs: []v1alpha2.BlockDeviceSpecRef{
+					{Kind: v1alpha2.VirtualDiskKind, Name: "test-disk"},
+					{Kind: v1alpha2.VirtualImageKind, Name: "test-image"},
 				},
 			},
-			Status: v1alpha.VirtualMachineStatus{
+			Status: v1alpha2.VirtualMachineStatus{
 				Node: "test-node",
 				GuestOSInfo: virtv1.VirtualMachineInstanceGuestOSInfo{
 					Name: "test-os",
 				},
-				Versions: v1alpha.Versions{
+				Versions: v1alpha2.Versions{
 					Qemu:    "9.9.9",
 					Libvirt: "1.1.1",
 				},
 			},
 		}
 
-		vd = &v1alpha.VirtualDisk{
+		vd = &v1alpha2.VirtualDisk{
 			ObjectMeta: metav1.ObjectMeta{Name: "test-disk", Namespace: "test", UID: "0000-0000-4567"},
-			Status: v1alpha.VirtualDiskStatus{
+			Status: v1alpha2.VirtualDiskStatus{
 				StorageClassName: "test-storageclass",
 			},
 		}

images/virtualization-artifact/pkg/audit/events/vm/vm_control_test.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/deckhouse/virtualization-controller/pkg/audit/events"
 	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
-	v1alpha "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 type vmControlTestArgs struct {
@@ -54,8 +54,8 @@ type vmControlTestArgs struct {
 
 var _ = Describe("VMOP Events", func() {
 	var event *audit.Event
-	var vm *v1alpha.VirtualMachine
-	var vd *v1alpha.VirtualDisk
+	var vm *v1alpha2.VirtualMachine
+	var vd *v1alpha2.VirtualDisk
 	var node *corev1.Node
 	var pod *corev1.Pod
 
@@ -103,29 +103,29 @@ var _ = Describe("VMOP Events", func() {
 			},
 		}
 
-		vm = &v1alpha.VirtualMachine{
+		vm = &v1alpha2.VirtualMachine{
 			ObjectMeta: metav1.ObjectMeta{Name: "test-vm", Namespace: "test", UID: "0000-0000-4567"},
-			Spec: v1alpha.VirtualMachineSpec{
-				BlockDeviceRefs: []v1alpha.BlockDeviceSpecRef{
-					{Kind: v1alpha.VirtualDiskKind, Name: "test-disk"},
-					{Kind: v1alpha.VirtualImageKind, Name: "test-image"},
+			Spec: v1alpha2.VirtualMachineSpec{
+				BlockDeviceRefs: []v1alpha2.BlockDeviceSpecRef{
+					{Kind: v1alpha2.VirtualDiskKind, Name: "test-disk"},
+					{Kind: v1alpha2.VirtualImageKind, Name: "test-image"},
 				},
 			},
-			Status: v1alpha.VirtualMachineStatus{
+			Status: v1alpha2.VirtualMachineStatus{
 				Node: "test-node",
 				GuestOSInfo: virtv1.VirtualMachineInstanceGuestOSInfo{
 					Name: "test-os",
 				},
-				Versions: v1alpha.Versions{
+				Versions: v1alpha2.Versions{
 					Qemu:    "9.9.9",
 					Libvirt: "1.1.1",
 				},
 			},
 		}
 
-		vd = &v1alpha.VirtualDisk{
+		vd = &v1alpha2.VirtualDisk{
 			ObjectMeta: metav1.ObjectMeta{Name: "test-disk", Namespace: "test", UID: "0000-0000-4567"},
-			Status: v1alpha.VirtualDiskStatus{
+			Status: v1alpha2.VirtualDiskStatus{
 				StorageClassName: "test-storageclass",
 			},
 		}

images/virtualization-artifact/pkg/audit/events/vm/vm_manage_test.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/deckhouse/virtualization-controller/pkg/audit/events"
 	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
-	v1alpha "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 type vmManageTestArgs struct {
@@ -52,8 +52,8 @@ type vmManageTestArgs struct {
 
 var _ = Describe("VMOP Events", func() {
 	var event *audit.Event
-	var vm *v1alpha.VirtualMachine
-	var vd *v1alpha.VirtualDisk
+	var vm *v1alpha2.VirtualMachine
+	var vd *v1alpha2.VirtualDisk
 	var node *corev1.Node
 
 	currentTime := time.Now()
@@ -78,29 +78,29 @@ var _ = Describe("VMOP Events", func() {
 			},
 		}
 
-		vm = &v1alpha.VirtualMachine{
+		vm = &v1alpha2.VirtualMachine{
 			ObjectMeta: metav1.ObjectMeta{Name: "test-vm", Namespace: "test", UID: "0000-0000-4567"},
-			Spec: v1alpha.VirtualMachineSpec{
-				BlockDeviceRefs: []v1alpha.BlockDeviceSpecRef{
-					{Kind: v1alpha.VirtualDiskKind, Name: "test-disk"},
-					{Kind: v1alpha.VirtualImageKind, Name: "test-image"},
+			Spec: v1alpha2.VirtualMachineSpec{
+				BlockDeviceRefs: []v1alpha2.BlockDeviceSpecRef{
+					{Kind: v1alpha2.VirtualDiskKind, Name: "test-disk"},
+					{Kind: v1alpha2.VirtualImageKind, Name: "test-image"},
 				},
 			},
-			Status: v1alpha.VirtualMachineStatus{
+			Status: v1alpha2.VirtualMachineStatus{
 				Node: "test-node",
 				GuestOSInfo: virtv1.VirtualMachineInstanceGuestOSInfo{
 					Name: "test-os",
 				},
-				Versions: v1alpha.Versions{
+				Versions: v1alpha2.Versions{
 					Qemu:    "9.9.9",
 					Libvirt: "1.1.1",
 				},
 			},
 		}
 
-		vd = &v1alpha.VirtualDisk{
+		vd = &v1alpha2.VirtualDisk{
 			ObjectMeta: metav1.ObjectMeta{Name: "test-disk", Namespace: "test", UID: "0000-0000-4567"},
-			Status: v1alpha.VirtualDiskStatus{
+			Status: v1alpha2.VirtualDiskStatus{
 				StorageClassName: "test-storageclass",
 			},
 		}