octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-02 19:49:44 +00:00
Code Issues Releases Wiki Activity

sftp: Rename Open/Create

Browse Source
This commit is contained in:
Alexander Neumann 2017-04-10 22:39:13 +02:00
parent 1086528ab7
commit 2e53af1b75
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmds/restic/global.go
View File

@ -388,7 +388,7 @@ func open(s string, opts options.Options) (restic.Backend, error) {
case "local": case "local":
be, err = local.Open(cfg.(local.Config)) be, err = local.Open(cfg.(local.Config))
case "sftp": case "sftp":
be, err = sftp.OpenWithConfig(cfg.(sftp.Config)) be, err = sftp.Open(cfg.(sftp.Config))
case "s3": case "s3":
be, err = s3.Open(cfg.(s3.Config)) be, err = s3.Open(cfg.(s3.Config))
case "rest": case "rest":
@ -422,7 +422,7 @@ func create(s string, opts options.Options) (restic.Backend, error) {
case "local": case "local":
return local.Create(cfg.(local.Config)) return local.Create(cfg.(local.Config))
case "sftp": case "sftp":
return sftp.CreateWithConfig(cfg.(sftp.Config)) return sftp.Create(cfg.(sftp.Config))
case "s3": case "s3":
return s3.Open(cfg.(s3.Config)) return s3.Open(cfg.(s3.Config))
case "rest": case "rest":

12
src/restic/backend/sftp/sftp.go
View File

@ -153,9 +153,9 @@ func buildSSHCommand(cfg Config) []string {
return args return args
} }
// OpenWithConfig opens an sftp backend as described by the config by running // Open opens an sftp backend as described by the config by running
// "ssh" with the appropriate arguments. // "ssh" with the appropriate arguments.
func OpenWithConfig(cfg Config) (*SFTP, error) { func Open(cfg Config) (*SFTP, error) {
debug.Log("config %#v", cfg) debug.Log("config %#v", cfg)
if cfg.Command == "" { if cfg.Command == "" {
@ -171,8 +171,8 @@ func OpenWithConfig(cfg Config) (*SFTP, error) {
} }
// create creates all the necessary files and directories for a new sftp // create creates all the necessary files and directories for a new sftp
// backend at dir. Afterwards a new config blob should be created. `dir` must // backend at dir. `dir` must be delimited by forward slashes ("/"), which is
// be delimited by forward slashes ("/"), which is required by sftp. // required by sftp.
func create(dir string, program string, args ...string) (*SFTP, error) { func create(dir string, program string, args ...string) (*SFTP, error) {
debug.Log("create() %v %v", program, args) debug.Log("create() %v %v", program, args)
sftp, err := startClient(program, args...) sftp, err := startClient(program, args...)
@ -204,9 +204,9 @@ func create(dir string, program string, args ...string) (*SFTP, error) {
return open(dir, program, args...) return open(dir, program, args...)
} }
// CreateWithConfig creates an sftp backend as described by the config by running // Create creates an sftp backend as described by the config by running
// "ssh" with the appropriate arguments. // "ssh" with the appropriate arguments.
func CreateWithConfig(cfg Config) (*SFTP, error) { func Create(cfg Config) (*SFTP, error) {
debug.Log("config %#v", cfg) debug.Log("config %#v", cfg)
if cfg.Command == "" { if cfg.Command == "" {
return create(cfg.Dir, "ssh", buildSSHCommand(cfg)...) return create(cfg.Dir, "ssh", buildSSHCommand(cfg)...)

4
src/restic/backend/sftp/sftp_backend_test.go
View File

@ -63,7 +63,7 @@ func init() {
cfg.Dir = tempBackendDir cfg.Dir = tempBackendDir
return sftp.CreateWithConfig(cfg) return sftp.Create(cfg)
} }
test.OpenFn = func() (restic.Backend, error) { test.OpenFn = func() (restic.Backend, error) {
@ -74,7 +74,7 @@ func init() {
cfg.Dir = tempBackendDir cfg.Dir = tempBackendDir
return sftp.OpenWithConfig(cfg) return sftp.Open(cfg)
} }
test.CleanupFn = func() error { test.CleanupFn = func() error {