mirror of
https://github.com/octoleo/restic.git
synced 2024-06-08 03:50:49 +00:00
8f5ff379b7
Prepends the object path prefix to all s3 paths and allows to have multiple independent restic backup repositories in a single s3 bucket. Removed the hardcoded "restic" prefix from s3 paths. Use "restic" as the default object path prefix for s3 if no other prefix gets specified. This will retain backward compatibility with existing s3 repository configurations. Simplified the parse flow to have a single point where we parse the bucket name and the prefix within the bucket. Added tests for s3 object path prefix and the new default prefix to config_test and location_test.
125 lines
3.0 KiB
Go
125 lines
3.0 KiB
Go
package location
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/restic/restic/backend/s3"
|
|
"github.com/restic/restic/backend/sftp"
|
|
)
|
|
|
|
var parseTests = []struct {
|
|
s string
|
|
u Location
|
|
}{
|
|
{"local:/srv/repo", Location{Scheme: "local", Config: "/srv/repo"}},
|
|
{"local:dir1/dir2", Location{Scheme: "local", Config: "dir1/dir2"}},
|
|
{"local:dir1/dir2", Location{Scheme: "local", Config: "dir1/dir2"}},
|
|
{"dir1/dir2", Location{Scheme: "local", Config: "dir1/dir2"}},
|
|
{"local:../dir1/dir2", Location{Scheme: "local", Config: "../dir1/dir2"}},
|
|
{"/dir1/dir2", Location{Scheme: "local", Config: "/dir1/dir2"}},
|
|
|
|
{"sftp:user@host:/srv/repo", Location{Scheme: "sftp",
|
|
Config: sftp.Config{
|
|
User: "user",
|
|
Host: "host",
|
|
Dir: "/srv/repo",
|
|
}}},
|
|
{"sftp:host:/srv/repo", Location{Scheme: "sftp",
|
|
Config: sftp.Config{
|
|
User: "",
|
|
Host: "host",
|
|
Dir: "/srv/repo",
|
|
}}},
|
|
{"sftp://user@host/srv/repo", Location{Scheme: "sftp",
|
|
Config: sftp.Config{
|
|
User: "user",
|
|
Host: "host",
|
|
Dir: "srv/repo",
|
|
}}},
|
|
{"sftp://user@host//srv/repo", Location{Scheme: "sftp",
|
|
Config: sftp.Config{
|
|
User: "user",
|
|
Host: "host",
|
|
Dir: "/srv/repo",
|
|
}}},
|
|
|
|
{"s3://eu-central-1/bucketname", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "eu-central-1",
|
|
Bucket: "bucketname",
|
|
Prefix: "restic",
|
|
}},
|
|
},
|
|
{"s3://hostname.foo/bucketname", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "hostname.foo",
|
|
Bucket: "bucketname",
|
|
Prefix: "restic",
|
|
}},
|
|
},
|
|
{"s3://hostname.foo/bucketname/prefix/directory", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "hostname.foo",
|
|
Bucket: "bucketname",
|
|
Prefix: "prefix/directory",
|
|
}},
|
|
},
|
|
{"s3:eu-central-1/repo", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "eu-central-1",
|
|
Bucket: "repo",
|
|
Prefix: "restic",
|
|
}},
|
|
},
|
|
{"s3:eu-central-1/repo/prefix/directory", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "eu-central-1",
|
|
Bucket: "repo",
|
|
Prefix: "prefix/directory",
|
|
}},
|
|
},
|
|
{"s3:https://hostname.foo/repo", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "hostname.foo",
|
|
Bucket: "repo",
|
|
Prefix: "restic",
|
|
}},
|
|
},
|
|
{"s3:https://hostname.foo/repo/prefix/directory", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "hostname.foo",
|
|
Bucket: "repo",
|
|
Prefix: "prefix/directory",
|
|
}},
|
|
},
|
|
{"s3:http://hostname.foo/repo", Location{Scheme: "s3",
|
|
Config: s3.Config{
|
|
Endpoint: "hostname.foo",
|
|
Bucket: "repo",
|
|
Prefix: "restic",
|
|
UseHTTP: true,
|
|
}},
|
|
},
|
|
}
|
|
|
|
func TestParse(t *testing.T) {
|
|
for i, test := range parseTests {
|
|
u, err := Parse(test.s)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
continue
|
|
}
|
|
|
|
if test.u.Scheme != u.Scheme {
|
|
t.Errorf("test %d: scheme does not match, want %q, got %q",
|
|
i, test.u.Scheme, u.Scheme)
|
|
}
|
|
|
|
if !reflect.DeepEqual(test.u.Config, u.Config) {
|
|
t.Errorf("test %d: cfg map does not match, want:\n %#v\ngot: \n %#v",
|
|
i, test.u.Config, u.Config)
|
|
}
|
|
}
|
|
}
|