KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

sftp: Rename Dir -> Path

Browse source
This commit is contained in:
Alexander Neumann 2017-04-10 22:41:06 +02:00
parent ab602c9d14
commit ae290ab374
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/restic/backend/location/location_test.go
View file

@ -79,7 +79,7 @@ var parseTests = []struct {
Config: sftp.Config{ Config: sftp.Config{
User: "user", User: "user",
Host: "host", Host: "host",
Dir: "/srv/repo", Path: "/srv/repo",
}, },
}, },
}, },
@ -89,7 +89,7 @@ var parseTests = []struct {
Config: sftp.Config{ Config: sftp.Config{
User: "", User: "",
Host: "host", Host: "host",
Dir: "/srv/repo", Path: "/srv/repo",
}, },
}, },
}, },
@ -99,7 +99,7 @@ var parseTests = []struct {
Config: sftp.Config{ Config: sftp.Config{
User: "user", User: "user",
Host: "host", Host: "host",
Dir: "srv/repo", Path: "srv/repo",
}, },
}, },
}, },
@ -109,7 +109,7 @@ var parseTests = []struct {
Config: sftp.Config{ Config: sftp.Config{
User: "user", User: "user",
Host: "host", Host: "host",
Dir: "/srv/repo", Path: "/srv/repo",
}, },
}, },
}, },

8
src/restic/backend/sftp/config.go
View file

@ -10,9 +10,9 @@ import (
// Config collects all information required to connect to an sftp server. // Config collects all information required to connect to an sftp server.
type Config struct { type Config struct {
User, Host, Dir string User, Host, Path string
Layout string `option:"layout"` Layout string `option:"layout"`
Command string `option:"command"` Command string `option:"command"`
} }
// ParseConfig parses the string s and extracts the sftp config. The // ParseConfig parses the string s and extracts the sftp config. The
@ -62,6 +62,6 @@ func ParseConfig(s string) (interface{}, error) {
return Config{ return Config{
User: user, User: user,
Host: host, Host: host,
Dir: path.Clean(dir), Path: path.Clean(dir),
}, nil }, nil
} }

24
src/restic/backend/sftp/config_test.go
View file

@ -9,53 +9,53 @@ var configTests = []struct {
// first form, user specified sftp://user@host/dir // first form, user specified sftp://user@host/dir
{ {
"sftp://user@host/dir/subdir", "sftp://user@host/dir/subdir",
Config{User: "user", Host: "host", Dir: "dir/subdir"}, Config{User: "user", Host: "host", Path: "dir/subdir"},
}, },
{ {
"sftp://host/dir/subdir", "sftp://host/dir/subdir",
Config{Host: "host", Dir: "dir/subdir"}, Config{Host: "host", Path: "dir/subdir"},
}, },
{ {
"sftp://host//dir/subdir", "sftp://host//dir/subdir",
Config{Host: "host", Dir: "/dir/subdir"}, Config{Host: "host", Path: "/dir/subdir"},
}, },
{ {
"sftp://host:10022//dir/subdir", "sftp://host:10022//dir/subdir",
Config{Host: "host:10022", Dir: "/dir/subdir"}, Config{Host: "host:10022", Path: "/dir/subdir"},
}, },
{ {
"sftp://user@host:10022//dir/subdir", "sftp://user@host:10022//dir/subdir",
Config{User: "user", Host: "host:10022", Dir: "/dir/subdir"}, Config{User: "user", Host: "host:10022", Path: "/dir/subdir"},
}, },
{ {
"sftp://user@host/dir/subdir/../other", "sftp://user@host/dir/subdir/../other",
Config{User: "user", Host: "host", Dir: "dir/other"}, Config{User: "user", Host: "host", Path: "dir/other"},
}, },
{ {
"sftp://user@host/dir///subdir", "sftp://user@host/dir///subdir",
Config{User: "user", Host: "host", Dir: "dir/subdir"}, Config{User: "user", Host: "host", Path: "dir/subdir"},
}, },
// second form, user specified sftp:user@host:/dir // second form, user specified sftp:user@host:/dir
{ {
"sftp:user@host:/dir/subdir", "sftp:user@host:/dir/subdir",
Config{User: "user", Host: "host", Dir: "/dir/subdir"}, Config{User: "user", Host: "host", Path: "/dir/subdir"},
}, },
{ {
"sftp:host:../dir/subdir", "sftp:host:../dir/subdir",
Config{Host: "host", Dir: "../dir/subdir"}, Config{Host: "host", Path: "../dir/subdir"},
}, },
{ {
"sftp:user@host:dir/subdir:suffix", "sftp:user@host:dir/subdir:suffix",
Config{User: "user", Host: "host", Dir: "dir/subdir:suffix"}, Config{User: "user", Host: "host", Path: "dir/subdir:suffix"},
}, },
{ {
"sftp:user@host:dir/subdir/../other", "sftp:user@host:dir/subdir/../other",
Config{User: "user", Host: "host", Dir: "dir/other"}, Config{User: "user", Host: "host", Path: "dir/other"},
}, },
{ {
"sftp:user@host:dir///subdir", "sftp:user@host:dir///subdir",
Config{User: "user", Host: "host", Dir: "dir/subdir"}, Config{User: "user", Host: "host", Path: "dir/subdir"},
}, },
} }

1
src/restic/backend/sftp/sftp.go
View file

@ -32,6 +32,7 @@ type SFTP struct {
result <-chan error result <-chan error
backend.Layout backend.Layout
Config
} }
var _ restic.Backend = &SFTP{} var _ restic.Backend = &SFTP{}