extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-12-24 16:09:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

s3: Fix after upstream API changes in aws-sdk-go/aws - fixes #114

Browse Source
This commit is contained in:
Nick Craig-Wood 2015-08-28 08:47:41 +01:00
parent fabbc035c4
commit d298b578ab
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
s3/s3.go
View File

@ -24,8 +24,9 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/corehandlers"
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/service" "github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/ncw/rclone/fs" "github.com/ncw/rclone/fs"
@ -212,7 +213,7 @@ func s3Connection(name string) (*s3.S3, error) {
c := s3.New(awsConfig) c := s3.New(awsConfig)
if region == "other-v2-signature" { if region == "other-v2-signature" {
fs.Debug(name, "Using v2 auth") fs.Debug(name, "Using v2 auth")
signer := func(req *service.Request) { signer := func(req *request.Request) {
// Ignore AnonymousCredentials object // Ignore AnonymousCredentials object
if req.Service.Config.Credentials == credentials.AnonymousCredentials { if req.Service.Config.Credentials == credentials.AnonymousCredentials {
return return
@ -220,11 +221,11 @@ func s3Connection(name string) (*s3.S3, error) {
sign(accessKeyId, secretAccessKey, req.HTTPRequest) sign(accessKeyId, secretAccessKey, req.HTTPRequest)
} }
c.Handlers.Sign.Clear() c.Handlers.Sign.Clear()
c.Handlers.Sign.PushBack(service.BuildContentLength) c.Handlers.Sign.PushBackNamed(corehandlers.BuildContentLengthHandler)
c.Handlers.Sign.PushBack(signer) c.Handlers.Sign.PushBack(signer)
} }
// Add user agent // Add user agent
c.Handlers.Build.PushBack(func(r *service.Request) { c.Handlers.Build.PushBack(func(r *request.Request) {
r.HTTPRequest.Header.Set("User-Agent", fs.UserAgent) r.HTTPRequest.Header.Set("User-Agent", fs.UserAgent)
}) })
return c, nil return c, nil