diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dc16e60ca..10b9978c7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,10 +1,14 @@ { "ImportPath": "github.com/minio-io/minio", - "GoVersion": "go1.4", + "GoVersion": "go1.4.2", "Packages": [ "./..." ], "Deps": [ + { + "ImportPath": "github.com/fkautz/testify/mock", + "Rev": "e4ec8152c15fc46bd5056ce65997a07c7d415325" + }, { "ImportPath": "github.com/gorilla/context", "Rev": "50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da" @@ -34,6 +38,10 @@ "ImportPath": "github.com/minio-io/iodine", "Rev": "55cc4d4256c68fbd6f0775f1a25e37e6a2f6457e" }, + { + "ImportPath": "github.com/minio-io/objectdriver", + "Rev": "e5f505ad4731ac247f2afecce9b323eda7fbfcc3" + }, { "ImportPath": "github.com/stretchr/objx", "Rev": "cbeaeb16a013161a98496fad62933b1d21786672" @@ -41,10 +49,6 @@ { "ImportPath": "github.com/stretchr/testify/assert", "Rev": "e4ec8152c15fc46bd5056ce65997a07c7d415325" - }, - { - "ImportPath": "github.com/stretchr/testify/mock", - "Rev": "e4ec8152c15fc46bd5056ce65997a07c7d415325" } ] } diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/Godeps/_workspace/src/github.com/fkautz/testify/mock/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go rename to Godeps/_workspace/src/github.com/fkautz/testify/mock/doc.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/Godeps/_workspace/src/github.com/fkautz/testify/mock/mock.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go rename to Godeps/_workspace/src/github.com/fkautz/testify/mock/mock.go diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go b/Godeps/_workspace/src/github.com/fkautz/testify/mock/mock_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go rename to Godeps/_workspace/src/github.com/fkautz/testify/mock/mock_test.go diff --git a/Godeps/_workspace/src/github.com/minio-io/objectdriver/.gitignore b/Godeps/_workspace/src/github.com/minio-io/objectdriver/.gitignore new file mode 100644 index 000000000..daf913b1b --- /dev/null +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/.gitignore @@ -0,0 +1,24 @@ +# Compiled Object files, Static and Dynamic libs (Shared Objects) +*.o +*.a +*.so + +# Folders +_obj +_test + +# Architecture specific extensions/prefixes +*.[568vq] +[568vq].out + +*.cgo1.go +*.cgo2.c +_cgo_defun.c +_cgo_gotypes.go +_cgo_export.* + +_testmain.go + +*.exe +*.test +*.prof diff --git a/Godeps/_workspace/src/github.com/minio-io/objectdriver/LICENSE b/Godeps/_workspace/src/github.com/minio-io/objectdriver/LICENSE new file mode 100644 index 000000000..8f71f43fe --- /dev/null +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/LICENSE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Godeps/_workspace/src/github.com/minio-io/objectdriver/README.md b/Godeps/_workspace/src/github.com/minio-io/objectdriver/README.md new file mode 100644 index 000000000..fb3fe38f7 --- /dev/null +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/README.md @@ -0,0 +1,2 @@ +# objectdriver +Object Storage Driver diff --git a/pkg/drivers/api_testsuite.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/api_testsuite.go similarity index 100% rename from pkg/drivers/api_testsuite.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/api_testsuite.go diff --git a/pkg/drivers/bucket_policy.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/bucket_policy.go similarity index 100% rename from pkg/drivers/bucket_policy.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/bucket_policy.go diff --git a/pkg/drivers/bucket_policy_compat.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/bucket_policy_compat.go similarity index 100% rename from pkg/drivers/bucket_policy_compat.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/bucket_policy_compat.go diff --git a/pkg/drivers/date.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/date.go similarity index 100% rename from pkg/drivers/date.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/date.go diff --git a/pkg/drivers/donut/donut.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut.go similarity index 99% rename from pkg/drivers/donut/donut.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut.go index 4252ee040..cbd1928ee 100644 --- a/pkg/drivers/donut/donut.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut.go @@ -30,8 +30,8 @@ import ( "github.com/minio-io/donut" "github.com/minio-io/iodine" - "github.com/minio-io/minio/pkg/drivers" "github.com/minio-io/minio/pkg/utils/log" + "github.com/minio-io/objectdriver" ) // donutDriver - creates a new single disk drivers driver using donut diff --git a/pkg/drivers/donut/donut_filter.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut_filter.go similarity index 97% rename from pkg/drivers/donut/donut_filter.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut_filter.go index 396fb0aa5..0b15319b3 100644 --- a/pkg/drivers/donut/donut_filter.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut_filter.go @@ -5,7 +5,7 @@ import ( "bytes" "strings" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) func delimiter(object, delimiter string) string { diff --git a/pkg/drivers/donut/donut_test.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut_test.go similarity index 96% rename from pkg/drivers/donut/donut_test.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut_test.go index 6846eb19a..98111e7e6 100644 --- a/pkg/drivers/donut/donut_test.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/donut/donut_test.go @@ -21,9 +21,8 @@ import ( "os" "testing" - "github.com/minio-io/minio/pkg/drivers" - . "github.com/minio-io/check" + "github.com/minio-io/objectdriver" ) func Test(t *testing.T) { TestingT(t) } diff --git a/pkg/drivers/driver.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/driver.go similarity index 100% rename from pkg/drivers/driver.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/driver.go diff --git a/pkg/drivers/errors.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/errors.go similarity index 100% rename from pkg/drivers/errors.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/errors.go diff --git a/pkg/drivers/file/file.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file.go similarity index 96% rename from pkg/drivers/file/file.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file.go index 60c3ecaa5..3c2003a62 100644 --- a/pkg/drivers/file/file.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file.go @@ -20,7 +20,7 @@ import ( "os" "sync" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) // Start filesystem channel diff --git a/pkg/drivers/file/file_bucket.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_bucket.go similarity index 98% rename from pkg/drivers/file/file_bucket.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_bucket.go index 6724d2547..1d9f4934f 100644 --- a/pkg/drivers/file/file_bucket.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_bucket.go @@ -22,10 +22,10 @@ import ( "sort" "strings" + "github.com/minio-io/objectdriver" + "io/ioutil" "path/filepath" - - "github.com/minio-io/minio/pkg/drivers" ) /// Bucket Operations diff --git a/pkg/drivers/file/file_common.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_common.go similarity index 97% rename from pkg/drivers/file/file_common.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_common.go index 579c06322..f8593f201 100644 --- a/pkg/drivers/file/file_common.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_common.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) // fileDriver - file local variables diff --git a/pkg/drivers/file/file_filter.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_filter.go similarity index 98% rename from pkg/drivers/file/file_filter.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_filter.go index 13092801b..1ddd24077 100644 --- a/pkg/drivers/file/file_filter.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_filter.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) func (file *fileDriver) filterDelimiterPrefix(bucket, name, fname, delimitedName string, resources drivers.BucketResourcesMetadata) (drivers.ObjectMetadata, drivers.BucketResourcesMetadata, error) { diff --git a/pkg/drivers/file/file_object.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_object.go similarity index 99% rename from pkg/drivers/file/file_object.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_object.go index bd70fdf47..a61de6a34 100644 --- a/pkg/drivers/file/file_object.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_object.go @@ -23,12 +23,12 @@ import ( "path" "strings" + "github.com/minio-io/objectdriver" + "crypto/md5" "encoding/base64" "encoding/gob" "encoding/hex" - - "github.com/minio-io/minio/pkg/drivers" ) /// Object Operations diff --git a/pkg/drivers/file/file_policy.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_policy.go similarity index 98% rename from pkg/drivers/file/file_policy.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_policy.go index 9819842a6..594240293 100644 --- a/pkg/drivers/file/file_policy.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_policy.go @@ -20,9 +20,9 @@ import ( "os" "path" - "encoding/json" + "github.com/minio-io/objectdriver" - "github.com/minio-io/minio/pkg/drivers" + "encoding/json" ) // GetBucketPolicy - GET bucket policy diff --git a/pkg/drivers/file/file_test.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_test.go similarity index 96% rename from pkg/drivers/file/file_test.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_test.go index 870b61b1e..32d1c5819 100644 --- a/pkg/drivers/file/file_test.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/file/file_test.go @@ -21,9 +21,8 @@ import ( "os" "testing" - "github.com/minio-io/minio/pkg/drivers" - . "github.com/minio-io/check" + "github.com/minio-io/objectdriver" ) func Test(t *testing.T) { TestingT(t) } diff --git a/pkg/drivers/memory/memory.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/memory/memory.go similarity index 99% rename from pkg/drivers/memory/memory.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/memory/memory.go index bc66f924c..d4a58bc24 100644 --- a/pkg/drivers/memory/memory.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/memory/memory.go @@ -25,12 +25,12 @@ import ( "sync" "time" + "github.com/minio-io/objectdriver" + "crypto/md5" "encoding/hex" "io/ioutil" - - "github.com/minio-io/minio/pkg/drivers" ) // memoryDriver - local variables diff --git a/pkg/drivers/memory/memory_test.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/memory/memory_test.go similarity index 95% rename from pkg/drivers/memory/memory_test.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/memory/memory_test.go index 375c8bc52..f116543f6 100644 --- a/pkg/drivers/memory/memory_test.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/memory/memory_test.go @@ -19,9 +19,8 @@ package memory import ( "testing" - "github.com/minio-io/minio/pkg/drivers" - . "github.com/minio-io/check" + "github.com/minio-io/objectdriver" ) func Test(t *testing.T) { TestingT(t) } diff --git a/pkg/drivers/mocks/Driver.go b/Godeps/_workspace/src/github.com/minio-io/objectdriver/mocks/Driver.go similarity index 96% rename from pkg/drivers/mocks/Driver.go rename to Godeps/_workspace/src/github.com/minio-io/objectdriver/mocks/Driver.go index b3fc53828..561cd0e36 100644 --- a/pkg/drivers/mocks/Driver.go +++ b/Godeps/_workspace/src/github.com/minio-io/objectdriver/mocks/Driver.go @@ -1,13 +1,12 @@ package mocks -import "github.com/minio-io/minio/pkg/drivers" -import "github.com/stretchr/testify/mock" - import ( "bytes" "io" + "github.com/fkautz/testify/mock" "github.com/minio-io/iodine" + "github.com/minio-io/objectdriver" ) // Driver is a mock diff --git a/pkg/api/api_bucket_handlers.go b/pkg/api/api_bucket_handlers.go index c28fd4ae9..507699e6c 100644 --- a/pkg/api/api_bucket_handlers.go +++ b/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/drivers" "github.com/minio-io/minio/pkg/utils/log" + "github.com/minio-io/objectdriver" ) // GET Bucket (List Objects) diff --git a/pkg/api/api_object_handlers.go b/pkg/api/api_object_handlers.go index ef50d6ebe..d22d81152 100644 --- a/pkg/api/api_object_handlers.go +++ b/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/drivers" "github.com/minio-io/minio/pkg/utils/log" + "github.com/minio-io/objectdriver" ) // GET Object diff --git a/pkg/api/api_policy_handlers.go b/pkg/api/api_policy_handlers.go index b43c59279..75a84438e 100644 --- a/pkg/api/api_policy_handlers.go +++ b/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/drivers" "github.com/minio-io/minio/pkg/utils/log" + "github.com/minio-io/objectdriver" ) // PUT Bucket policy diff --git a/pkg/api/api_response.go b/pkg/api/api_response.go index 17beae48c..eba65ed27 100644 --- a/pkg/api/api_response.go +++ b/pkg/api/api_response.go @@ -19,7 +19,7 @@ package api import ( "sort" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) // Reply date format diff --git a/pkg/api/api_router.go b/pkg/api/api_router.go index cca623892..92d502eea 100644 --- a/pkg/api/api_router.go +++ b/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/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) // private use diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go index c83a6f92e..aec2fae0d 100644 --- a/pkg/api/api_test.go +++ b/pkg/api/api_test.go @@ -32,13 +32,13 @@ import ( "net/http" "net/http/httptest" + "github.com/fkautz/testify/mock" "github.com/minio-io/minio/pkg/api" - "github.com/minio-io/minio/pkg/drivers" - "github.com/minio-io/minio/pkg/drivers/donut" - "github.com/minio-io/minio/pkg/drivers/file" - "github.com/minio-io/minio/pkg/drivers/memory" - "github.com/minio-io/minio/pkg/drivers/mocks" - "github.com/stretchr/testify/mock" + "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/check" ) diff --git a/pkg/api/headers.go b/pkg/api/headers.go index a6e103a79..3ed746092 100644 --- a/pkg/api/headers.go +++ b/pkg/api/headers.go @@ -24,7 +24,7 @@ import ( "strconv" "time" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) // No encoder interface exists, so we create one. diff --git a/pkg/api/resources.go b/pkg/api/resources.go index e6306bf24..c31fd9075 100644 --- a/pkg/api/resources.go +++ b/pkg/api/resources.go @@ -20,7 +20,7 @@ import ( "net/url" "strconv" - "github.com/minio-io/minio/pkg/drivers" + "github.com/minio-io/objectdriver" ) // parse bucket url queries diff --git a/pkg/server/server.go b/pkg/server/server.go index c1852e2e6..aadc9344f 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -27,12 +27,12 @@ import ( "github.com/minio-io/iodine" "github.com/minio-io/minio/pkg/api" "github.com/minio-io/minio/pkg/api/web" - "github.com/minio-io/minio/pkg/drivers" - "github.com/minio-io/minio/pkg/drivers/donut" - "github.com/minio-io/minio/pkg/drivers/file" - "github.com/minio-io/minio/pkg/drivers/memory" "github.com/minio-io/minio/pkg/server/httpserver" "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