Moving object storage drivers back to minio

pkg/api/api_bucket_handlers.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio-io/iodine"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 	"github.com/minio-io/minio/pkg/utils/log"
-	"github.com/minio-io/objectdriver"
 )
 
 // GET Bucket (List Objects)

pkg/api/api_object_handlers.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio-io/iodine"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 	"github.com/minio-io/minio/pkg/utils/log"
-	"github.com/minio-io/objectdriver"
 )
 
 // GET Object

pkg/api/api_policy_handlers.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio-io/iodine"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 	"github.com/minio-io/minio/pkg/utils/log"
-	"github.com/minio-io/objectdriver"
 )
 
 // PUT Bucket policy

pkg/api/api_response.go

@@ -19,7 +19,7 @@ package api
 import (
 	"sort"
 
-	"github.com/minio-io/objectdriver"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 )
 
 // Reply date format

pkg/api/api_router.go

@@ -23,7 +23,7 @@ import (
 	router "github.com/gorilla/mux"
 	"github.com/minio-io/iodine"
 	"github.com/minio-io/minio/pkg/api/config"
-	"github.com/minio-io/objectdriver"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 )
 
 // private use

pkg/api/api_test.go

@@ -33,11 +33,11 @@ import (
 	"net/http/httptest"
 
 	"github.com/minio-io/minio/pkg/api"
-	"github.com/minio-io/objectdriver"
-	"github.com/minio-io/objectdriver/donut"
-	"github.com/minio-io/objectdriver/file"
-	"github.com/minio-io/objectdriver/memory"
-	"github.com/minio-io/objectdriver/mocks"
+	"github.com/minio-io/minio/pkg/storage/drivers"
+	"github.com/minio-io/minio/pkg/storage/drivers/donut"
+	"github.com/minio-io/minio/pkg/storage/drivers/file"
+	"github.com/minio-io/minio/pkg/storage/drivers/memory"
+	"github.com/minio-io/minio/pkg/storage/drivers/mocks"
 	"github.com/stretchr/testify/mock"
 
 	. "github.com/minio-io/check"

pkg/api/headers.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/minio-io/objectdriver"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 )
 
 // No encoder interface exists, so we create one.

pkg/api/resources.go

@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/minio-io/objectdriver"
+	"github.com/minio-io/minio/pkg/storage/drivers"
 )
 
 // parse bucket url queries

pkg/server/server.go

@@ -28,11 +28,11 @@ import (
 	"github.com/minio-io/minio/pkg/api"
 	"github.com/minio-io/minio/pkg/api/web"
 	"github.com/minio-io/minio/pkg/server/httpserver"
+	"github.com/minio-io/minio/pkg/storage/drivers"
+	"github.com/minio-io/minio/pkg/storage/drivers/donut"
+	"github.com/minio-io/minio/pkg/storage/drivers/file"
+	"github.com/minio-io/minio/pkg/storage/drivers/memory"
 	"github.com/minio-io/minio/pkg/utils/log"
-	"github.com/minio-io/objectdriver"
-	"github.com/minio-io/objectdriver/donut"
-	"github.com/minio-io/objectdriver/file"
-	"github.com/minio-io/objectdriver/memory"
 )
 
 // Config - http server parameters