opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7408 from swordqiu/automated-cherry-pick-of-#7400-upstream-release-3.2

Browse Source 
Automated cherry pick of #7400: fix: ignore general s3 set acl not implemented error
This commit is contained in:
Zexi Li
2020-07-31 18:04:05 +08:00
committed by GitHub
parent f43af31195 5cfe521a23
commit fc7de4722b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/objectstore/object.go
+3 -2
View File
@@ -52,7 +52,7 @@ func (o *SObject) GetAcl() cloudprovider.TBucketACLType {
}
}
log.Errorf("o.bucket.client.GetObjectAcl error %s", err)
return acl
return cloudprovider.ACLPrivate
}
return acl
}
@@ -61,7 +61,8 @@ func (o *SObject) SetAcl(aclStr cloudprovider.TBucketACLType) error {
err := o.bucket.client.SetObjectAcl(o.bucket.Name, o.Key, aclStr)
if err != nil {
if strings.Contains(err.Error(), "not implemented") {
return cloudprovider.ErrNotImplemented
// ignore not implemented error
return nil // cloudprovider.ErrNotImplemented
} else {
return errors.Wrap(err, "o.bucket.client.SetObjectAcl")
}