mirror of
https://github.com/minio/minio.git
synced 2025-11-10 05:59:43 -05:00
Now donut supports bucket ACL's, bringing in this support for dl.minio.io
This commit is contained in:
@@ -235,7 +235,7 @@ func testBucketMetadata(c *check.C, create func() Driver) {
|
||||
|
||||
metadata, err := drivers.GetBucketMetadata("string")
|
||||
c.Assert(err, check.IsNil)
|
||||
c.Assert(metadata.Name, check.Equals, "string")
|
||||
c.Assert(metadata.ACL, check.Equals, BucketACL("private"))
|
||||
}
|
||||
|
||||
func testBucketRecreateFails(c *check.C, create func() Driver) {
|
||||
|
||||
@@ -150,6 +150,9 @@ func (d donutDriver) CreateBucket(bucketName, acl string) error {
|
||||
return iodine.New(drivers.InvalidACL{ACL: acl}, nil)
|
||||
}
|
||||
if drivers.IsValidBucket(bucketName) && !strings.Contains(bucketName, ".") {
|
||||
if strings.TrimSpace(acl) == "" {
|
||||
acl = "private"
|
||||
}
|
||||
return d.donut.MakeBucket(bucketName, acl)
|
||||
}
|
||||
return iodine.New(drivers.BucketNameInvalid{Bucket: bucketName}, nil)
|
||||
@@ -173,7 +176,7 @@ func (d donutDriver) GetBucketMetadata(bucketName string) (drivers.BucketMetadat
|
||||
return drivers.BucketMetadata{}, iodine.New(drivers.BackendCorrupted{}, nil)
|
||||
}
|
||||
bucketMetadata := drivers.BucketMetadata{
|
||||
Name: metadata["name"],
|
||||
Name: bucketName,
|
||||
Created: created,
|
||||
ACL: drivers.BucketACL(acl),
|
||||
}
|
||||
|
||||
@@ -285,6 +285,10 @@ func (memory *memoryDriver) CreateBucket(bucketName, acl string) error {
|
||||
}
|
||||
memory.lock.RUnlock()
|
||||
|
||||
if strings.TrimSpace(acl) == "" {
|
||||
// default is private
|
||||
acl = "private"
|
||||
}
|
||||
var newBucket = storedBucket{}
|
||||
newBucket.metadata = drivers.BucketMetadata{}
|
||||
newBucket.metadata.Name = bucketName
|
||||
|
||||
Reference in New Issue
Block a user