s3: Remove default prefix "/restic"

This commit is contained in:
Alexander Neumann
2017-11-20 22:29:15 +01:00
parent e83ec17e95
commit 262b0cd9d4
3 changed files with 19 additions and 21 deletions

View File

@@ -34,8 +34,6 @@ func init() {
options.Register("s3", Config{})
}
const defaultPrefix = "restic"
// ParseConfig parses the string s and extracts the s3 config. The two
// supported configuration formats are s3://host/bucketname/prefix and
// s3:host/bucketname/prefix. The host can also be a valid s3 region
@@ -71,15 +69,15 @@ func ParseConfig(s string) (interface{}, error) {
}
func createConfig(endpoint string, p []string, useHTTP bool) (interface{}, error) {
var prefix string
switch {
case len(p) < 1:
if len(p) < 1 {
return nil, errors.New("s3: invalid format, host/region or bucket name not found")
case len(p) == 1 || p[1] == "":
prefix = defaultPrefix
default:
}
var prefix string
if len(p) > 1 && p[1] != "" {
prefix = path.Clean(p[1])
}
cfg := NewConfig()
cfg.Endpoint = endpoint
cfg.UseHTTP = useHTTP