Updates for force delete and prefix and delim bug

backend/s3mem/backend.go

@@ -165,6 +165,19 @@
 	return nil
 }
 
+func (db *Backend) ForceDeleteBucket(name string) error {
+	db.lock.Lock()
+	defer db.lock.Unlock()
+
+	if db.buckets[name] == nil {
+		return gofakes3.ErrNoSuchBucket
+	}
+
+	delete(db.buckets, name)
+
+	return nil
+}
+
 func (db *Backend) BucketExists(name string) (exists bool, err error) {
 	db.lock.RLock()
 	defer db.lock.RUnlock()

gofakes3.go

@@ -230,7 +230,7 @@
 
 	isVersion2 := q.Get("list-type") == "2"
 
-	g.log.Print(LogInfo, "bucketname:", bucketName, "prefix:", prefix, "page:", fmt.Sprintf("%+v", page))
+	g.log.Print(LogInfo, "bucketName:", bucketName, "prefix:", prefix, "page:", fmt.Sprintf("%+v", page))
 
 	objects, err := g.storage.ListBucket(bucketName, &prefix, page)
 	if err != nil {
@@ -400,6 +400,20 @@
 	if err := g.ensureBucketExists(bucket); err != nil {
 		return err
 	}
+
+	// Support for Minio's DeleteBucket with force-delete header.
+	forceDelete := r.Header.Get("x-minio-force-delete")
+	if forceDelete == "true" {
+		type forceDeleter interface {
+			ForceDeleteBucket(name string) error
+		}
+		if f, ok := g.storage.(forceDeleter); ok {
+			if err := f.ForceDeleteBucket(bucket); err != nil {
+				return err
+			}
+		}
+	}
+
 	if err := g.storage.DeleteBucket(bucket); err != nil {
 		return err
 	}
@@ -417,7 +431,10 @@
 		return err
 	}
 
-	w.Write([]byte{})
+	_, err := w.Write([]byte{})
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -463,7 +480,12 @@
 		g.log.Print(LogErr, "unexpected nil object for key", bucket, object)
 		return ErrInternal
 	}
-	defer obj.Contents.Close()
+	defer func(Contents io.ReadCloser) {
+		err := Contents.Close()
+		if err != nil {
+			g.log.Print(LogErr, "contents close", err.Error())
+		}
+	}(obj.Contents)
 
 	if err := g.writeGetOrHeadObjectResponse(obj, w, r); err != nil {
 		return err

log.go

@@ -5,9 +5,10 @@ import "log"
 type LogLevel string
 
 const (
-	LogErr  LogLevel = "ERR"
-	LogWarn LogLevel = "WARN"
-	LogInfo LogLevel = "INFO"
+	LogErr   LogLevel = "ERR"
+	LogWarn  LogLevel = "WARN"
+	LogInfo  LogLevel = "INFO"
+	LogDebug LogLevel = "DEBUG"
 )
 
 // Logger provides a very minimal target for logging implementations to hit to

prefix.go

@@ -21,6 +21,9 @@ func prefixFromQuery(query url.Values) Prefix {
 	}
 	_, prefix.HasPrefix = query["prefix"]
 	_, prefix.HasDelimiter = query["delimiter"]
+
+	prefix.HasPrefix = prefix.HasPrefix && prefix.Prefix != ""
+	prefix.HasDelimiter = prefix.HasDelimiter && prefix.Delimiter != ""
 	return prefix
 }