opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #831 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0

Browse Source 
* commit '5e4f1e54c327adb8354203984f64b96945ed94a9':
  make fmt
This commit is contained in:
张东亮
2018-12-24 19:40:47 +08:00
parent f034ce6629 5e4f1e54c3
commit aec8cedbf2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aws/storagecache.go
+2 -2
View File
@@ -161,7 +161,7 @@ func (self *SStoragecache) uploadImage(userCred mcclient.TokenCredential, imageI
return "", err
}
defer s3client.DeleteBucket(&s3.DeleteBucketInput{Bucket: &bucketName}) // remove bucket
defer s3client.DeleteBucket(&s3.DeleteBucketInput{Bucket: &bucketName}) // remove bucket
var diskFormat string
s := auth.GetAdminSession(options.Options.Region, "")
@@ -196,7 +196,7 @@ func (self *SStoragecache) uploadImage(userCred mcclient.TokenCredential, imageI
if err != nil {
return "", err
}
defer s3client.DeleteObject(&s3.DeleteObjectInput{Bucket: &bucketName, Key: &imageId}) // remove object
defer s3client.DeleteObject(&s3.DeleteObjectInput{Bucket: &bucketName, Key: &imageId}) // remove object
} else {
meta, _, err := modules.Images.Download(s, imageId)
if err != nil {