diff --git a/pkg/cloudprovider/backup_service.go b/pkg/cloudprovider/backup_service.go index a48c4e01f..6543043d4 100644 --- a/pkg/cloudprovider/backup_service.go +++ b/pkg/cloudprovider/backup_service.go @@ -68,8 +68,8 @@ type BackupGetter interface { const ( metadataFileFormatString = "%s/ark-backup.json" - backupFileFormatString = "%s/%s-data.tar.gz" - backukpLogFileFormatString = "%s/%s-logs.gz" + backupFileFormatString = "%s/%s.tar.gz" + backupLogFileFormatString = "%s/%s-logs.gz" restoreLogFileFormatString = "%s/restore-%s-logs.gz" ) @@ -82,7 +82,7 @@ func getBackupContentsKey(backup string) string { } func getBackupLogKey(backup string) string { - return fmt.Sprintf(backukpLogFileFormatString, backup, backup) + return fmt.Sprintf(backupLogFileFormatString, backup, backup) } func getRestoreLogKey(backup, restore string) string { diff --git a/pkg/cloudprovider/backup_service_test.go b/pkg/cloudprovider/backup_service_test.go index 45aea8d48..455636393 100644 --- a/pkg/cloudprovider/backup_service_test.go +++ b/pkg/cloudprovider/backup_service_test.go @@ -88,7 +88,7 @@ func TestUploadBackup(t *testing.T) { objStore.On("PutObject", bucket, backupName+"/ark-backup.json", test.metadata).Return(test.metadataError) } if test.backup != nil { - objStore.On("PutObject", bucket, backupName+"/"+backupName+"-data.tar.gz", test.backup).Return(test.backupError) + objStore.On("PutObject", bucket, backupName+"/"+backupName+".tar.gz", test.backup).Return(test.backupError) } if test.log != nil { objStore.On("PutObject", bucket, backupName+"/"+backupName+"-logs.gz", test.log).Return(test.logError) @@ -116,7 +116,7 @@ func TestDownloadBackup(t *testing.T) { o := &testutil.ObjectStorageAdapter{} bucket := "b" backup := "bak" - o.On("GetObject", bucket, backup+"/"+backup+"-data.tar.gz").Return(ioutil.NopCloser(strings.NewReader("foo")), nil) + o.On("GetObject", bucket, backup+"/"+backup+".tar.gz").Return(ioutil.NopCloser(strings.NewReader("foo")), nil) s := NewBackupService(o) rc, err := s.DownloadBackup(bucket, backup) require.NoError(t, err)