From e22f272906737978f0555250fc8486f4937c9603 Mon Sep 17 00:00:00 2001
From: Bel LaPointe <breel@qualtrics.com>
Date: Sun, 21 Feb 2021 12:44:43 -0600
Subject: [PATCH] move big into big

---
 db.go                         |  6 ++++--
 db_test.go                    |  6 ++++--
 errors.go                     | 10 ++++------
 minio.go => minio/minio.go    |  4 ++--
 rclone.go => rclone/rclone.go |  2 +-
 resolve/errors.go             |  9 +++++++++
 6 files changed, 24 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 errors.go
 rename minio.go => minio/minio.go (98%)
 rename rclone.go => rclone/rclone.go (99%)
 create mode 100755 resolve/errors.go

diff --git a/db.go b/db.go
index 546660a..8529144 100755
--- a/db.go
+++ b/db.go
@@ -3,6 +3,8 @@ package storage
 import (
 	"fmt"
 	"io"
+	"local/storage/minio"
+	"local/storage/rclone"
 )
 
 type DBStream interface {
@@ -38,13 +40,13 @@ func New(key Type, params ...string) (db DB, err error) {
 		db = NewMap()
 		err = nil
 	case RCLONE:
-		db, err = NewRClone(params[0], params[1])
+		db, err = rclone.NewRClone(params[0], params[1])
 	case FILES:
 		db, err = NewFiles(params[0])
 	case BOLT:
 		db, err = NewBolt(params[0])
 	case MINIO:
-		db, err = NewMinio(params[0], params[1], params[2])
+		db, err = minio.NewMinio(params[0], params[1], params[2])
 	case CACHE:
 		db, err = NewCache(params...)
 	case LEVELDB:
diff --git a/db_test.go b/db_test.go
index 67126b0..89c1d60 100755
--- a/db_test.go
+++ b/db_test.go
@@ -3,6 +3,8 @@ package storage
 import (
 	"bytes"
 	"io/ioutil"
+	"local/storage/minio"
+	"local/storage/rclone"
 	"local/storage/resolve"
 	"log"
 	"net"
@@ -156,7 +158,7 @@ func TestImplementations(t *testing.T) {
 	}
 
 	if _, ok := os.LookupEnv("MINIO"); ok {
-		if minio, err := NewMinio("localhost:9000", "accesskey", "secretkey"); err != nil {
+		if minio, err := minio.NewMinio("localhost:9000", "accesskey", "secretkey"); err != nil {
 			t.Logf("cannot make minio: %v", err)
 		} else {
 			cases = append(cases, minio)
@@ -175,7 +177,7 @@ func TestImplementations(t *testing.T) {
 type = local
    `))
 	f.Close()
-	rclone, err := NewRClone(f.Name(), "local:/tmp")
+	rclone, err := rclone.NewRClone(f.Name(), "local:/tmp")
 	if err != nil {
 		t.Errorf("cannot make rclone: %v", err)
 	} else {
diff --git a/errors.go b/errors.go
old mode 100755
new mode 100644
index 0c6962a..24276c4
--- a/errors.go
+++ b/errors.go
@@ -1,9 +1,7 @@
 package storage
 
-import "errors"
+import "local/storage/resolve"
 
-var ErrNotFound = errors.New("not found")
-
-var ErrNotImpl = errors.New("not implemented")
-
-var ErrCantConnect = errors.New("cannot connect")
+var ErrNotFound = resolve.ErrNotFound
+var ErrNotImpl = resolve.ErrNotImpl
+var ErrCantConnect = resolve.ErrCantConnect
diff --git a/minio.go b/minio/minio.go
similarity index 98%
rename from minio.go
rename to minio/minio.go
index f46270e..d48dfbc 100755
--- a/minio.go
+++ b/minio/minio.go
@@ -1,4 +1,4 @@
-package storage
+package minio
 
 import (
 	"bytes"
@@ -61,7 +61,7 @@ func (m *Minio) Get(key string, ns ...string) ([]byte, error) {
 		}
 	}
 	if isNotExistErr(err) {
-		return nil, ErrNotFound
+		return nil, resolve.ErrNotFound
 	} else if err != nil {
 		return nil, err
 	}
diff --git a/rclone.go b/rclone/rclone.go
similarity index 99%
rename from rclone.go
rename to rclone/rclone.go
index 3442e7a..c2ddde6 100755
--- a/rclone.go
+++ b/rclone/rclone.go
@@ -1,4 +1,4 @@
-package storage
+package rclone
 
 import (
 	"bytes"
diff --git a/resolve/errors.go b/resolve/errors.go
new file mode 100755
index 0000000..f8f0699
--- /dev/null
+++ b/resolve/errors.go
@@ -0,0 +1,9 @@
+package resolve
+
+import "errors"
+
+var ErrNotFound = errors.New("not found")
+
+var ErrNotImpl = errors.New("not implemented")
+
+var ErrCantConnect = errors.New("cannot connect")