mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-07 13:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify golangci.yaml file. Resolve found lint issues. (#6008)

Browse Source 
Signed-off-by: Xun Jiang <blackpiglet@gmail.com>
Co-authored-by: Xun Jiang <blackpiglet@gmail.com>
This commit is contained in:
Xun Jiang/Bruce Jiang
2023-03-24 12:15:08 +08:00
committed by GitHub
parent 82358666c8
commit 15d44724e7
32 changed files with 103 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/backup_deletion_controller.go
View File

@@ -484,14 +484,14 @@ func (r *backupDeletionReconciler) patchBackup(ctx context.Context, backup *vele
// Record original json
oldData, err := json.Marshal(backup)
if err != nil {
return nil, errors.Wrap(err, "error marshalling original Backup")
return nil, errors.Wrap(err, "error marshaling original Backup")
}
newBackup := backup.DeepCopy()
mutate(newBackup)
newData, err := json.Marshal(newBackup)
if err != nil {
return nil, errors.Wrap(err, "error marshalling updated Backup")
return nil, errors.Wrap(err, "error marshaling updated Backup")
}
patchBytes, err := jsonpatch.CreateMergePatch(oldData, newData)
if err != nil {