diff --git a/drivers/s3/driver.go b/drivers/s3/driver.go index 7b005c06..ea103577 100644 --- a/drivers/s3/driver.go +++ b/drivers/s3/driver.go @@ -77,7 +77,7 @@ func (driver S3) Items() []base.Item { { Name: "zone", Label: "placeholder filename", - Type: base.TypeNumber, + Type: base.TypeString, Description: "default empty string", }, } @@ -142,7 +142,7 @@ func (driver S3) Files(path string, account *model.Account) ([]model.File, error } func (driver S3) Link(args base.Args, account *model.Account) (*base.Link, error) { - client, err := driver.GetClient(account) + client, err := driver.GetClient(account, true) if err != nil { return nil, err } @@ -215,7 +215,7 @@ func (driver S3) Rename(src string, dst string, account *model.Account) error { } func (driver S3) Copy(src string, dst string, account *model.Account) error { - client, err := driver.GetClient(account) + client, err := driver.GetClient(account, false) if err != nil { return err } @@ -235,7 +235,7 @@ func (driver S3) Copy(src string, dst string, account *model.Account) error { } func (driver S3) Delete(path string, account *model.Account) error { - client, err := driver.GetClient(account) + client, err := driver.GetClient(account, false) if err != nil { return err } diff --git a/drivers/s3/s3.go b/drivers/s3/s3.go index d0989d6b..883ed3fb 100644 --- a/drivers/s3/s3.go +++ b/drivers/s3/s3.go @@ -29,13 +29,13 @@ func (driver S3) NewSession(account *model.Account) (*session.Session, error) { return session.NewSession(cfg) } -func (driver S3) GetClient(account *model.Account) (*s3.S3, error) { +func (driver S3) GetClient(account *model.Account, link bool) (*s3.S3, error) { s, ok := sessionsMap[account.Name] if !ok { return nil, fmt.Errorf("can't find [%s] session", account.Name) } client := s3.New(s) - if account.CustomHost != "" { + if link && account.CustomHost != "" { cURL, err := url.Parse(account.CustomHost) if err != nil { return nil, err @@ -54,7 +54,7 @@ func (driver S3) GetClient(account *model.Account) (*s3.S3, error) { func (driver S3) List(prefix string, account *model.Account) ([]model.File, error) { prefix = driver.GetKey(prefix, account, true) log.Debugf("list: %s", prefix) - client, err := driver.GetClient(account) + client, err := driver.GetClient(account, false) if err != nil { return nil, err }