infrastructure/k8s-csi-s3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix s3backer with AWS

Browse source 
If we set baseURL with AWS s3backer will fail to authenticate.
This commit is contained in:
Cyrill Troxler 2019-01-19 14:43:54 +01:00
parent 709162c21b
commit 728ef7d7e7
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/s3/mounter_s3backer.go
View file

@ -18,6 +18,7 @@ type s3backerMounter struct {
region string region string
accessKeyID string accessKeyID string
secretAccessKey string secretAccessKey string
ssl bool
} }
const ( const (
@ -47,6 +48,7 @@ func newS3backerMounter(bucket *bucket, cfg *Config) (Mounter, error) {
region: cfg.Region, region: cfg.Region,
accessKeyID: cfg.AccessKeyID, accessKeyID: cfg.AccessKeyID,
secretAccessKey: cfg.SecretAccessKey, secretAccessKey: cfg.SecretAccessKey,
ssl: url.Scheme == "https",
} }
return s3backer, s3backer.writePasswd() return s3backer, s3backer.writePasswd()
@ -98,8 +100,6 @@ func (s3backer *s3backerMounter) Unmount(targetPath string) error {
func (s3backer *s3backerMounter) mountInit(path string) error { func (s3backer *s3backerMounter) mountInit(path string) error {
args := []string{ args := []string{
// baseURL must end with /
fmt.Sprintf("--baseURL=%s/", s3backer.url),
fmt.Sprintf("--blockSize=%s", s3backerBlockSize), fmt.Sprintf("--blockSize=%s", s3backerBlockSize),
fmt.Sprintf("--size=%v", s3backer.bucket.CapacityBytes), fmt.Sprintf("--size=%v", s3backer.bucket.CapacityBytes),
fmt.Sprintf("--prefix=%s/", s3backer.bucket.FSPath), fmt.Sprintf("--prefix=%s/", s3backer.bucket.FSPath),
@ -109,6 +109,13 @@ func (s3backer *s3backerMounter) mountInit(path string) error {
} }
if s3backer.region != "" { if s3backer.region != "" {
args = append(args, fmt.Sprintf("--region=%s", s3backer.region)) args = append(args, fmt.Sprintf("--region=%s", s3backer.region))
} else {
// only set baseURL if not on AWS (region is not set)
// baseURL must end with /
args = append(args, fmt.Sprintf("--baseURL=%s/", s3backer.url))
}
if s3backer.ssl {
args = append(args, "--ssl")
} }
return fuseMount(path, s3backerCmd, args) return fuseMount(path, s3backerCmd, args)