Merge pull request #3235 from rikatz/fix-context-logging

k8s-ci-robot · web-flow · commit fea2ad7bd1e0 · 2024-10-28T14:44:54.000Z
🌱 Fix return messages to contain proper VM information
diff --git a/pkg/services/govmomi/power.go b/pkg/services/govmomi/power.go
@@ -44,7 +44,7 @@ func (vms *VMService) getPowerState(ctx context.Context, virtualMachineCtx *virt
 	case types.VirtualMachinePowerStateSuspended:
 		return infrav1.VirtualMachinePowerStateSuspended, nil
 	default:
-		return "", errors.Errorf("unexpected power state %q for vm %s", powerState, ctx)
+		return "", errors.Errorf("unexpected power state %q for vm %s", powerState, virtualMachineCtx)
 	}
 }
 
diff --git a/pkg/services/govmomi/service.go b/pkg/services/govmomi/service.go
@@ -335,7 +335,7 @@ func (vms *VMService) reconcileMetadata(ctx context.Context, virtualMachineCtx *
 	log.Info("Updating VM metadata")
 	taskRef, err := vms.setMetadata(ctx, virtualMachineCtx, newMetadata)
 	if err != nil {
-		return false, errors.Wrapf(err, "unable to set metadata on vm %s", ctx)
+		return false, errors.Wrapf(err, "unable to set metadata on vm %s", virtualMachineCtx)
 	}
 
 	virtualMachineCtx.VSphereVM.Status.TaskRef = taskRef
@@ -356,7 +356,7 @@ func (vms *VMService) reconcilePowerState(ctx context.Context, virtualMachineCtx
 		task, err := virtualMachineCtx.Obj.PowerOn(ctx)
 		if err != nil {
 			conditions.MarkFalse(virtualMachineCtx.VSphereVM, infrav1.VMProvisionedCondition, infrav1.PoweringOnFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
-			return false, errors.Wrapf(err, "failed to trigger power on op for vm %s", ctx)
+			return false, errors.Wrapf(err, "failed to trigger power on op for vm %s", virtualMachineCtx)
 		}
 		conditions.MarkFalse(virtualMachineCtx.VSphereVM, infrav1.VMProvisionedCondition, infrav1.PoweringOnReason, clusterv1.ConditionSeverityInfo, "")
 
@@ -376,7 +376,7 @@ func (vms *VMService) reconcilePowerState(ctx context.Context, virtualMachineCtx
 		log.Info("VM is powered on")
 		return true, nil
 	default:
-		return false, errors.Errorf("unexpected power state %q for vm %s", powerState, ctx)
+		return false, errors.Errorf("unexpected power state %q for vm %s", powerState, virtualMachineCtx)
 	}
 }
 
@@ -465,7 +465,7 @@ func (vms *VMService) reconcileStoragePolicy(ctx context.Context, virtualMachine
 			DeviceChange: changes,
 		})
 		if err != nil {
-			return errors.Wrapf(err, "unable to set storagePolicy on vm %s", ctx)
+			return errors.Wrapf(err, "unable to set storagePolicy on vm %s", virtualMachineCtx)
 		}
 		virtualMachineCtx.VSphereVM.Status.TaskRef = task.Reference().Value
 	}
@@ -492,7 +492,7 @@ func (vms *VMService) reconcileHardwareVersion(ctx context.Context, virtualMachi
 			log.Info("Upgrading hardware version", "fromVersion", virtualMachine.Config.Version, "toVersion", virtualMachineCtx.VSphereVM.Spec.HardwareVersion)
 			task, err := virtualMachineCtx.Obj.UpgradeVM(ctx, virtualMachineCtx.VSphereVM.Spec.HardwareVersion)
 			if err != nil {
-				return false, errors.Wrapf(err, "error trigging upgrade op for machine %s", ctx)
+				return false, errors.Wrapf(err, "error trigging upgrade op for machine %s", virtualMachineCtx)
 			}
 			virtualMachineCtx.VSphereVM.Status.TaskRef = task.Reference().Value
 			return false, nil
@@ -535,7 +535,7 @@ func (vms *VMService) reconcilePCIDevices(ctx context.Context, virtualMachineCtx
 		}
 		log.Info("PCI devices to be added", "number", len(specsToBeAdded))
 		if err := virtualMachineCtx.Obj.AddDevice(ctx, pci.ConstructDeviceSpecs(specsToBeAdded)...); err != nil {
-			return errors.Wrapf(err, "error adding pci devices for %q", ctx)
+			return errors.Wrapf(err, "error adding pci devices for %q", virtualMachineCtx)
 		}
 	}
 	return nil
