daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename s3accelerate parameter to accelerate 

Signed-off-by: Simone Locci <simonelocci88@gmail.com>
master
Simone Locci 2021-02-21 15:44:19 +01:00 committed by Simone Locci
parent ea27621d4a
commit 80952c9e2b
No known key found for this signature in database
GPG Key ID: EA8A965E9EA17D84
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/configuration.md
View File

@ -118,7 +118,7 @@ storage:
secretkey: awssecretkey secretkey: awssecretkey
region: us-west-1 region: us-west-1
regionendpoint: http://myobjects.local regionendpoint: http://myobjects.local
s3accelerate: false accelerate: false
bucket: bucketname bucket: bucketname
encrypt: true encrypt: true
keyid: mykeyid keyid: mykeyid
@ -423,7 +423,7 @@ storage:
secretkey: awssecretkey secretkey: awssecretkey
region: us-west-1 region: us-west-1
regionendpoint: http://myobjects.local regionendpoint: http://myobjects.local
s3accelerate: false accelerate: false
bucket: bucketname bucket: bucketname
encrypt: true encrypt: true
keyid: mykeyid keyid: mykeyid

22
registry/storage/driver/s3-aws/s3.go
View File

@ -104,7 +104,7 @@ type DriverParameters struct {
ObjectACL string ObjectACL string
SessionToken string SessionToken string
UseDualStack bool UseDualStack bool
S3Accelerate bool Accelerate bool
} }
func init() { func init() {
@ -378,21 +378,21 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
sessionToken := "" sessionToken := ""
s3accelerateBool := false accelerateBool := false
s3accelerate := parameters["s3accelerate"] accelerate := parameters["accelerate"]
switch s3accelerate := s3accelerate.(type) { switch accelerate := accelerate.(type) {
case string: case string:
b, err := strconv.ParseBool(s3accelerate) b, err := strconv.ParseBool(accelerate)
if err != nil { if err != nil {
return nil, fmt.Errorf("The s3accelerate parameter should be a boolean") return nil, fmt.Errorf("the accelerate parameter should be a boolean")
} }
s3accelerateBool = b accelerateBool = b
case bool: case bool:
s3accelerateBool = s3accelerate accelerateBool = accelerate
case nil: case nil:
// do nothing // do nothing
default: default:
return nil, fmt.Errorf("The s3accelerate parameter should be a boolean") return nil, fmt.Errorf("the accelerate parameter should be a boolean")
} }
params := DriverParameters{ params := DriverParameters{
@ -417,7 +417,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
objectACL, objectACL,
fmt.Sprint(sessionToken), fmt.Sprint(sessionToken),
useDualStackBool, useDualStackBool,
s3accelerateBool, accelerateBool,
} }
return New(params) return New(params)
@ -477,7 +477,7 @@ func New(params DriverParameters) (*Driver, error) {
awsConfig.WithEndpoint(params.RegionEndpoint) awsConfig.WithEndpoint(params.RegionEndpoint)
} }
awsConfig.WithS3UseAccelerate(params.S3Accelerate) awsConfig.WithS3UseAccelerate(params.Accelerate)
awsConfig.WithRegion(params.Region) awsConfig.WithRegion(params.Region)
awsConfig.WithDisableSSL(!params.Secure) awsConfig.WithDisableSSL(!params.Secure)
if params.UseDualStack { if params.UseDualStack {

10
registry/storage/driver/s3-aws/s3_test.go
View File

@ -44,7 +44,7 @@ func init() {
sessionToken := os.Getenv("AWS_SESSION_TOKEN") sessionToken := os.Getenv("AWS_SESSION_TOKEN")
useDualStack := os.Getenv("S3_USE_DUALSTACK") useDualStack := os.Getenv("S3_USE_DUALSTACK")
combineSmallPart := os.Getenv("MULTIPART_COMBINE_SMALL_PART") combineSmallPart := os.Getenv("MULTIPART_COMBINE_SMALL_PART")
s3accelerate := os.Getenv("S3_ACCELERATE") accelerate := os.Getenv("S3_ACCELERATE")
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -96,9 +96,9 @@ func init() {
} }
} }
s3accelerateBool := true accelerateBool := true
if s3accelerate != "" { if accelerate != "" {
s3accelerateBool, err = strconv.ParseBool(s3accelerate) accelerateBool, err = strconv.ParseBool(accelerate)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -126,7 +126,7 @@ func init() {
objectACL, objectACL,
sessionToken, sessionToken,
useDualStackBool, useDualStackBool,
s3accelerateBool, accelerateBool,
} }
return New(parameters) return New(parameters)