Code restructuring, assigning proper subsystems to each

- Drivers contain
    * donut/*
    * file/*
    * memory/*

 - Storage format contains
    * donut/*
      - GetObject() --> renamed to GetObjectReader()
      - Deleted stale objectwriter.go, renamed donutwriter.go to object_writer.go

Simplifying, and documenting codebase further

pkg/api/api_bucket_handlers.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 	"github.com/minio-io/minio/pkg/utils/log"
 )
 
@@ -45,21 +45,21 @@ func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 	}
 
 	acceptsContentType := getContentType(req)
-	objects, resources, err := server.storage.ListObjects(bucket, resources)
+	objects, resources, err := server.driver.ListObjects(bucket, resources)
 	switch err := err.(type) {
 	case nil: // success
 		{
 			response := generateObjectsListResult(bucket, objects, resources)
 			w.Write(writeObjectHeadersAndResponse(w, response, acceptsContentType))
 		}
-	case mstorage.BucketNotFound:
+	case drivers.BucketNotFound:
 		{
 			error := errorCodeError(NoSuchBucket)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			// Embed error log on server side
 			log.Errorln(err)
@@ -68,14 +68,14 @@ func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketNameInvalid:
+	case drivers.BucketNameInvalid:
 		{
 			error := errorCodeError(InvalidBucketName)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ObjectNameInvalid:
+	case drivers.ObjectNameInvalid:
 		{
 			error := errorCodeError(NoSuchKey)
 			errorResponse := getErrorResponse(error, resources.Prefix)
@@ -91,14 +91,14 @@ func (server *minioAPI) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 // owned by the authenticated sender of the request.
 func (server *minioAPI) listBucketsHandler(w http.ResponseWriter, req *http.Request) {
 	acceptsContentType := getContentType(req)
-	buckets, err := server.storage.ListBuckets()
+	buckets, err := server.driver.ListBuckets()
 	switch err := err.(type) {
 	case nil:
 		{
 			response := generateBucketsListResult(buckets)
 			w.Write(writeObjectHeadersAndResponse(w, response, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			log.Errorln(err)
 			error := errorCodeError(InternalError)
@@ -106,7 +106,7 @@ func (server *minioAPI) listBucketsHandler(w http.ResponseWriter, req *http.Requ
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BackendCorrupted:
+	case drivers.BackendCorrupted:
 		{
 			log.Errorln(err)
 			error := errorCodeError(InternalError)
@@ -123,7 +123,7 @@ func (server *minioAPI) listBucketsHandler(w http.ResponseWriter, req *http.Requ
 func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Request) {
 	vars := mux.Vars(req)
 	bucket := vars["bucket"]
-	err := server.storage.CreateBucket(bucket)
+	err := server.driver.CreateBucket(bucket)
 
 	resources := getBucketResources(req.URL.Query())
 	if resources.Policy == true {
@@ -138,21 +138,21 @@ func (server *minioAPI) putBucketHandler(w http.ResponseWriter, req *http.Reques
 			w.Header().Set("Server", "Minio")
 			w.Header().Set("Connection", "close")
 		}
-	case mstorage.BucketNameInvalid:
+	case drivers.BucketNameInvalid:
 		{
 			error := errorCodeError(InvalidBucketName)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketExists:
+	case drivers.BucketExists:
 		{
 			error := errorCodeError(BucketAlreadyExists)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			// Embed errors log on server side
 			log.Errorln(err)

pkg/api/api_object_handlers.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 	"github.com/minio-io/minio/pkg/utils/log"
 )
 
@@ -35,7 +35,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
 	bucket = vars["bucket"]
 	object = vars["object"]
 
-	metadata, err := server.storage.GetObjectMetadata(bucket, object, "")
+	metadata, err := server.driver.GetObjectMetadata(bucket, object, "")
 	switch err := err.(type) {
 	case nil: // success
 		{
@@ -52,7 +52,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
 			switch httpRange.start == 0 && httpRange.length == 0 {
 			case true:
 				writeObjectHeaders(w, metadata)
-				if _, err := server.storage.GetObject(w, bucket, object); err != nil {
+				if _, err := server.driver.GetObject(w, bucket, object); err != nil {
 					log.Errorln(err)
 					error := errorCodeError(InternalError)
 					errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
@@ -64,7 +64,7 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
 				metadata.Size = httpRange.length
 				writeRangeObjectHeaders(w, metadata, httpRange.getContentRange())
 				w.WriteHeader(http.StatusPartialContent)
-				_, err := server.storage.GetPartialObject(w, bucket, object, httpRange.start, httpRange.length)
+				_, err := server.driver.GetPartialObject(w, bucket, object, httpRange.start, httpRange.length)
 				if err != nil {
 					log.Errorln(err)
 					error := errorCodeError(InternalError)
@@ -76,28 +76,28 @@ func (server *minioAPI) getObjectHandler(w http.ResponseWriter, req *http.Reques
 
 			}
 		}
-	case mstorage.ObjectNotFound:
+	case drivers.ObjectNotFound:
 		{
 			error := errorCodeError(NoSuchKey)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ObjectNameInvalid:
+	case drivers.ObjectNameInvalid:
 		{
 			error := errorCodeError(NoSuchKey)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketNameInvalid:
+	case drivers.BucketNameInvalid:
 		{
 			error := errorCodeError(InvalidBucketName)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			// Embed errors log on serve side
 			log.Errorln(err)
@@ -119,25 +119,25 @@ func (server *minioAPI) headObjectHandler(w http.ResponseWriter, req *http.Reque
 	bucket = vars["bucket"]
 	object = vars["object"]
 
-	metadata, err := server.storage.GetObjectMetadata(bucket, object, "")
+	metadata, err := server.driver.GetObjectMetadata(bucket, object, "")
 	switch err := err.(type) {
 	case nil:
 		writeObjectHeaders(w, metadata)
-	case mstorage.ObjectNotFound:
+	case drivers.ObjectNotFound:
 		{
 			error := errorCodeError(NoSuchKey)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ObjectNameInvalid:
+	case drivers.ObjectNameInvalid:
 		{
 			error := errorCodeError(NoSuchKey)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			// Embed error log on server side
 			log.Errorln(err)
@@ -167,12 +167,12 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
 
 	// get Content-MD5 sent by client
 	md5 := req.Header.Get("Content-MD5")
-	err := server.storage.CreateObject(bucket, object, "", md5, req.Body)
+	err := server.driver.CreateObject(bucket, object, "", md5, req.Body)
 	switch err := err.(type) {
 	case nil:
 		w.Header().Set("Server", "Minio")
 		w.Header().Set("Connection", "close")
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			// Embed error log on server side
 			log.Errorln(err)
@@ -181,35 +181,35 @@ func (server *minioAPI) putObjectHandler(w http.ResponseWriter, req *http.Reques
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketNotFound:
+	case drivers.BucketNotFound:
 		{
 			error := errorCodeError(NoSuchBucket)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketNameInvalid:
+	case drivers.BucketNameInvalid:
 		{
 			error := errorCodeError(InvalidBucketName)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ObjectExists:
+	case drivers.ObjectExists:
 		{
 			error := errorCodeError(NotImplemented)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BadDigest:
+	case drivers.BadDigest:
 		{
 			error := errorCodeError(BadDigest)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.InvalidDigest:
+	case drivers.InvalidDigest:
 		{
 			error := errorCodeError(InvalidDigest)
 			errorResponse := getErrorResponse(error, "/"+bucket+"/"+object)

pkg/api/api_policy_handlers.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 	"github.com/minio-io/minio/pkg/utils/log"
 )
 
@@ -34,7 +34,7 @@ func (server *minioAPI) putBucketPolicyHandler(w http.ResponseWriter, req *http.
 	bucket := vars["bucket"]
 	acceptsContentType := getContentType(req)
 
-	policy, ok := mstorage.Parsepolicy(req.Body)
+	policy, ok := drivers.Parsepolicy(req.Body)
 	if ok == false {
 		error := errorCodeError(InvalidPolicyDocument)
 		errorResponse := getErrorResponse(error, bucket)
@@ -43,7 +43,7 @@ func (server *minioAPI) putBucketPolicyHandler(w http.ResponseWriter, req *http.
 		return
 	}
 
-	err := server.storage.CreateBucketPolicy(bucket, policy)
+	err := server.driver.CreateBucketPolicy(bucket, policy)
 	switch err := err.(type) {
 	case nil:
 		{
@@ -51,21 +51,21 @@ func (server *minioAPI) putBucketPolicyHandler(w http.ResponseWriter, req *http.
 			writeCommonHeaders(w, getContentString(acceptsContentType))
 			w.Header().Set("Connection", "keep-alive")
 		}
-	case mstorage.BucketNameInvalid:
+	case drivers.BucketNameInvalid:
 		{
 			error := errorCodeError(InvalidBucketName)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketNotFound:
+	case drivers.BucketNotFound:
 		{
 			error := errorCodeError(NoSuchBucket)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BackendCorrupted:
+	case drivers.BackendCorrupted:
 		{
 			log.Errorln(err)
 			error := errorCodeError(InternalError)
@@ -73,7 +73,7 @@ func (server *minioAPI) putBucketPolicyHandler(w http.ResponseWriter, req *http.
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			log.Errorln(err)
 			error := errorCodeError(InternalError)
@@ -93,7 +93,7 @@ func (server *minioAPI) getBucketPolicyHandler(w http.ResponseWriter, req *http.
 	bucket := vars["bucket"]
 	acceptsContentType := getContentType(req)
 
-	p, err := server.storage.GetBucketPolicy(bucket)
+	p, err := server.driver.GetBucketPolicy(bucket)
 	switch err := err.(type) {
 	case nil:
 		{
@@ -108,28 +108,28 @@ func (server *minioAPI) getBucketPolicyHandler(w http.ResponseWriter, req *http.
 			w.Header().Set("Connection", "keep-alive")
 			w.Write(responsePolicy)
 		}
-	case mstorage.BucketNameInvalid:
+	case drivers.BucketNameInvalid:
 		{
 			error := errorCodeError(InvalidBucketName)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketNotFound:
+	case drivers.BucketNotFound:
 		{
 			error := errorCodeError(NoSuchBucket)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BucketPolicyNotFound:
+	case drivers.BucketPolicyNotFound:
 		{
 			error := errorCodeError(NoSuchBucketPolicy)
 			errorResponse := getErrorResponse(error, bucket)
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.BackendCorrupted:
+	case drivers.BackendCorrupted:
 		{
 			log.Errorln(err)
 			error := errorCodeError(InternalError)
@@ -137,7 +137,7 @@ func (server *minioAPI) getBucketPolicyHandler(w http.ResponseWriter, req *http.
 			w.WriteHeader(error.HTTPStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
-	case mstorage.ImplementationError:
+	case drivers.ImplementationError:
 		{
 			log.Errorln(err)
 			error := errorCodeError(InternalError)

pkg/api/api_response.go

@@ -19,7 +19,7 @@ package api
 import (
 	"sort"
 
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 )
 
 // Reply date format
@@ -33,7 +33,7 @@ const (
 //
 // output:
 // populated struct that can be serialized to match xml and json api spec output
-func generateBucketsListResult(buckets []mstorage.BucketMetadata) BucketListResponse {
+func generateBucketsListResult(buckets []drivers.BucketMetadata) BucketListResponse {
 	var listbuckets []*Bucket
 	var data = BucketListResponse{}
 	var owner = Owner{}
@@ -73,7 +73,7 @@ func (b itemKey) Less(i, j int) bool { return b[i].Key < b[j].Key }
 //
 // output:
 // populated struct that can be serialized to match xml and json api spec output
-func generateObjectsListResult(bucket string, objects []mstorage.ObjectMetadata, bucketResources mstorage.BucketResourcesMetadata) ObjectListResponse {
+func generateObjectsListResult(bucket string, objects []drivers.ObjectMetadata, bucketResources drivers.BucketResourcesMetadata) ObjectListResponse {
 	var contents []*Item
 	var prefixes []*Prefix
 	var owner = Owner{}

pkg/api/api_router.go

@@ -22,13 +22,13 @@ import (
 
 	router "github.com/gorilla/mux"
 	"github.com/minio-io/minio/pkg/api/config"
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 )
 
 // private use
 type minioAPI struct {
-	domain  string
-	storage mstorage.Storage
+	domain string
+	driver drivers.Driver
 }
 
 // Path based routing
@@ -72,10 +72,10 @@ func getMux(api minioAPI, mux *router.Router) *router.Router {
 }
 
 // HTTPHandler - http wrapper handler
-func HTTPHandler(domain string, storage mstorage.Storage) http.Handler {
+func HTTPHandler(domain string, driver drivers.Driver) http.Handler {
 	var mux *router.Router
 	var api = minioAPI{}
-	api.storage = storage
+	api.driver = driver
 	api.domain = domain
 
 	r := router.NewRouter()

pkg/api/api_test.go

@@ -29,8 +29,8 @@ import (
 	"time"
 
 	"github.com/minio-io/minio/pkg/api"
-	mstorage "github.com/minio-io/minio/pkg/storage"
-	"github.com/minio-io/minio/pkg/storage/memory"
+	"github.com/minio-io/minio/pkg/drivers"
+	"github.com/minio-io/minio/pkg/drivers/memory"
 
 	. "gopkg.in/check.v1"
 )
@@ -42,8 +42,8 @@ type MySuite struct{}
 var _ = Suite(&MySuite{})
 
 func (s *MySuite) TestNonExistantObject(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
@@ -54,14 +54,14 @@ func (s *MySuite) TestNonExistantObject(c *C) {
 }
 
 func (s *MySuite) TestEmptyObject(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
 	buffer := bytes.NewBufferString("")
-	storage.CreateBucket("bucket")
-	storage.CreateObject("bucket", "object", "", "", buffer)
+	driver.CreateBucket("bucket")
+	driver.CreateObject("bucket", "object", "", "", buffer)
 
 	response, err := http.Get(testServer.URL + "/bucket/object")
 	c.Assert(err, IsNil)
@@ -71,7 +71,7 @@ func (s *MySuite) TestEmptyObject(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(true, Equals, bytes.Equal(responseBody, buffer.Bytes()))
 
-	metadata, err := storage.GetObjectMetadata("bucket", "object", "")
+	metadata, err := driver.GetObjectMetadata("bucket", "object", "")
 	c.Assert(err, IsNil)
 	verifyHeaders(c, response.Header, metadata.Created, 0, "application/octet-stream", metadata.Md5)
 
@@ -79,14 +79,14 @@ func (s *MySuite) TestEmptyObject(c *C) {
 }
 
 func (s *MySuite) TestObject(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
 	buffer := bytes.NewBufferString("hello world")
-	storage.CreateBucket("bucket")
-	storage.CreateObject("bucket", "object", "", "", buffer)
+	driver.CreateBucket("bucket")
+	driver.CreateObject("bucket", "object", "", "", buffer)
 
 	response, err := http.Get(testServer.URL + "/bucket/object")
 	c.Assert(err, IsNil)
@@ -96,14 +96,14 @@ func (s *MySuite) TestObject(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(true, Equals, bytes.Equal(responseBody, []byte("hello world")))
 
-	metadata, err := storage.GetObjectMetadata("bucket", "object", "")
+	metadata, err := driver.GetObjectMetadata("bucket", "object", "")
 	c.Assert(err, IsNil)
 	verifyHeaders(c, response.Header, metadata.Created, len("hello world"), "application/octet-stream", metadata.Md5)
 }
 
 func (s *MySuite) TestMultipleObjects(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
@@ -111,10 +111,10 @@ func (s *MySuite) TestMultipleObjects(c *C) {
 	buffer2 := bytes.NewBufferString("hello two")
 	buffer3 := bytes.NewBufferString("hello three")
 
-	storage.CreateBucket("bucket")
-	storage.CreateObject("bucket", "object1", "", "", buffer1)
-	storage.CreateObject("bucket", "object2", "", "", buffer2)
-	storage.CreateObject("bucket", "object3", "", "", buffer3)
+	driver.CreateBucket("bucket")
+	driver.CreateObject("bucket", "object1", "", "", buffer1)
+	driver.CreateObject("bucket", "object2", "", "", buffer2)
+	driver.CreateObject("bucket", "object3", "", "", buffer3)
 
 	// test non-existant object
 	response, err := http.Get(testServer.URL + "/bucket/object")
@@ -129,7 +129,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
 	c.Assert(err, IsNil)
 
 	// get metadata
-	metadata, err := storage.GetObjectMetadata("bucket", "object1", "")
+	metadata, err := driver.GetObjectMetadata("bucket", "object1", "")
 	c.Assert(err, IsNil)
 	c.Assert(response.StatusCode, Equals, http.StatusOK)
 
@@ -148,7 +148,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
 	c.Assert(err, IsNil)
 
 	// get metadata
-	metadata, err = storage.GetObjectMetadata("bucket", "object2", "")
+	metadata, err = driver.GetObjectMetadata("bucket", "object2", "")
 	c.Assert(err, IsNil)
 	c.Assert(response.StatusCode, Equals, http.StatusOK)
 
@@ -167,7 +167,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
 	c.Assert(err, IsNil)
 
 	// get metadata
-	metadata, err = storage.GetObjectMetadata("bucket", "object3", "")
+	metadata, err = driver.GetObjectMetadata("bucket", "object3", "")
 	c.Assert(err, IsNil)
 	c.Assert(response.StatusCode, Equals, http.StatusOK)
 
@@ -182,8 +182,8 @@ func (s *MySuite) TestMultipleObjects(c *C) {
 }
 
 func (s *MySuite) TestNotImplemented(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
@@ -193,8 +193,8 @@ func (s *MySuite) TestNotImplemented(c *C) {
 }
 
 func (s *MySuite) TestHeader(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
@@ -203,25 +203,25 @@ func (s *MySuite) TestHeader(c *C) {
 	c.Assert(response.StatusCode, Equals, http.StatusNotFound)
 
 	buffer := bytes.NewBufferString("hello world")
-	storage.CreateBucket("bucket")
-	storage.CreateObject("bucket", "object", "", "", buffer)
+	driver.CreateBucket("bucket")
+	driver.CreateObject("bucket", "object", "", "", buffer)
 
 	response, err = http.Get(testServer.URL + "/bucket/object")
 	c.Assert(err, IsNil)
 	c.Assert(response.StatusCode, Equals, http.StatusOK)
 
-	metadata, err := storage.GetObjectMetadata("bucket", "object", "")
+	metadata, err := driver.GetObjectMetadata("bucket", "object", "")
 	c.Assert(err, IsNil)
 	verifyHeaders(c, response.Header, metadata.Created, len("hello world"), "application/octet-stream", metadata.Md5)
 }
 
 func (s *MySuite) TestPutBucket(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
-	buckets, err := storage.ListBuckets()
+	buckets, err := driver.ListBuckets()
 	c.Assert(len(buckets), Equals, 0)
 	c.Assert(err, IsNil)
 
@@ -234,23 +234,23 @@ func (s *MySuite) TestPutBucket(c *C) {
 	c.Assert(response.StatusCode, Equals, http.StatusOK)
 
 	// check bucket exists
-	buckets, err = storage.ListBuckets()
+	buckets, err = driver.ListBuckets()
 	c.Assert(len(buckets), Equals, 1)
 	c.Assert(err, IsNil)
 	c.Assert(buckets[0].Name, Equals, "bucket")
 }
 
 func (s *MySuite) TestPutObject(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
-	resources := mstorage.BucketResourcesMetadata{}
+	resources := drivers.BucketResourcesMetadata{}
 
 	resources.Maxkeys = 1000
 	resources.Prefix = ""
-	objects, resources, err := storage.ListObjects("bucket", resources)
+	objects, resources, err := driver.ListObjects("bucket", resources)
 	c.Assert(len(objects), Equals, 0)
 	c.Assert(resources.IsTruncated, Equals, false)
 	c.Assert(err, Not(IsNil))
@@ -278,18 +278,18 @@ func (s *MySuite) TestPutObject(c *C) {
 	resources.Maxkeys = 1000
 	resources.Prefix = ""
 
-	objects, resources, err = storage.ListObjects("bucket", resources)
+	objects, resources, err = driver.ListObjects("bucket", resources)
 	c.Assert(len(objects), Equals, 1)
 	c.Assert(resources.IsTruncated, Equals, false)
 	c.Assert(err, IsNil)
 
 	var writer bytes.Buffer
 
-	storage.GetObject(&writer, "bucket", "two")
+	driver.GetObject(&writer, "bucket", "two")
 
 	c.Assert(bytes.Equal(writer.Bytes(), []byte("hello world")), Equals, true)
 
-	metadata, err := storage.GetObjectMetadata("bucket", "two", "")
+	metadata, err := driver.GetObjectMetadata("bucket", "two", "")
 	c.Assert(err, IsNil)
 	lastModified := metadata.Created
 
@@ -298,8 +298,8 @@ func (s *MySuite) TestPutObject(c *C) {
 }
 
 func (s *MySuite) TestListBuckets(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
@@ -312,7 +312,7 @@ func (s *MySuite) TestListBuckets(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(len(listResponse.Buckets.Bucket), Equals, 0)
 
-	storage.CreateBucket("foo")
+	driver.CreateBucket("foo")
 
 	response, err = http.Get(testServer.URL + "/")
 	defer response.Body.Close()
@@ -324,7 +324,7 @@ func (s *MySuite) TestListBuckets(c *C) {
 	c.Assert(len(listResponse.Buckets.Bucket), Equals, 1)
 	c.Assert(listResponse.Buckets.Bucket[0].Name, Equals, "foo")
 
-	storage.CreateBucket("bar")
+	driver.CreateBucket("bar")
 
 	response, err = http.Get(testServer.URL + "/")
 	defer response.Body.Close()
@@ -377,12 +377,12 @@ func verifyHeaders(c *C, header http.Header, date time.Time, size int, contentTy
 }
 
 func (s *MySuite) TestXMLNameNotInBucketListJson(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
-	err := storage.CreateBucket("foo")
+	err := driver.CreateBucket("foo")
 	c.Assert(err, IsNil)
 
 	request, err := http.NewRequest("GET", testServer.URL+"/", bytes.NewBufferString(""))
@@ -402,12 +402,12 @@ func (s *MySuite) TestXMLNameNotInBucketListJson(c *C) {
 }
 
 func (s *MySuite) TestXMLNameNotInObjectListJson(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
-	err := storage.CreateBucket("foo")
+	err := driver.CreateBucket("foo")
 	c.Assert(err, IsNil)
 
 	request, err := http.NewRequest("GET", testServer.URL+"/foo", bytes.NewBufferString(""))
@@ -427,12 +427,12 @@ func (s *MySuite) TestXMLNameNotInObjectListJson(c *C) {
 }
 
 func (s *MySuite) TestContentTypePersists(c *C) {
-	_, _, storage := memory.Start()
-	httpHandler := api.HTTPHandler("", storage)
+	_, _, driver := memory.Start()
+	httpHandler := api.HTTPHandler("", driver)
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
-	err := storage.CreateBucket("bucket")
+	err := driver.CreateBucket("bucket")
 	c.Assert(err, IsNil)
 
 	client := http.Client{}

pkg/api/headers.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 )
 
 // No encoder interface exists, so we create one.
@@ -58,7 +58,7 @@ func writeErrorResponse(w http.ResponseWriter, response interface{}, acceptsType
 }
 
 // Write object header
-func writeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata) {
+func writeObjectHeaders(w http.ResponseWriter, metadata drivers.ObjectMetadata) {
 	lastModified := metadata.Created.Format(time.RFC1123)
 	// common headers
 	writeCommonHeaders(w, metadata.ContentType)
@@ -69,7 +69,7 @@ func writeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata)
 }
 
 // Write range object header
-func writeRangeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata, ra string) {
+func writeRangeObjectHeaders(w http.ResponseWriter, metadata drivers.ObjectMetadata, ra string) {
 	lastModified := metadata.Created.Format(time.RFC1123)
 	// common headers
 	writeCommonHeaders(w, metadata.ContentType)

pkg/api/resources.go

@@ -20,11 +20,11 @@ import (
 	"net/url"
 	"strconv"
 
-	mstorage "github.com/minio-io/minio/pkg/storage"
+	"github.com/minio-io/minio/pkg/drivers"
 )
 
 // parse bucket url queries
-func getBucketResources(values url.Values) (v mstorage.BucketResourcesMetadata) {
+func getBucketResources(values url.Values) (v drivers.BucketResourcesMetadata) {
 	for key, value := range values {
 		switch true {
 		case key == "prefix":