mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-06 05:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

error if restic repo identifier can't be determined

Browse Source 
Signed-off-by: Steve Kriss <krisss@vmware.com>
This commit is contained in:
Steve Kriss
2019-08-08 15:06:49 -06:00
parent 00882c2de4
commit 8b6c505817
3 changed files with 90 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/restic/config.go
View File

@@ -21,6 +21,8 @@ import (
"path"
"strings"
"github.com/pkg/errors"
velerov1api "github.com/heptio/velero/pkg/apis/velero/v1"
"github.com/heptio/velero/pkg/cloudprovider/aws"
"github.com/heptio/velero/pkg/persistence"
@@ -40,8 +42,8 @@ var getAWSBucketRegion = aws.GetBucketRegion
// getRepoPrefix returns the prefix of the value of the --repo flag for
// restic commands, i.e. everything except the "/<repo-name>".
func getRepoPrefix(location *velerov1api.BackupStorageLocation) string {
var provider, bucket, prefix, bucketAndPrefix string
func getRepoPrefix(location *velerov1api.BackupStorageLocation) (string, error) {
var bucket, prefix string
if location.Spec.ObjectStorage != nil {
layout := persistence.NewObjectStoreLayout(location.Spec.ObjectStorage.Prefix)
@@ -49,14 +51,13 @@ func getRepoPrefix(location *velerov1api.BackupStorageLocation) string {
bucket = location.Spec.ObjectStorage.Bucket
prefix = layout.GetResticDir()
}
bucketAndPrefix = path.Join(bucket, prefix)
var locationSpecProvider = location.Spec.Provider
if !strings.Contains(locationSpecProvider, "/") {
locationSpecProvider = "velero.io/" + locationSpecProvider
var provider = location.Spec.Provider
if !strings.Contains(provider, "/") {
provider = "velero.io/" + provider
}
switch BackendType(locationSpecProvider) {
switch BackendType(provider) {
case AWSBackend:
var url string
switch {
@@ -73,20 +74,23 @@ func getRepoPrefix(location *velerov1api.BackupStorageLocation) string {
url = fmt.Sprintf("s3-%s.amazonaws.com", region)
}
return fmt.Sprintf("s3:%s/%s", strings.TrimSuffix(url, "/"), bucketAndPrefix)
return fmt.Sprintf("s3:%s/%s", strings.TrimSuffix(url, "/"), path.Join(bucket, prefix)), nil
case AzureBackend:
provider = "azure"
return fmt.Sprintf("azure:%s:/%s", bucket, prefix), nil
case GCPBackend:
provider = "gs"
return fmt.Sprintf("gs:%s:/%s", bucket, prefix), nil
}
return fmt.Sprintf("%s:%s:/%s", provider, bucket, prefix)
return "", errors.New("restic repository prefix (resticRepoPrefix) not specified in backup storage location's config")
}
// GetRepoIdentifier returns the string to be used as the value of the --repo flag in
// restic commands for the given repository.
func GetRepoIdentifier(location *velerov1api.BackupStorageLocation, name string) string {
prefix := getRepoPrefix(location)
func GetRepoIdentifier(location *velerov1api.BackupStorageLocation, name string) (string, error) {
prefix, err := getRepoPrefix(location)
if err != nil {
return "", err
}
return fmt.Sprintf("%s/%s", strings.TrimSuffix(prefix, "/"), name)
return fmt.Sprintf("%s/%s", strings.TrimSuffix(prefix, "/"), name), nil
}