fix QF1008 rule from staticcheck

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.golangci.yaml

@@ -249,7 +249,6 @@ linters:
     staticcheck:
       checks:
         - all
-        - -QF1008 # Omit embedded fields from selector expression
 
     testifylint:
       # TODO: enable them all

internal/delete/delete_item_action_handler.go

@@ -120,7 +120,7 @@ func InvokeDeleteActions(ctx *Context) error {
 						continue
 					}
 
-					err = action.DeleteItemAction.Execute(&velero.DeleteItemActionExecuteInput{
+					err = action.Execute(&velero.DeleteItemActionExecuteInput{
 						Item:   obj,
 						Backup: ctx.Backup,
 					})

internal/volume/volumes_information.go

@@ -446,7 +446,7 @@ func (v *BackupVolumesInformation) generateVolumeInfoForCSIVolumeSnapshot() {
 
 		var operation itemoperation.BackupOperation
 		for _, op := range v.BackupOperations {
-			if op.Spec.ResourceIdentifier.GroupResource.String() == kuberesource.VolumeSnapshots.String() &&
+			if op.Spec.ResourceIdentifier.String() == kuberesource.VolumeSnapshots.String() &&
 				op.Spec.ResourceIdentifier.Name == volumeSnapshot.Name &&
 				op.Spec.ResourceIdentifier.Namespace == volumeSnapshot.Namespace {
 				operation = *op
@@ -567,9 +567,9 @@ func (v *BackupVolumesInformation) generateVolumeInfoFromDataUpload() {
 	// Retrieve the operations containing DataUpload.
 	duOperationMap := make(map[kbclient.ObjectKey]*itemoperation.BackupOperation)
 	for _, operation := range v.BackupOperations {
-		if operation.Spec.ResourceIdentifier.GroupResource.String() == kuberesource.PersistentVolumeClaims.String() {
+		if operation.Spec.ResourceIdentifier.String() == kuberesource.PersistentVolumeClaims.String() {
 			for _, identifier := range operation.Spec.PostOperationItems {
-				if identifier.GroupResource.String() == "datauploads.velero.io" {
+				if identifier.String() == "datauploads.velero.io" {
 					duOperationMap[kbclient.ObjectKey{
 						Namespace: identifier.Namespace,
 						Name:      identifier.Name,

internal/volumehelper/volume_policy_helper.go

@@ -148,7 +148,7 @@ func (v volumeHelperImpl) ShouldPerformFSBackup(volume corev1api.Volume, pod cor
 		var err error
 		resource = &volume
 		var pvc = &corev1api.PersistentVolumeClaim{}
-		if volume.VolumeSource.PersistentVolumeClaim != nil {
+		if volume.PersistentVolumeClaim != nil {
 			pvc, err = kubeutil.GetPVCForPodVolume(&volume, &pod, v.client)
 			if err != nil {
 				v.logger.WithError(err).Errorf("fail to get PVC for pod %s", pod.Namespace+"/"+pod.Name)

pkg/backup/actions/csi/pvc_action.go

@@ -109,7 +109,7 @@ func (p *pvcBackupItemAction) validatePVCandPV(
 		return false, updateItem, errors.WithStack(err)
 	}
 
-	if pv.Spec.PersistentVolumeSource.CSI == nil {
+	if pv.Spec.CSI == nil {
 		p.log.Infof(
 			"Skipping PVC %s/%s, associated PV %s is not a CSI volume",
 			pvc.Namespace, pvc.Name, pv.Name)
@@ -160,7 +160,7 @@ func (p *pvcBackupItemAction) createVolumeSnapshot(
 	p.log.Infof("VolumeSnapshotClass=%s", vsClass.Name)
 
 	vsLabels := map[string]string{}
-	for k, v := range pvc.ObjectMeta.Labels {
+	for k, v := range pvc.Labels {
 		vsLabels[k] = v
 	}
 	vsLabels[velerov1api.BackupNameLabel] = label.GetValidName(backup.Name)
@@ -355,7 +355,7 @@ func (p *pvcBackupItemAction) Execute(
 	p.log.Infof("Returning from PVCBackupItemAction with %d additionalItems to backup",
 		len(additionalItems))
 	for _, ai := range additionalItems {
-		p.log.Debugf("%s: %s", ai.GroupResource.String(), ai.Name)
+		p.log.Debugf("%s: %s", ai.String(), ai.Name)
 	}
 
 	pvcMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&pvc)

pkg/backup/actions/csi/volumesnapshot_action.go

@@ -237,7 +237,7 @@ func (p *volumeSnapshotBackupItemAction) Execute(
 	p.log.Infof("Returning from VolumeSnapshotBackupItemAction with %d additionalItems to backup",
 		len(additionalItems))
 	for _, ai := range additionalItems {
-		p.log.Debugf("%s: %s", ai.GroupResource.String(), ai.Name)
+		p.log.Debugf("%s: %s", ai.String(), ai.Name)
 	}
 
 	operationID := ""

pkg/backup/backup.go

@@ -279,7 +279,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
 		)
 	}
 
-	log.Infof("Backing up all volumes using pod volume backup: %t", boolptr.IsSetToTrue(backupRequest.Backup.Spec.DefaultVolumesToFsBackup))
+	log.Infof("Backing up all volumes using pod volume backup: %t", boolptr.IsSetToTrue(backupRequest.Spec.DefaultVolumesToFsBackup))
 
 	var err error
 	backupRequest.ResourceHooks, err = getResourceHooks(backupRequest.Spec.Hooks.Resources, kb.discoveryHelper)
@@ -344,7 +344,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
 	items := collector.getAllItems()
 	log.WithField("progress", "").Infof("Collected %d items matching the backup spec from the Kubernetes API (actual number of items backed up may be more or less depending on velero.io/exclude-from-backup annotation, plugins returning additional related items to back up, etc.)", len(items))
 
-	updated := backupRequest.Backup.DeepCopy()
+	updated := backupRequest.DeepCopy()
 	if updated.Status.Progress == nil {
 		updated.Status.Progress = &velerov1api.BackupProgress{}
 	}
@@ -417,7 +417,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
 				lastUpdate = &val
 			case <-ticker.C:
 				if lastUpdate != nil {
-					updated := backupRequest.Backup.DeepCopy()
+					updated := backupRequest.DeepCopy()
 					if updated.Status.Progress == nil {
 						updated.Status.Progress = &velerov1api.BackupProgress{}
 					}
@@ -591,7 +591,7 @@ func (kb *kubernetesBackupper) BackupWithResolvers(
 
 	// do a final update on progress since we may have just added some CRDs and may not have updated
 	// for the last few processed items.
-	updated = backupRequest.Backup.DeepCopy()
+	updated = backupRequest.DeepCopy()
 	if updated.Status.Progress == nil {
 		updated.Status.Progress = &velerov1api.BackupProgress{}
 	}
@@ -668,9 +668,9 @@ func (kb *kubernetesBackupper) executeItemBlockActions(
 				continue
 			}
 			// Item wasn't found in item collector list, get from cluster
-			gvr, resource, err := itemBlock.itemBackupper.discoveryHelper.ResourceFor(relatedItem.GroupResource.WithVersion(""))
+			gvr, resource, err := itemBlock.itemBackupper.discoveryHelper.ResourceFor(relatedItem.WithVersion(""))
 			if err != nil {
-				log.Error(errors.Wrapf(err, "Unable to obtain gvr and resource for related item %s %s/%s", relatedItem.GroupResource.String(), relatedItem.Namespace, relatedItem.Name))
+				log.Error(errors.Wrapf(err, "Unable to obtain gvr and resource for related item %s %s/%s", relatedItem.String(), relatedItem.Namespace, relatedItem.Name))
 				continue
 			}
 
@@ -690,7 +690,7 @@ func (kb *kubernetesBackupper) executeItemBlockActions(
 				continue
 			}
 			if err != nil {
-				log.Error(errors.Wrapf(err, "Error while trying to get related item %s %s/%s from cluster", relatedItem.GroupResource.String(), relatedItem.Namespace, relatedItem.Name))
+				log.Error(errors.Wrapf(err, "Error while trying to get related item %s %s/%s from cluster", relatedItem.String(), relatedItem.Namespace, relatedItem.Name))
 				continue
 			}
 			itemsMap[relatedItem] = append(itemsMap[relatedItem], &kubernetesResource{
@@ -1080,7 +1080,7 @@ func (kb *kubernetesBackupper) FinalizeBackup(
 		}).Infof("Updated %d items out of an estimated total of %d (estimate will change throughout the backup finalizer)", backedUpItems, totalItems)
 	}
 
-	volumeInfos, err := backupStore.GetBackupVolumeInfos(backupRequest.Backup.Name)
+	volumeInfos, err := backupStore.GetBackupVolumeInfos(backupRequest.Name)
 	if err != nil {
 		log.WithError(err).Errorf("fail to get the backup VolumeInfos for backup %s", backupRequest.Name)
 		return err

pkg/backup/item_backupper.go

@@ -432,8 +432,8 @@ func (ib *itemBackupper) executeActions(
 			now := metav1.Now()
 			newOperation := itemoperation.BackupOperation{
 				Spec: itemoperation.BackupOperationSpec{
-					BackupName:         ib.backupRequest.Backup.Name,
-					BackupUID:          string(ib.backupRequest.Backup.UID),
+					BackupName:         ib.backupRequest.Name,
+					BackupUID:          string(ib.backupRequest.UID),
 					BackupItemAction:   action.Name(),
 					ResourceIdentifier: resourceIdentifier,
 					OperationID:        operationID,
@@ -460,7 +460,7 @@ func (ib *itemBackupper) executeActions(
 			if len(itemList) == 0 {
 				log.Infof("Additional Item %s %s/%s not found in ItemBlock, getting from cluster", additionalItem.GroupResource, additionalItem.Namespace, additionalItem.Name)
 
-				gvr, resource, err := ib.discoveryHelper.ResourceFor(additionalItem.GroupResource.WithVersion(""))
+				gvr, resource, err := ib.discoveryHelper.ResourceFor(additionalItem.WithVersion(""))
 				if err != nil {
 					return nil, itemFiles, err
 				}

pkg/backup/item_collector.go

@@ -369,7 +369,7 @@ func (r *itemCollector) getResourceItems(
 	)
 
 	orders := getOrderedResourcesForType(
-		r.backupRequest.Backup.Spec.OrderedResources,
+		r.backupRequest.Spec.OrderedResources,
 		resource.Name,
 	)
 	// Getting the preferred group version of this resource
@@ -758,7 +758,7 @@ func (r *itemCollector) collectNamespaces(
 		return nil, errors.WithStack(err)
 	}
 
-	for _, includedNSName := range r.backupRequest.Backup.Spec.IncludedNamespaces {
+	for _, includedNSName := range r.backupRequest.Spec.IncludedNamespaces {
 		nsExists := false
 		// Skip checking the namespace existing when it's "*".
 		if includedNSName == "*" {
@@ -778,17 +778,17 @@ func (r *itemCollector) collectNamespaces(
 	var singleSelector labels.Selector
 	var orSelectors []labels.Selector
 
-	if r.backupRequest.Backup.Spec.LabelSelector != nil {
+	if r.backupRequest.Spec.LabelSelector != nil {
 		var err error
 		singleSelector, err = metav1.LabelSelectorAsSelector(
-			r.backupRequest.Backup.Spec.LabelSelector)
+			r.backupRequest.Spec.LabelSelector)
 		if err != nil {
 			log.WithError(err).Errorf("Fail to convert backup LabelSelector %s into selector.",
-				metav1.FormatLabelSelector(r.backupRequest.Backup.Spec.LabelSelector))
+				metav1.FormatLabelSelector(r.backupRequest.Spec.LabelSelector))
 		}
 	}
-	if r.backupRequest.Backup.Spec.OrLabelSelectors != nil {
-		for _, ls := range r.backupRequest.Backup.Spec.OrLabelSelectors {
+	if r.backupRequest.Spec.OrLabelSelectors != nil {
+		for _, ls := range r.backupRequest.Spec.OrLabelSelectors {
 			orSelector, err := metav1.LabelSelectorAsSelector(ls)
 			if err != nil {
 				log.WithError(err).Errorf("Fail to convert backup OrLabelSelector %s into selector.",

pkg/backup/request.go

@@ -83,5 +83,5 @@ func (r *Request) FillVolumesInformation() {
 	r.VolumesInformation.NativeSnapshots = r.VolumeSnapshots
 	r.VolumesInformation.PodVolumeBackups = r.PodVolumeBackups
 	r.VolumesInformation.BackupOperations = *r.GetItemOperationsList()
-	r.VolumesInformation.BackupName = r.Backup.Name
+	r.VolumesInformation.BackupName = r.Name
 }