mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-20 15:04:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from skriss/fix-398

Browse Source 
get backup name from restore spec when handling restore DownloadRequests
This commit is contained in:
Andy Goldstein
2018-04-10 13:29:07 -04:00
committed by GitHub
parent 278c1c6087 0d2b49acce
commit 258f3e011e
6 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/test/backup_service.go
+6 -6
View File
@@ -28,19 +28,19 @@ type BackupService struct {
}
// CreateSignedURL provides a mock function with given fields: target, bucket, ttl
func (_m *BackupService) CreateSignedURL(target v1.DownloadTarget, bucket string, ttl time.Duration) (string, error) {
ret := _m.Called(target, bucket, ttl)
func (_m *BackupService) CreateSignedURL(target v1.DownloadTarget, bucket, directory string, ttl time.Duration) (string, error) {
ret := _m.Called(target, bucket, directory, ttl)
var r0 string
if rf, ok := ret.Get(0).(func(v1.DownloadTarget, string, time.Duration) string); ok {
r0 = rf(target, bucket, ttl)
if rf, ok := ret.Get(0).(func(v1.DownloadTarget, string, string, time.Duration) string); ok {
r0 = rf(target, bucket, directory, ttl)
} else {
r0 = ret.Get(0).(string)
}
var r1 error
if rf, ok := ret.Get(1).(func(v1.DownloadTarget, string, time.Duration) error); ok {
r1 = rf(target, bucket, ttl)
if rf, ok := ret.Get(1).(func(v1.DownloadTarget, string, string, time.Duration) error); ok {
r1 = rf(target, bucket, directory, ttl)
} else {
r1 = ret.Error(1)
}