backend: let ParseConfig return a Config pointer
In order to change the backend initialization in `global.go` to be able to generically call cfg.ApplyEnvironment() for supported backends, the `interface{}` returned by `ParseConfig` must contain a pointer to the configuration. An alternative would be to use reflection to convert the type from `interface{}(Config)` to `interface{}(*Config)` (from value to pointer type). However, this would just complicate the type mess further.
This commit is contained in:
parent
25a0be7f26
commit
f903db492c
26 changed files with 165 additions and 146 deletions
|
@ -35,14 +35,14 @@ func init() {
|
|||
// and sftp:user@host:directory. The directory will be path Cleaned and can
|
||||
// be an absolute path if it starts with a '/' (e.g.
|
||||
// sftp://user@host//absolute and sftp:user@host:/absolute).
|
||||
func ParseConfig(s string) (Config, error) {
|
||||
func ParseConfig(s string) (*Config, error) {
|
||||
var user, host, port, dir string
|
||||
switch {
|
||||
case strings.HasPrefix(s, "sftp://"):
|
||||
// parse the "sftp://user@host/path" url format
|
||||
url, err := url.Parse(s)
|
||||
if err != nil {
|
||||
return Config{}, errors.WithStack(err)
|
||||
return nil, errors.WithStack(err)
|
||||
}
|
||||
if url.User != nil {
|
||||
user = url.User.Username()
|
||||
|
@ -51,7 +51,7 @@ func ParseConfig(s string) (Config, error) {
|
|||
port = url.Port()
|
||||
dir = url.Path
|
||||
if dir == "" {
|
||||
return Config{}, errors.Errorf("invalid backend %q, no directory specified", s)
|
||||
return nil, errors.Errorf("invalid backend %q, no directory specified", s)
|
||||
}
|
||||
|
||||
dir = dir[1:]
|
||||
|
@ -63,7 +63,7 @@ func ParseConfig(s string) (Config, error) {
|
|||
var colon bool
|
||||
host, dir, colon = strings.Cut(s, ":")
|
||||
if !colon {
|
||||
return Config{}, errors.New("sftp: invalid format, hostname or path not found")
|
||||
return nil, errors.New("sftp: invalid format, hostname or path not found")
|
||||
}
|
||||
// split user and host at the "@"
|
||||
data := strings.SplitN(host, "@", 3)
|
||||
|
@ -75,12 +75,12 @@ func ParseConfig(s string) (Config, error) {
|
|||
host = data[1]
|
||||
}
|
||||
default:
|
||||
return Config{}, errors.New(`invalid format, does not start with "sftp:"`)
|
||||
return nil, errors.New(`invalid format, does not start with "sftp:"`)
|
||||
}
|
||||
|
||||
p := path.Clean(dir)
|
||||
if strings.HasPrefix(p, "~") {
|
||||
return Config{}, errors.New("sftp path starts with the tilde (~) character, that fails for most sftp servers.\nUse a relative directory, most servers interpret this as relative to the user's home directory")
|
||||
return nil, errors.New("sftp path starts with the tilde (~) character, that fails for most sftp servers.\nUse a relative directory, most servers interpret this as relative to the user's home directory")
|
||||
}
|
||||
|
||||
cfg := NewConfig()
|
||||
|
@ -89,5 +89,5 @@ func ParseConfig(s string) (Config, error) {
|
|||
cfg.Port = port
|
||||
cfg.Path = p
|
||||
|
||||
return cfg, nil
|
||||
return &cfg, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue