github/vm-import-controller
7
0
Fork 0
mirror of https://github.com/harvester/vm-import-controller.git synced 2025-06-03 01:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of strings.EqualFold for case-insensitiv string comparison (#79)

Browse Source 
Signed-off-by: Volker Theile <vtheile@suse.com>
This commit is contained in:
Volker Theile 2025-05-07 09:18:09 +02:00 committed by GitHub
parent 859479d6fa
commit 8d4b8a01d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controllers/migration/virtualmachine.go
View File

@ -429,12 +429,12 @@ func (h *virtualMachineHandler) generateVMO(vm *migration.VirtualMachineImport)
// generate VirtualMachineOperations Interface.
// this will be used for migration specific operations
if source.GetKind() == strings.ToLower("vmwaresource") {
if strings.EqualFold(source.GetKind(), "vmwaresource") {
endpoint, dc := source.GetConnectionInfo()
return vmware.NewClient(h.ctx, endpoint, dc, secret)
}
if source.GetKind() == strings.ToLower("openstacksource") {
if strings.EqualFold(source.GetKind(), "openstacksource") {
endpoint, region := source.GetConnectionInfo()
options := source.GetOptions().(migration.OpenstackSourceOptions)
return openstack.NewClient(h.ctx, endpoint, region, secret, options)
@ -446,13 +446,13 @@ func (h *virtualMachineHandler) generateVMO(vm *migration.VirtualMachineImport)
func (h *virtualMachineHandler) generateSource(vm *migration.VirtualMachineImport) (migration.SourceInterface, error) {
var s migration.SourceInterface
var err error
if strings.ToLower(vm.Spec.SourceCluster.Kind) == "vmwaresource" {
if strings.EqualFold(vm.Spec.SourceCluster.Kind, "vmwaresource") {
s, err = h.vmware.Get(vm.Spec.SourceCluster.Namespace, vm.Spec.SourceCluster.Name, metav1.GetOptions{})
if err != nil {
return nil, err
}
}
if strings.ToLower(vm.Spec.SourceCluster.Kind) == "openstacksource" {
if strings.EqualFold(vm.Spec.SourceCluster.Kind, "openstacksource") {
s, err = h.openstack.Get(vm.Spec.SourceCluster.Namespace, vm.Spec.SourceCluster.Name, metav1.GetOptions{})
if err != nil {
return nil, err
@ -617,7 +617,7 @@ func (h *virtualMachineHandler) ReconcileVMI(_ string, _ string, obj runtime.Obj
owners := vmiObj.GetOwnerReferences()
if vmiObj.DeletionTimestamp == nil {
for _, v := range owners {
if strings.ToLower(v.Kind) == "virtualmachineimport" {
if strings.EqualFold(v.Kind, "virtualmachineimport") {
return []relatedresource.Key{
{
Namespace: vmiObj.Namespace,
@ -625,10 +625,8 @@ func (h *virtualMachineHandler) ReconcileVMI(_ string, _ string, obj runtime.Obj
},
}, nil
}
}
}
}
return nil, nil

2
pkg/source/vmware/client.go
View File

@ -402,7 +402,7 @@ func (c *Client) GenerateVirtualMachine(vm *migration.VirtualMachineImport) (*ku
}
// Setup BIOS/EFI, SecureBoot and TPM settings.
uefi := strings.ToLower(o.Config.Firmware) == string(types.GuestOsDescriptorFirmwareTypeEfi)
uefi := strings.EqualFold(o.Config.Firmware, string(types.GuestOsDescriptorFirmwareTypeEfi))
secureBoot := false
if o.Config.BootOptions != nil {
secureBoot = pointer.BoolDeref(o.Config.BootOptions.EfiSecureBootEnabled, false)