astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-08-11 00:33:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

handlers: Remove 'notification.xml' when bucket is deleted. (#2389)

Browse Source 
Do not pass around objectHandlers object, input argument
should comply to a type for only that would be used inside
the function body.
This commit is contained in:
Harshavardhana
2016-08-09 11:33:45 -07:00
committed by GitHub
parent e0cf4ee9fc
commit 82cd38e959
6 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bucket-policy.go
+7 -7
View File
@@ -31,14 +31,14 @@ func getOldBucketsConfigPath() (string, error) {
}
// readBucketPolicy - read bucket policy.
func readBucketPolicy(api objectAPIHandlers, bucket string) ([]byte, error) {
func readBucketPolicy(bucket string, objAPI ObjectLayer) ([]byte, error) {
// Verify bucket is valid.
if !IsValidBucketName(bucket) {
return nil, BucketNameInvalid{Bucket: bucket}
}
policyPath := pathJoin(bucketConfigPrefix, bucket, policyJSON)
objInfo, err := api.ObjectAPI.GetObjectInfo(minioMetaBucket, policyPath)
objInfo, err := objAPI.GetObjectInfo(minioMetaBucket, policyPath)
if err != nil {
if _, ok := err.(ObjectNotFound); ok {
return nil, BucketPolicyNotFound{Bucket: bucket}
@@ -46,7 +46,7 @@ func readBucketPolicy(api objectAPIHandlers, bucket string) ([]byte, error) {
return nil, err
}
var buffer bytes.Buffer
err = api.ObjectAPI.GetObject(minioMetaBucket, policyPath, 0, objInfo.Size, &buffer)
err = objAPI.GetObject(minioMetaBucket, policyPath, 0, objInfo.Size, &buffer)
if err != nil {
if _, ok := err.(ObjectNotFound); ok {
return nil, BucketPolicyNotFound{Bucket: bucket}
@@ -57,14 +57,14 @@ func readBucketPolicy(api objectAPIHandlers, bucket string) ([]byte, error) {
}
// removeBucketPolicy - remove bucket policy.
func removeBucketPolicy(api objectAPIHandlers, bucket string) error {
func removeBucketPolicy(bucket string, objAPI ObjectLayer) error {
// Verify bucket is valid.
if !IsValidBucketName(bucket) {
return BucketNameInvalid{Bucket: bucket}
}
policyPath := pathJoin(bucketConfigPrefix, bucket, policyJSON)
if err := api.ObjectAPI.DeleteObject(minioMetaBucket, policyPath); err != nil {
if err := objAPI.DeleteObject(minioMetaBucket, policyPath); err != nil {
if _, ok := err.(ObjectNotFound); ok {
return BucketPolicyNotFound{Bucket: bucket}
}
@@ -74,13 +74,13 @@ func removeBucketPolicy(api objectAPIHandlers, bucket string) error {
}
// writeBucketPolicy - save bucket policy.
func writeBucketPolicy(api objectAPIHandlers, bucket string, accessPolicyBytes []byte) error {
func writeBucketPolicy(bucket string, objAPI ObjectLayer, accessPolicyBytes []byte) error {
// Verify if bucket path legal
if !IsValidBucketName(bucket) {
return BucketNameInvalid{Bucket: bucket}
}
policyPath := pathJoin(bucketConfigPrefix, bucket, policyJSON)
_, err := api.ObjectAPI.PutObject(minioMetaBucket, policyPath, int64(len(accessPolicyBytes)), bytes.NewReader(accessPolicyBytes), nil)
_, err := objAPI.PutObject(minioMetaBucket, policyPath, int64(len(accessPolicyBytes)), bytes.NewReader(accessPolicyBytes), nil)
return err
}