Make use of pointer.Bool() and pointer.BoolDeref

Signed-off-by: Volker Theile <[email protected]>

Author: votdev

pkg/source/openstack/client.go

@@ -27,6 +27,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 	kubevirt "kubevirt.io/api/core/v1"
 
 	migration "github.com/harvester/vm-import-controller/pkg/apis/migration.harvesterhci.io/v1beta1"
@@ -409,8 +410,6 @@ func (c *Client) IsPoweredOff(vm *migration.VirtualMachineImport) (bool, error)
 }
 
 func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*kubevirt.VirtualMachine, error) {
-	var boolFalse = false
-	var boolTrue = true
 	vmObj, err := c.findVM(vm.Spec.VirtualMachineName)
 	if err != nil {
 		return nil, fmt.Errorf("error finding VM in GenerateVirtualMachine: %v", err)
@@ -471,7 +470,7 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
 					},
 					Features: &kubevirt.Features{
 						ACPI: kubevirt.FeatureState{
-							Enabled: &boolTrue,
+							Enabled: pointer.Bool(true),
 						},
 					},
 				},
@@ -524,20 +523,20 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
 		firmware := &kubevirt.Firmware{
 			Bootloader: &kubevirt.Bootloader{
 				EFI: &kubevirt.EFI{
-					SecureBoot: &boolFalse,
+					SecureBoot: pointer.Bool(false),
 				},
 			},
 		}
 		if secureboot {
-			firmware.Bootloader.EFI.SecureBoot = &boolTrue
+			firmware.Bootloader.EFI.SecureBoot = pointer.Bool(true)
 			vmSpec.Template.Spec.Domain.Features.SMM = &kubevirt.FeatureState{
-				Enabled: &boolTrue,
+				Enabled: pointer.Bool(true),
 			}
 		}
 		vmSpec.Template.Spec.Domain.Firmware = firmware
 		if tpm {
 			vmSpec.Template.Spec.Domain.Features.SMM = &kubevirt.FeatureState{
-				Enabled: &boolTrue,
+				Enabled: pointer.Bool(true),
 			}
 			vmSpec.Template.Spec.Domain.Devices.TPM = &kubevirt.TPMDevice{}
 		}

pkg/source/vmware/client.go

@@ -21,6 +21,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 	kubevirt "kubevirt.io/api/core/v1"
 
 	migration "github.com/harvester/vm-import-controller/pkg/apis/migration.harvesterhci.io/v1beta1"
@@ -293,9 +294,6 @@ func (c *Client) IsPoweredOff(vm *migration.VirtualMachineImport) (bool, error)
 }
 
 func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*kubevirt.VirtualMachine, error) {
-	var boolFalse = false
-	var boolTrue = true
-
 	vmObj, err := c.findVM(vm.Spec.Folder, vm.Spec.VirtualMachineName)
 	if err != nil {
 		return nil, fmt.Errorf("error quering vm in GenerateVirtualMachine: %v", err)
@@ -344,7 +342,7 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
 					},
 					Features: &kubevirt.Features{
 						ACPI: kubevirt.FeatureState{
-							Enabled: &boolTrue,
+							Enabled: pointer.Bool(true),
 						},
 					},
 				},
@@ -399,19 +397,19 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
 		firmware := &kubevirt.Firmware{
 			Bootloader: &kubevirt.Bootloader{
 				EFI: &kubevirt.EFI{
-					SecureBoot: &boolFalse,
+					SecureBoot: pointer.Bool(false),
 				},
 			},
 		}
-		if *o.Config.BootOptions.EfiSecureBootEnabled {
-			firmware.Bootloader.EFI.SecureBoot = &boolTrue
+
+		if pointer.BoolDeref(o.Config.BootOptions.EfiSecureBootEnabled, false) {
+			firmware.Bootloader.EFI.SecureBoot = pointer.Bool(true)
 			vmSpec.Template.Spec.Domain.Features.SMM = &kubevirt.FeatureState{
-				Enabled: &boolTrue,
+				Enabled: pointer.Bool(true),
 			}
 		}
 		vmSpec.Template.Spec.Domain.Firmware = firmware
-		if *o.Summary.Config.TpmPresent {
-
+		if pointer.BoolDeref(o.Summary.Config.TpmPresent, false) {
 			vmSpec.Template.Spec.Domain.Devices.TPM = &kubevirt.TPMDevice{}
 		}
 	}