move to madmin-go and pkg/ (#180)

minio · May 31, 2021 · 76801ae · 76801ae
1 parent 0d9473a
commit 76801ae
Show file tree

Hide file tree

Showing 31 changed files with 138 additions and 53 deletions.
diff --git a/api/api.go b/api/api.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/klauspost/compress/zstd"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/aggregate"
 	"github.com/minio/warp/pkg/bench"
 )

diff --git a/cli/analyze.go b/cli/analyze.go
@@ -31,7 +31,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/api"
 	"github.com/minio/warp/pkg/aggregate"
 	"github.com/minio/warp/pkg/bench"

diff --git a/cli/benchclient.go b/cli/benchclient.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/minio/cli"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/benchmark.go b/cli/benchmark.go
@@ -32,9 +32,9 @@ import (
 	"github.com/cheggaaa/pb"
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
+	"github.com/minio/madmin-go"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
-	"github.com/minio/minio/pkg/madmin"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/api"
 	"github.com/minio/warp/pkg/bench"
 )

diff --git a/cli/cli.go b/cli/cli.go
@@ -31,9 +31,9 @@ import (
 	"github.com/cheggaaa/pb"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
-	"github.com/minio/minio/pkg/trie"
-	"github.com/minio/minio/pkg/words"
+	"github.com/minio/pkg/console"
+	"github.com/minio/pkg/trie"
+	"github.com/minio/pkg/words"
 	"github.com/minio/warp/pkg"
 	completeinstall "github.com/posener/complete/cmd/install"
 )

diff --git a/cli/client.go b/cli/client.go
@@ -31,14 +31,14 @@ import (
 	"time"
 
 	"github.com/minio/cli"
+	"github.com/minio/madmin-go"
 	"github.com/minio/mc/pkg/probe"
 	md5simd "github.com/minio/md5-simd"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/minio/minio/pkg/certs"
-	"github.com/minio/minio/pkg/console"
-	"github.com/minio/minio/pkg/ellipses"
-	"github.com/minio/minio/pkg/madmin"
+	"github.com/minio/pkg/certs"
+	"github.com/minio/pkg/console"
+	"github.com/minio/pkg/ellipses"
 	"github.com/minio/warp/pkg"
 	"golang.org/x/net/http2"
 )

diff --git a/cli/clientmode.go b/cli/clientmode.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 )
 
 var (

diff --git a/cli/cmp.go b/cli/cmp.go
@@ -26,7 +26,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/delete.go b/cli/delete.go
@@ -19,7 +19,7 @@ package cli
 
 import (
 	"github.com/minio/cli"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/flags.go b/cli/flags.go
@@ -22,7 +22,7 @@ import (
 	"os"
 
 	"github.com/minio/cli"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 )
 
 // Collection of warp flags currently supported

diff --git a/cli/get.go b/cli/get.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/list.go b/cli/list.go
@@ -19,7 +19,7 @@ package cli
 
 import (
 	"github.com/minio/cli"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/merge.go b/cli/merge.go
@@ -26,7 +26,7 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/mixed.go b/cli/mixed.go
@@ -23,7 +23,7 @@ import (
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/print.go b/cli/print.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/cheggaaa/pb"
 	"github.com/minio/mc/pkg/probe"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 )
 
 // causeMessage container for golang error messages

diff --git a/cli/progress-bar.go b/cli/progress-bar.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/cheggaaa/pb"
 	"github.com/fatih/color"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 )
 
 // progress extender.

diff --git a/cli/put.go b/cli/put.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/rlimit.go b/cli/rlimit.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"runtime/debug"
 
-	"github.com/minio/minio/pkg/sys"
+	"github.com/minio/pkg/sys"
 )
 
 func setMaxResources() (err error) {

diff --git a/cli/stat.go b/cli/stat.go
@@ -20,7 +20,7 @@ package cli
 import (
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/cli/versioned.go b/cli/versioned.go
@@ -23,7 +23,7 @@ import (
 	"github.com/minio/cli"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio/pkg/console"
+	"github.com/minio/pkg/console"
 	"github.com/minio/warp/pkg/bench"
 )
 

diff --git a/go.mod b/go.mod
@@ -6,15 +6,16 @@ require (
 	github.com/bygui86/multi-profile v1.3.1
 	github.com/cheggaaa/pb v1.0.29
 	github.com/dustin/go-humanize v1.0.0
-	github.com/fatih/color v1.10.0
+	github.com/fatih/color v1.12.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/klauspost/compress v1.11.7
 	github.com/minio/cli v1.22.0
+	github.com/minio/madmin-go v1.0.8
 	github.com/minio/mc v0.0.0-20210306211449-1d9873c51226
 	github.com/minio/md5-simd v1.1.2
-	github.com/minio/minio v0.0.0-20210308193537-3d8c512bba51
 	github.com/minio/minio-go/v7 v7.0.11-0.20210302210017-6ae69c73ce78
+	github.com/minio/pkg v1.0.3
 	github.com/posener/complete v1.2.3
 	github.com/secure-io/sio-go v0.3.1
-	golang.org/x/net v0.0.0-20201216054612-986b41b23924
+	golang.org/x/net v0.0.0-20210421230115-4e50805a0758
 )