@@ -550,7 +550,7 @@ func (vms *VMService) getMetadata(ctx context.Context, virtualMachineCtx *virtua
 	)
 
 	if err := pc.RetrieveOne(ctx, virtualMachineCtx.Ref, props, &obj); err != nil {
-		return "", errors.Wrapf(err, "unable to fetch props %v for vm %s", props, ctx)
+		return "", errors.Wrapf(err, "unable to fetch props %v for vm %s", props, virtualMachineCtx)
 	}
 	if obj.Config == nil {
 		return "", nil
@@ -571,7 +571,7 @@ func (vms *VMService) getMetadata(ctx context.Context, virtualMachineCtx *virtua
 
 	metadataBuf, err := base64.StdEncoding.DecodeString(metadataBase64)
 	if err != nil {
-		return "", errors.Wrapf(err, "unable to decode metadata for %s", ctx)
+		return "", errors.Wrapf(err, "unable to decode metadata for %s", virtualMachineCtx)
 	}
 
 	return string(metadataBuf), nil
@@ -599,7 +599,7 @@ func (vms *VMService) setMetadata(ctx context.Context, virtualMachineCtx *virtua
 		ExtraConfig: extraConfig,
 	})
 	if err != nil {
-		return "", errors.Wrapf(err, "unable to set metadata on vm %s", ctx)
+		return "", errors.Wrapf(err, "unable to set metadata on vm %s", virtualMachineCtx)
 	}
 
 	return task.Reference().Value, nil
@@ -641,7 +641,7 @@ func (vms *VMService) getBootstrapData(ctx context.Context, vmCtx *capvcontext.V
 		Name:      vmCtx.VSphereVM.Spec.BootstrapRef.Name,
 	}
 	if err := vmCtx.Client.Get(ctx, secretKey, secret); err != nil {
-		return nil, "", errors.Wrapf(err, "failed to get bootstrap data secret for %s", ctx)
+		return nil, "", errors.Wrapf(err, "failed to get bootstrap data secret for %s", vmCtx)
 	}
 
 	format, ok := secret.Data["format"]
diff --git a/pkg/services/govmomi/util.go b/pkg/services/govmomi/util.go
@@ -194,11 +194,11 @@ func reconcileVSphereVMWhenNetworkIsReady(ctx context.Context, virtualMachineCtx
 			// Wait for the VM to be powered on.
 			powerOnTaskInfo, err := powerOnTask.WaitForResult(ctx)
 			if err != nil && powerOnTaskInfo == nil {
-				return nil, nil, errors.Wrapf(err, "failed to wait for power on op for vm %s", ctx)
+				return nil, nil, errors.Wrapf(err, "failed to wait for power on op for vm %s", virtualMachineCtx)
 			}
 			powerState, err := virtualMachineCtx.Obj.PowerState(ctx)
 			if err != nil {
-				return nil, nil, errors.Wrapf(err, "failed to get power state for vm %s", ctx)
+				return nil, nil, errors.Wrapf(err, "failed to get power state for vm %s", virtualMachineCtx)
 			}
 			if powerState != types.VirtualMachinePowerStatePoweredOn {
 				return nil, nil, errors.Errorf(
@@ -208,7 +208,7 @@ func reconcileVSphereVMWhenNetworkIsReady(ctx context.Context, virtualMachineCtx
 
 			// Wait for all NICs to have valid MAC addresses.
 			if err := waitForMacAddresses(ctx, virtualMachineCtx); err != nil {
-				return nil, nil, errors.Wrapf(err, "failed to wait for mac addresses for vm %s", ctx)
+				return nil, nil, errors.Wrapf(err, "failed to wait for mac addresses for vm %s", virtualMachineCtx)
 			}
 
 			// Get all the MAC addresses. This is done separately from waiting
@@ -217,7 +217,7 @@ func reconcileVSphereVMWhenNetworkIsReady(ctx context.Context, virtualMachineCtx
 			// specs, and not the propery change order.
 			_, macToDeviceIndex, deviceToMacIndex, err := getMacAddresses(ctx, virtualMachineCtx)
 			if err != nil {
-				return nil, nil, errors.Wrapf(err, "failed to get mac addresses for vm %s", ctx)
+				return nil, nil, errors.Wrapf(err, "failed to get mac addresses for vm %s", virtualMachineCtx)
 			}
 
 			// Wait for the IP addresses to show up for the VM.
diff --git a/pkg/services/govmomi/vcenter/clone.go b/pkg/services/govmomi/vcenter/clone.go
@@ -120,17 +120,17 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 
 	folder, err := vmCtx.Session.Finder.FolderOrDefault(ctx, vmCtx.VSphereVM.Spec.Folder)
 	if err != nil {
-		return errors.Wrapf(err, "unable to get folder for %q", ctx)
+		return errors.Wrapf(err, "unable to get folder for %q", vmCtx)
 	}
 
 	pool, err := vmCtx.Session.Finder.ResourcePoolOrDefault(ctx, vmCtx.VSphereVM.Spec.ResourcePool)
 	if err != nil {
-		return errors.Wrapf(err, "unable to get resource pool for %q", ctx)
+		return errors.Wrapf(err, "unable to get resource pool for %q", vmCtx)
 	}
 
 	devices, err := tpl.Device(ctx)
 	if err != nil {
-		return errors.Wrapf(err, "error getting devices for %q", ctx)
+		return errors.Wrapf(err, "error getting devices for %q", vmCtx)
 	}
 
 	// Create a new list of device specs for cloning the VM.
@@ -140,14 +140,14 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 	if snapshotRef == nil {
 		diskSpecs, err := getDiskSpec(vmCtx, devices)
 		if err != nil {
-			return errors.Wrapf(err, "error getting disk spec for %q", ctx)
+			return errors.Wrapf(err, "error getting disk spec for %q", vmCtx)
 		}
 		deviceSpecs = append(deviceSpecs, diskSpecs...)
 	}
 
 	networkSpecs, err := getNetworkSpecs(ctx, vmCtx, devices)
 	if err != nil {
-		return errors.Wrapf(err, "error getting network specs for %q", ctx)
+		return errors.Wrapf(err, "error getting network specs for %q", vmCtx)
 	}
 
 	deviceSpecs = append(deviceSpecs, networkSpecs...)
@@ -207,7 +207,7 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 	if vmCtx.VSphereVM.Spec.Datastore != "" {
 		datastore, err := vmCtx.Session.Finder.Datastore(ctx, vmCtx.VSphereVM.Spec.Datastore)
 		if err != nil {
-			return errors.Wrapf(err, "unable to get datastore %s for %q", vmCtx.VSphereVM.Spec.Datastore, ctx)
+			return errors.Wrapf(err, "unable to get datastore %s for %q", vmCtx.VSphereVM.Spec.Datastore, vmCtx)
 		}
 		datastoreRef = types.NewReference(datastore.Reference())
 		spec.Location.Datastore = datastoreRef
@@ -217,12 +217,12 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 	if vmCtx.VSphereVM.Spec.StoragePolicyName != "" {
 		pbmClient, err := pbm.NewClient(ctx, vmCtx.Session.Client.Client)
 		if err != nil {
-			return errors.Wrapf(err, "unable to create pbm client for %q", ctx)
+			return errors.Wrapf(err, "unable to create pbm client for %q", vmCtx)
 		}
 
 		storageProfileID, err = pbmClient.ProfileIDByName(ctx, vmCtx.VSphereVM.Spec.StoragePolicyName)
 		if err != nil {
-			return errors.Wrapf(err, "unable to get storageProfileID from name %s for %q", vmCtx.VSphereVM.Spec.StoragePolicyName, ctx)
+			return errors.Wrapf(err, "unable to get storageProfileID from name %s for %q", vmCtx.VSphereVM.Spec.StoragePolicyName, vmCtx)
 		}
 
 		var hubs []pbmTypes.PbmPlacementHub
@@ -279,7 +279,7 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 		// if no datastore defined through VM spec or storage policy, use default
 		datastore, err := vmCtx.Session.Finder.DefaultDatastore(ctx)
 		if err != nil {
-			return errors.Wrapf(err, "unable to get default datastore for %q", ctx)
+			return errors.Wrapf(err, "unable to get default datastore for %q", vmCtx)
 		}
 		datastoreRef = types.NewReference(datastore.Reference())
 	}
@@ -292,7 +292,7 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by
 	log.Info(fmt.Sprintf("Cloning Machine with clone mode %s", vmCtx.VSphereVM.Status.CloneMode))
 	task, err := tpl.Clone(ctx, folder, vmCtx.VSphereVM.Name, spec)
 	if err != nil {
-		return errors.Wrapf(err, "error trigging clone op for machine %s", ctx)
+		return errors.Wrapf(err, "error trigging clone op for machine %s", vmCtx)
 	}
 
 	vmCtx.VSphereVM.Status.TaskRef = task.Reference().Value
@@ -415,11 +415,11 @@ func getNetworkSpecs(ctx context.Context, vmCtx *capvcontext.VMContext, devices
 		}
 		backing, err := ref.EthernetCardBackingInfo(ctx)
 		if err != nil {
-			return nil, errors.Wrapf(err, "unable to create new ethernet card backing info for network %q on %q", netSpec.NetworkName, ctx)
+			return nil, errors.Wrapf(err, "unable to create new ethernet card backing info for network %q on %q", netSpec.NetworkName, vmCtx)
 		}
 		dev, err := object.EthernetCardTypes().CreateEthernetCard(ethCardType, backing)
 		if err != nil {
-			return nil, errors.Wrapf(err, "unable to create new ethernet card %q for network %q on %q", ethCardType, netSpec.NetworkName, ctx)
+			return nil, errors.Wrapf(err, "unable to create new ethernet card %q for network %q on %q", ethCardType, netSpec.NetworkName, vmCtx)
 		}
 
 		// Get the actual NIC object. This is safe to assert without a check

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (vms VMService) getPowerState(ctx context.Context, virtualMachineCtx virt`
`44`	`44`	`case types.VirtualMachinePowerStateSuspended:`
`45`	`45`	`return infrav1.VirtualMachinePowerStateSuspended, nil`
`46`	`46`	`default:`
`47`		`- return "", errors.Errorf("unexpected power state %q for vm %s", powerState, ctx)`
	`47`	`+ return "", errors.Errorf("unexpected power state %q for vm %s", powerState, virtualMachineCtx)`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ func (vms VMService) reconcileMetadata(ctx context.Context, virtualMachineCtx `
`335`	`335`	`log.Info("Updating VM metadata")`
`336`	`336`	`taskRef, err := vms.setMetadata(ctx, virtualMachineCtx, newMetadata)`
`337`	`337`	`if err != nil {`
`338`		`- return false, errors.Wrapf(err, "unable to set metadata on vm %s", ctx)`
	`338`	`+ return false, errors.Wrapf(err, "unable to set metadata on vm %s", virtualMachineCtx)`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`virtualMachineCtx.VSphereVM.Status.TaskRef = taskRef`
`@@ -356,7 +356,7 @@ func (vms *VMService) reconcilePowerState(ctx context.Context, virtualMachineCtx`
`356`	`356`	`task, err := virtualMachineCtx.Obj.PowerOn(ctx)`
`357`	`357`	`if err != nil {`
`358`	`358`	`conditions.MarkFalse(virtualMachineCtx.VSphereVM, infrav1.VMProvisionedCondition, infrav1.PoweringOnFailedReason, clusterv1.ConditionSeverityWarning, err.Error())`
`359`		`- return false, errors.Wrapf(err, "failed to trigger power on op for vm %s", ctx)`
	`359`	`+ return false, errors.Wrapf(err, "failed to trigger power on op for vm %s", virtualMachineCtx)`
`360`	`360`	`}`
`361`	`361`	`conditions.MarkFalse(virtualMachineCtx.VSphereVM, infrav1.VMProvisionedCondition, infrav1.PoweringOnReason, clusterv1.ConditionSeverityInfo, "")`
`362`	`362`
`@@ -376,7 +376,7 @@ func (vms *VMService) reconcilePowerState(ctx context.Context, virtualMachineCtx`
`376`	`376`	`log.Info("VM is powered on")`
`377`	`377`	`return true, nil`
`378`	`378`	`default:`
`379`		`- return false, errors.Errorf("unexpected power state %q for vm %s", powerState, ctx)`
	`379`	`+ return false, errors.Errorf("unexpected power state %q for vm %s", powerState, virtualMachineCtx)`
`380`	`380`	`}`
`381`	`381`	`}`
`382`	`382`
`@@ -465,7 +465,7 @@ func (vms *VMService) reconcileStoragePolicy(ctx context.Context, virtualMachine`
`465`	`465`	`DeviceChange: changes,`
`466`	`466`	`})`
`467`	`467`	`if err != nil {`
`468`		`- return errors.Wrapf(err, "unable to set storagePolicy on vm %s", ctx)`
	`468`	`+ return errors.Wrapf(err, "unable to set storagePolicy on vm %s", virtualMachineCtx)`
`469`	`469`	`}`
`470`	`470`	`virtualMachineCtx.VSphereVM.Status.TaskRef = task.Reference().Value`
`471`	`471`	`}`
`@@ -492,7 +492,7 @@ func (vms *VMService) reconcileHardwareVersion(ctx context.Context, virtualMachi`
`492`	`492`	`log.Info("Upgrading hardware version", "fromVersion", virtualMachine.Config.Version, "toVersion", virtualMachineCtx.VSphereVM.Spec.HardwareVersion)`
`493`	`493`	`task, err := virtualMachineCtx.Obj.UpgradeVM(ctx, virtualMachineCtx.VSphereVM.Spec.HardwareVersion)`
`494`	`494`	`if err != nil {`
`495`		`- return false, errors.Wrapf(err, "error trigging upgrade op for machine %s", ctx)`
	`495`	`+ return false, errors.Wrapf(err, "error trigging upgrade op for machine %s", virtualMachineCtx)`
`496`	`496`	`}`
`497`	`497`	`virtualMachineCtx.VSphereVM.Status.TaskRef = task.Reference().Value`
`498`	`498`	`return false, nil`
`@@ -535,7 +535,7 @@ func (vms *VMService) reconcilePCIDevices(ctx context.Context, virtualMachineCtx`
`535`	`535`	`}`
`536`	`536`	`log.Info("PCI devices to be added", "number", len(specsToBeAdded))`
`537`	`537`	`if err := virtualMachineCtx.Obj.AddDevice(ctx, pci.ConstructDeviceSpecs(specsToBeAdded)...); err != nil {`
`538`		`- return errors.Wrapf(err, "error adding pci devices for %q", ctx)`
	`538`	`+ return errors.Wrapf(err, "error adding pci devices for %q", virtualMachineCtx)`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`	`return nil`
`@@ -550,7 +550,7 @@ func (vms VMService) getMetadata(ctx context.Context, virtualMachineCtx virtua`
`550`	`550`	`)`
`551`	`551`
`552`	`552`	`if err := pc.RetrieveOne(ctx, virtualMachineCtx.Ref, props, &obj); err != nil {`
`553`		`- return "", errors.Wrapf(err, "unable to fetch props %v for vm %s", props, ctx)`
	`553`	`+ return "", errors.Wrapf(err, "unable to fetch props %v for vm %s", props, virtualMachineCtx)`
`554`	`554`	`}`
`555`	`555`	`if obj.Config == nil {`
`556`	`556`	`return "", nil`
`@@ -571,7 +571,7 @@ func (vms VMService) getMetadata(ctx context.Context, virtualMachineCtx virtua`
`571`	`571`
`572`	`572`	`metadataBuf, err := base64.StdEncoding.DecodeString(metadataBase64)`
`573`	`573`	`if err != nil {`
`574`		`- return "", errors.Wrapf(err, "unable to decode metadata for %s", ctx)`
	`574`	`+ return "", errors.Wrapf(err, "unable to decode metadata for %s", virtualMachineCtx)`
`575`	`575`	`}`
`576`	`576`
`577`	`577`	`return string(metadataBuf), nil`
`@@ -599,7 +599,7 @@ func (vms VMService) setMetadata(ctx context.Context, virtualMachineCtx virtua`
`599`	`599`	`ExtraConfig: extraConfig,`
`600`	`600`	`})`
`601`	`601`	`if err != nil {`
`602`		`- return "", errors.Wrapf(err, "unable to set metadata on vm %s", ctx)`
	`602`	`+ return "", errors.Wrapf(err, "unable to set metadata on vm %s", virtualMachineCtx)`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`return task.Reference().Value, nil`
`@@ -641,7 +641,7 @@ func (vms VMService) getBootstrapData(ctx context.Context, vmCtx capvcontext.V`
`641`	`641`	`Name: vmCtx.VSphereVM.Spec.BootstrapRef.Name,`
`642`	`642`	`}`
`643`	`643`	`if err := vmCtx.Client.Get(ctx, secretKey, secret); err != nil {`
`644`		`- return nil, "", errors.Wrapf(err, "failed to get bootstrap data secret for %s", ctx)`
	`644`	`+ return nil, "", errors.Wrapf(err, "failed to get bootstrap data secret for %s", vmCtx)`
`645`	`645`	`}`
`646`	`646`
`647`	`647`	`format, ok := secret.Data["format"]`
Original file line number	Diff line number	Diff line change
`@@ -120,17 +120,17 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by`
`120`	`120`
`121`	`121`	`folder, err := vmCtx.Session.Finder.FolderOrDefault(ctx, vmCtx.VSphereVM.Spec.Folder)`
`122`	`122`	`if err != nil {`
`123`		`- return errors.Wrapf(err, "unable to get folder for %q", ctx)`
	`123`	`+ return errors.Wrapf(err, "unable to get folder for %q", vmCtx)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`pool, err := vmCtx.Session.Finder.ResourcePoolOrDefault(ctx, vmCtx.VSphereVM.Spec.ResourcePool)`
`127`	`127`	`if err != nil {`
`128`		`- return errors.Wrapf(err, "unable to get resource pool for %q", ctx)`
	`128`	`+ return errors.Wrapf(err, "unable to get resource pool for %q", vmCtx)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`devices, err := tpl.Device(ctx)`
`132`	`132`	`if err != nil {`
`133`		`- return errors.Wrapf(err, "error getting devices for %q", ctx)`
	`133`	`+ return errors.Wrapf(err, "error getting devices for %q", vmCtx)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Create a new list of device specs for cloning the VM.`
`@@ -140,14 +140,14 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by`
`140`	`140`	`if snapshotRef == nil {`
`141`	`141`	`diskSpecs, err := getDiskSpec(vmCtx, devices)`
`142`	`142`	`if err != nil {`
`143`		`- return errors.Wrapf(err, "error getting disk spec for %q", ctx)`
	`143`	`+ return errors.Wrapf(err, "error getting disk spec for %q", vmCtx)`
`144`	`144`	`}`
`145`	`145`	`deviceSpecs = append(deviceSpecs, diskSpecs...)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`networkSpecs, err := getNetworkSpecs(ctx, vmCtx, devices)`
`149`	`149`	`if err != nil {`
`150`		`- return errors.Wrapf(err, "error getting network specs for %q", ctx)`
	`150`	`+ return errors.Wrapf(err, "error getting network specs for %q", vmCtx)`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`deviceSpecs = append(deviceSpecs, networkSpecs...)`
`@@ -207,7 +207,7 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by`
`207`	`207`	`if vmCtx.VSphereVM.Spec.Datastore != "" {`
`208`	`208`	`datastore, err := vmCtx.Session.Finder.Datastore(ctx, vmCtx.VSphereVM.Spec.Datastore)`
`209`	`209`	`if err != nil {`
`210`		`- return errors.Wrapf(err, "unable to get datastore %s for %q", vmCtx.VSphereVM.Spec.Datastore, ctx)`
	`210`	`+ return errors.Wrapf(err, "unable to get datastore %s for %q", vmCtx.VSphereVM.Spec.Datastore, vmCtx)`
`211`	`211`	`}`
`212`	`212`	`datastoreRef = types.NewReference(datastore.Reference())`
`213`	`213`	`spec.Location.Datastore = datastoreRef`
`@@ -217,12 +217,12 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by`
`217`	`217`	`if vmCtx.VSphereVM.Spec.StoragePolicyName != "" {`
`218`	`218`	`pbmClient, err := pbm.NewClient(ctx, vmCtx.Session.Client.Client)`
`219`	`219`	`if err != nil {`
`220`		`- return errors.Wrapf(err, "unable to create pbm client for %q", ctx)`
	`220`	`+ return errors.Wrapf(err, "unable to create pbm client for %q", vmCtx)`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`storageProfileID, err = pbmClient.ProfileIDByName(ctx, vmCtx.VSphereVM.Spec.StoragePolicyName)`
`224`	`224`	`if err != nil {`
`225`		`- return errors.Wrapf(err, "unable to get storageProfileID from name %s for %q", vmCtx.VSphereVM.Spec.StoragePolicyName, ctx)`
	`225`	`+ return errors.Wrapf(err, "unable to get storageProfileID from name %s for %q", vmCtx.VSphereVM.Spec.StoragePolicyName, vmCtx)`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`var hubs []pbmTypes.PbmPlacementHub`
`@@ -279,7 +279,7 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by`
`279`	`279`	`// if no datastore defined through VM spec or storage policy, use default`
`280`	`280`	`datastore, err := vmCtx.Session.Finder.DefaultDatastore(ctx)`
`281`	`281`	`if err != nil {`
`282`		`- return errors.Wrapf(err, "unable to get default datastore for %q", ctx)`
	`282`	`+ return errors.Wrapf(err, "unable to get default datastore for %q", vmCtx)`
`283`	`283`	`}`
`284`	`284`	`datastoreRef = types.NewReference(datastore.Reference())`
`285`	`285`	`}`
`@@ -292,7 +292,7 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by`
`292`	`292`	`log.Info(fmt.Sprintf("Cloning Machine with clone mode %s", vmCtx.VSphereVM.Status.CloneMode))`
`293`	`293`	`task, err := tpl.Clone(ctx, folder, vmCtx.VSphereVM.Name, spec)`
`294`	`294`	`if err != nil {`
`295`		`- return errors.Wrapf(err, "error trigging clone op for machine %s", ctx)`
	`295`	`+ return errors.Wrapf(err, "error trigging clone op for machine %s", vmCtx)`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`vmCtx.VSphereVM.Status.TaskRef = task.Reference().Value`
`@@ -415,11 +415,11 @@ func getNetworkSpecs(ctx context.Context, vmCtx *capvcontext.VMContext, devices`
`415`	`415`	`}`
`416`	`416`	`backing, err := ref.EthernetCardBackingInfo(ctx)`
`417`	`417`	`if err != nil {`
`418`		`- return nil, errors.Wrapf(err, "unable to create new ethernet card backing info for network %q on %q", netSpec.NetworkName, ctx)`
	`418`	`+ return nil, errors.Wrapf(err, "unable to create new ethernet card backing info for network %q on %q", netSpec.NetworkName, vmCtx)`
`419`	`419`	`}`
`420`	`420`	`dev, err := object.EthernetCardTypes().CreateEthernetCard(ethCardType, backing)`
`421`	`421`	`if err != nil {`
`422`		`- return nil, errors.Wrapf(err, "unable to create new ethernet card %q for network %q on %q", ethCardType, netSpec.NetworkName, ctx)`
	`422`	`+ return nil, errors.Wrapf(err, "unable to create new ethernet card %q for network %q on %q", ethCardType, netSpec.NetworkName, vmCtx)`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`// Get the actual NIC object. This is safe to assert without a check`