alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Make driver work with read only creds and remove multi cleanup on boot

Browse source
This commit is contained in:
Andrey Kostov 2014-12-21 08:48:42 +02:00
parent 1ffb5db12b
commit fee9e9ed6e
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
storagedriver/s3/s3.go
View file

@ -99,27 +99,24 @@ func New(accessKey, secretKey, bucketName, rootDirectory string, region aws.Regi
s3obj := s3.New(auth, region) s3obj := s3.New(auth, region)
bucket := s3obj.Bucket(bucketName) bucket := s3obj.Bucket(bucketName)
if err := bucket.PutBucket(getPermissions()); err != nil { if _, err := bucket.List("", "", "", 1); err != nil {
s3Err, ok := err.(*s3.Error)
if !(ok && s3Err.Code == "BucketAlreadyOwnedByYou") {
return nil, err
}
}
// TODO What if they use this bucket for other things? I can't just clean out the multis
// TODO Add timestamp checking
multis, _, err := bucket.ListMulti("", "")
if err != nil {
return nil, err return nil, err
} }
for _, multi := range multis { // TODO Currently multipart uploads have no timestamps, so this would be unwise
err := multi.Abort() // if you initiated a new s3driver while another one is running on the same bucket.
//TODO appropriate to do this error checking? // multis, _, err := bucket.ListMulti("", "")
if err != nil { // if err != nil {
return nil, err // return nil, err
} // }
}
// for _, multi := range multis {
// err := multi.Abort()
// //TODO appropriate to do this error checking?
// if err != nil {
// return nil, err
// }
// }
return &Driver{s3obj, bucket, encrypt, rootDirectory}, nil return &Driver{s3obj, bucket, encrypt, rootDirectory}, nil
} }