vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add the v4auth parameter

Browse source 
v4auth will default to true and if the frankfurt (eu-central-1) region
is selected with v4auth set to false explicitly, the driver will error
out upon initialization.
This commit is contained in:
Andrey Kostov 2015-01-07 11:45:31 +02:00
parent 031c388543
commit a0ef0d6aad
3 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
storagedriver/s3/s3_test.go
View file

@ -22,6 +22,7 @@ func init() {
bucket := os.Getenv("S3_BUCKET")
encrypt := os.Getenv("S3_ENCRYPT")
secure := os.Getenv("S3_SECURE")
v4auth := os.Getenv("S3_USE_V4_AUTH")
region := os.Getenv("AWS_REGION")
root, err := ioutil.TempDir("", "driver-")
if err != nil {
@ -29,9 +30,12 @@ func init() {
}
s3DriverConstructor := func(region aws.Region) (storagedriver.StorageDriver, error) {
encryptBool, err := strconv.ParseBool(encrypt)
if err != nil {
return nil, err
encryptBool := true
if encrypt != "" {
encryptBool, err = strconv.ParseBool(encrypt)
if err != nil {
return nil, err
}
}
secureBool := true
@ -41,7 +45,15 @@ func init() {
return nil, err
}
}
return New(accessKey, secretKey, bucket, root, region, encryptBool, secureBool)
v4AuthBool := true
if v4auth != "" {
v4AuthBool, err = strconv.ParseBool(v4auth)
if err != nil {
return nil, err
}
}
return New(accessKey, secretKey, bucket, root, region, encryptBool, secureBool, v4AuthBool)
}
// Skip S3 storage driver tests if environment variable parameters are not provided