mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 14:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #271 from nrb/fix-246

Browse Source 
Invalidate restores based on non-existent backups
This commit is contained in:
Andy Goldstein
2018-01-10 13:24:53 -05:00
committed by GitHub
parent 1035cf72ce bb7b0a3c33
commit f5f1dbac5d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/restore_controller.go
View File

@@ -297,6 +297,8 @@ func (controller *restoreController) getValidationErrors(itm *api.Restore) []str
if itm.Spec.BackupName == "" {
validationErrors = append(validationErrors, "BackupName must be non-empty and correspond to the name of a backup in object storage.")
} else if _, err := controller.fetchBackup(controller.bucket, itm.Spec.BackupName); err != nil {
validationErrors = append(validationErrors, fmt.Sprintf("Error retrieving backup: %v", err))
}
includedResources := sets.NewString(itm.Spec.IncludedResources...)

4
pkg/controller/restore_controller_test.go
View File

@@ -183,8 +183,8 @@ func TestProcessRestore(t *testing.T) {
name: "restore with non-existent backup name fails",
restore: arktest.NewTestRestore("foo", "bar", api.RestorePhaseNew).WithBackup("backup-1").WithIncludedNamespace("ns-1").Restore,
expectedErr: false,
expectedPhase: string(api.RestorePhaseInProgress),
expectedRestoreErrors: 1,
expectedPhase: string(api.RestorePhaseFailedValidation),
expectedValidationErrors: []string{"Error retrieving backup: no backup here"},
backupServiceGetBackupError: errors.New("no backup here"),
},
{