linter issues

Signed-off-by: Benny Zlotnik <[email protected]>

.golangci.yml

@@ -5,6 +5,7 @@ linters:
   - nilnil
   - bodyclose
   - gofmt
+  - goimports
 linters-settings:
   ginkgolinter:
     forbid-focus-container: true

pkg/controller/hook/regexp.go

@@ -1,3 +1,4 @@
+//nolint:unused
 package hook
 
 import (

pkg/controller/host/handler/vsphere/handler.go

@@ -1,16 +1,17 @@
 package vsphere
 
 import (
+	"path"
+	"strings"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/vsphere"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
-	"strings"
 )
 
 // Package logger.
@@ -79,6 +80,7 @@ func (r *Handler) changed(models ...*vsphere.Host) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list Host CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/host/validation.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	adapter "github.com/konveyor/forklift-controller/pkg/controller/plan/adapter/vsphere"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web"

pkg/controller/map/network/handler/ocp/handler.go

@@ -1,14 +1,15 @@
 package ocp
 
 import (
+	"path"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/ocp"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 )
 
@@ -70,6 +71,7 @@ func (r *Handler) changed(network *ocp.NetworkAttachmentDefinition) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list NetworkMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/network/handler/openstack/handler.go

@@ -80,6 +80,7 @@ func (r *Handler) changed(models ...*openstack.Network) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list NetworkMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/network/handler/ova/handler.go

@@ -80,6 +80,7 @@ func (r *Handler) changed(models ...*ova.Network) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list NetworkMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/network/handler/ovirt/handler.go

@@ -1,16 +1,17 @@
 package ovirt
 
 import (
+	"path"
+	"strings"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/ovirt"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
-	"strings"
 )
 
 // Package logger.
@@ -79,6 +80,7 @@ func (r *Handler) changed(models ...*ovirt.Network) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list NetworkMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/network/handler/vsphere/handler.go

@@ -1,16 +1,17 @@
 package vsphere
 
 import (
+	"path"
+	"strings"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/vsphere"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
-	"strings"
 )
 
 // Package logger.
@@ -79,6 +80,7 @@ func (r *Handler) changed(models ...*vsphere.Network) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list NetworkMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/storage/handler/ocp/handler.go

@@ -1,14 +1,15 @@
 package ocp
 
 import (
+	"path"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/ocp"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 )
 
@@ -68,6 +69,7 @@ func (r *Handler) changed(storageClass *ocp.StorageClass) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list StorageMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/storage/handler/openstack/handler.go

@@ -78,6 +78,7 @@ func (r *Handler) changed(models ...*openstack.VolumeType) {
 	err := r.List(context.TODO(), storageMapList)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list StorageMap CRs")
 		return
 	}
 	for _, storageMap := range storageMapList.Items {

pkg/controller/map/storage/handler/ova/handler.go

@@ -80,6 +80,7 @@ func (r *Handler) changed(models ...*ova.Disk) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list StorageMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/storage/handler/ovirt/handler.go

@@ -1,16 +1,17 @@
 package ovirt
 
 import (
+	"path"
+	"strings"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/ovirt"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
-	"strings"
 )
 
 // Package logger.
@@ -79,6 +80,7 @@ func (r *Handler) changed(models ...*ovirt.StorageDomain) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list StorageMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/map/storage/handler/vsphere/handler.go

@@ -1,16 +1,17 @@
 package vsphere
 
 import (
+	"path"
+	"strings"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/vsphere"
 	"github.com/konveyor/forklift-controller/pkg/controller/watch/handler"
 	liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
 	libweb "github.com/konveyor/forklift-controller/pkg/lib/inventory/web"
 	"github.com/konveyor/forklift-controller/pkg/lib/logging"
 	"golang.org/x/net/context"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/event"
-	"strings"
 )
 
 // Package logger.
@@ -79,6 +80,7 @@ func (r *Handler) changed(models ...*vsphere.Datastore) {
 	err := r.List(context.TODO(), &list)
 	if err != nil {
 		err = liberr.Wrap(err)
+		log.Error(err, "failed to list StorageMap CRs")
 		return
 	}
 	for i := range list.Items {

pkg/controller/migration/predicate.go

@@ -70,11 +70,7 @@ func (r PlanPredicate) Update(e event.UpdateEvent) bool {
 
 func (r PlanPredicate) Delete(e event.DeleteEvent) bool {
 	_, cast := e.Object.(*api.Plan)
-	if cast {
-		return true
-	}
-
-	return false
+	return cast
 }
 
 func (r PlanPredicate) Generic(e event.GenericEvent) bool {

pkg/controller/migration/validation.go

@@ -3,6 +3,7 @@ package migration
 import (
 	"context"
 	"errors"
+
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	plancnt "github.com/konveyor/forklift-controller/pkg/controller/plan"
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web"

pkg/controller/plan/adapter/ocp/builder.go

@@ -38,8 +38,7 @@ const (
 
 type Builder struct {
 	*plancontext.Context
-	macConflictsMap map[string]string
-	sourceClient    client.Client
+	sourceClient client.Client
 }
 
 // ConfigMap implements base.Builder

pkg/controller/plan/adapter/openstack/BUILD.bazel

@@ -34,7 +34,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/labels",
         "//vendor/k8s.io/apimachinery/pkg/types",
         "//vendor/k8s.io/apimachinery/pkg/util/wait",
-        "//vendor/k8s.io/utils/pointer",
+        "//vendor/k8s.io/utils/ptr",
         "//vendor/kubevirt.io/api/core/v1:core",
         "//vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1",
         "//vendor/sigs.k8s.io/controller-runtime/pkg/client",

pkg/controller/plan/adapter/openstack/builder.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	cnv "kubevirt.io/api/core/v1"
 	cdi "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -539,7 +539,7 @@ func (r *Builder) mapDisks(vm *model.Workload, persistentVolumeClaims []*core.Pe
 			}
 			if bootable, err := strconv.ParseBool(volume.Bootable); err == nil && bootable {
 				r.Log.Info("bootable volume found", "volumeID", volumeID)
-				bootOrder = pointer.Uint(1)
+				bootOrder = ptr.To[uint](1)
 			}
 		}
 
@@ -592,7 +592,7 @@ func (r *Builder) mapDisks(vm *model.Workload, persistentVolumeClaims []*core.Pe
 		r.Log.Info("No bootable volume found, falling back to image", "image", imagePVC.Name)
 		for i, disk := range kDisks {
 			if disk.Name == fmt.Sprintf("vol-%s", imagePVC.Annotations[AnnImportDiskId]) {
-				kDisks[i].BootOrder = pointer.Uint(1)
+				kDisks[i].BootOrder = ptr.To[uint](1)
 				r.Log.Info("Boot order set to 1 on", "disk", kDisks[i], "ann", imagePVC.Annotations[AnnImportDiskId])
 				break
 			}
@@ -1236,6 +1236,7 @@ func (r *Builder) PopulatorTransferredBytes(persistentVolumeClaim *core.Persiste
 	if err != nil {
 		transferredBytes = 0
 		err = nil
+		//nolint:nilerr
 		return
 	}
 

pkg/controller/plan/adapter/openstack/client.go

@@ -582,7 +582,9 @@ func (r *Client) getImageFromVolume(vm *libclient.VM, volumeID string) (image *l
 	volume, err := r.getVolume(volumeRef)
 	if err != nil {
 		err = liberr.Wrap(err)
+		return
 	}
+
 	originalVolumeID := volume.Metadata[forkliftPropertyOriginalVolumeID]
 	imageName := getImageFromVolumeName(r.Context, vm.ID, originalVolumeID)
 	images := []libclient.Image{}

pkg/controller/plan/adapter/openstack/common.go

@@ -11,9 +11,6 @@ const (
 	forkliftPropertyOriginalImageID  = "forklift_original_image_id"
 )
 
-func getMigrationName(ctx *plancontext.Context) string {
-	return ctx.Migration.GetName()
-}
 func getMigrationID(ctx *plancontext.Context) string {
 	return string(ctx.Migration.GetUID())
 }

pkg/controller/plan/adapter/ova/builder.go

@@ -61,7 +61,7 @@ const (
 
 // Regex which matches the snapshot identifier suffix of a
 // OVA disk backing file.
-var backingFilePattern = regexp.MustCompile("-\\d\\d\\d\\d\\d\\d.vmdk")
+var backingFilePattern = regexp.MustCompile(`-\d\d\d\d\d\d.vmdk`)
 
 // OVA builder.
 type Builder struct {
@@ -161,8 +161,7 @@ func (r *Builder) DataVolumes(vmRef ref.Ref, secret *core.Secret, _ *core.Config
 				return nil, err
 			}
 			storageClass := mapped.Destination.StorageClass
-			var dvSource cdi.DataVolumeSource
-			dvSource = cdi.DataVolumeSource{
+			dvSource := cdi.DataVolumeSource{
 				Blank: &cdi.DataVolumeBlankImage{},
 			}
 			dvSpec := cdi.DataVolumeSpec{

pkg/controller/plan/adapter/ova/client.go

@@ -96,7 +96,6 @@ func (r *Client) DetachDisks(vmRef ref.Ref) (err error) {
 }
 
 func (r Client) Finalize(vms []*planapi.VMStatus, planName string) {
-	return
 }
 
 func (r *Client) PreTransferActions(vmRef ref.Ref) (ready bool, err error) {

pkg/controller/plan/adapter/ova/ova_capacity_test.go

@@ -37,7 +37,7 @@ func TestGetResourceCapacity(t *testing.T) {
 			if testCase.expectError {
 				g.Expect(err).To(gomega.HaveOccurred(), fmt.Sprintf("expected an error for input: %v", testCase.units))
 			} else {
-				g.Expect(err).To(gomega.BeNil(), fmt.Sprintf("did not expect an error for input: %v, but got: %v", testCase.units, err))
+				g.Expect(err).ToNot(gomega.HaveOccurred(), fmt.Sprintf("did not expect an error for input: %v, but got: %v", testCase.units, err))
 				g.Expect(result).To(gomega.Equal(testCase.expected), fmt.Sprintf("expected %v, but got %v", testCase.expected, result))
 			}
 		})