Bump up madmin-go to v2 (#2479)

minio · Dec 2, 2022 · 5800d01 · 5800d01
1 parent c803451
commit 5800d01
Show file tree

Hide file tree

Showing 52 changed files with 63 additions and 58 deletions.
diff --git a/go.mod b/go.mod
@@ -23,11 +23,11 @@ require (
 	github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651
 	github.com/minio/highwayhash v1.0.2
 	github.com/minio/kes v0.22.0
-	github.com/minio/madmin-go v1.7.5
-	github.com/minio/mc v0.0.0-20221121180832-640654972949
+	github.com/minio/madmin-go/v2 v2.0.0
+	github.com/minio/mc v0.0.0-20221201184114-854b4f123f03
 	github.com/minio/minio-go/v7 v7.0.44
 	github.com/minio/operator v0.0.0-20220902184351-21e4073132b0
-	github.com/minio/pkg v1.5.4
+	github.com/minio/pkg v1.5.5
 	github.com/minio/selfupdate v0.5.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/rs/xid v1.4.0
@@ -100,7 +100,7 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.3.8 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.1.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.1 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
@@ -122,6 +122,7 @@ require (
 	github.com/miekg/dns v1.1.48 // indirect
 	github.com/minio/colorjson v1.0.4 // indirect
 	github.com/minio/filepath v1.0.0 // indirect
+	github.com/minio/madmin-go v1.7.5 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect

diff --git a/go.sum b/go.sum
@@ -625,8 +625,9 @@ github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrD
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/klauspost/cpuid/v2 v2.1.2 h1:XhdX4fqAJUA0yj+kUwMavO0hHrSPAecYdYf1ZmxHvak=
 github.com/klauspost/cpuid/v2 v2.1.2/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.1 h1:U33DW0aiEj633gHYw3LoDNfkDiYnE5Q8M/TKJn2f2jI=
+github.com/klauspost/cpuid/v2 v2.2.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -718,17 +719,20 @@ github.com/minio/kes v0.22.0/go.mod h1:q5T0uTFrr7l6GosXvF0ufCtUKkbmbSZW1Yhu4KgLK
 github.com/minio/madmin-go v1.6.6/go.mod h1:ATvkBOLiP3av4D++2v1UEHC/QzsGtgXD5kYvvRYzdKs=
 github.com/minio/madmin-go v1.7.5 h1:IF8j2HR0jWc7msiOcy0KJ8EyY7Q3z+j+lsmSDksQm+I=
 github.com/minio/madmin-go v1.7.5/go.mod h1:3SO8SROxHN++tF6QxdTii2SSUaYSrr8lnE9EJWjvz0k=
-github.com/minio/mc v0.0.0-20221121180832-640654972949 h1:DGRZrrj0YNZKhgFuFi12+Awd8DY6fiOnNjI3hGCzLVQ=
-github.com/minio/mc v0.0.0-20221121180832-640654972949/go.mod h1:ywaVFjIJAh4x2pyUmiT6Jx10LMJLd34BwXSYqB5f0Vw=
+github.com/minio/madmin-go/v2 v2.0.0 h1:VR+zCIeoHPveppvMUhZ/vmok1UJp4pH38M4wkqpyT88=
+github.com/minio/madmin-go/v2 v2.0.0/go.mod h1:5aFi/VLWBHC2DEFfGIlUmAeJhaF4ZAjuYpEWZFU14Zw=
+github.com/minio/mc v0.0.0-20221201184114-854b4f123f03 h1:/q0NA3KjhTL+q/R9xEye0lpJECJmwaZnuIBsBn4HP28=
+github.com/minio/mc v0.0.0-20221201184114-854b4f123f03/go.mod h1:+Jrdvdo6p83JtqUO38UUeTu4aspklp9cF9k6DqFkb0Q=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.41/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
 github.com/minio/minio-go/v7 v7.0.44 h1:9zUJ7iU7ax2P1jOvTp6nVrgzlZq3AZlFm0XfRFDKstM=
 github.com/minio/minio-go/v7 v7.0.44/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
 github.com/minio/operator v0.0.0-20220902184351-21e4073132b0 h1:Ak/IkcWaY/ntGIzpeZIw43hwFKMh1242qIELpk4bVqI=
 github.com/minio/operator v0.0.0-20220902184351-21e4073132b0/go.mod h1:pMMJ+WzD3znzYC3Ae/clcKocdSRyenK4kzdstibdafk=
-github.com/minio/pkg v1.5.4 h1:tP89j5EPym0C/kwacUm3NKgvpWEksDq2bVJJMQYLkmk=
 github.com/minio/pkg v1.5.4/go.mod h1:2MOaRFdmFKULD+uOLc3qHLGTQTuxCNPKNPfLBTxC8CA=
+github.com/minio/pkg v1.5.5 h1:z53jAVkXpRD+Y4LBt9cN+EaPUbWD6iOWhZuC90JvGqk=
+github.com/minio/pkg v1.5.5/go.mod h1:EiGlHS2xaooa2VMxhJsxxAZHDObHVUB3HwtuoEXOCVE=
 github.com/minio/selfupdate v0.5.0 h1:0UH1HlL49+2XByhovKl5FpYTjKfvrQ2sgL1zEXK6mfI=
 github.com/minio/selfupdate v0.5.0/go.mod h1:mcDkzMgq8PRcpCRJo/NlPY7U45O5dfYl2Y0Rg7IustY=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=

diff --git a/operatorapi/tenants.go b/operatorapi/tenants.go
@@ -34,7 +34,7 @@ import (
 
 	utils2 "github.com/minio/console/pkg/http"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 
 	"github.com/minio/console/restapi"
 

diff --git a/pkg/logger/config/config.go b/pkg/logger/config/config.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 // Default keys

diff --git a/pkg/subnet/subnet.go b/pkg/subnet/subnet.go
@@ -28,7 +28,7 @@ import (
 	"github.com/minio/pkg/licverifier"
 
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	mc "github.com/minio/mc/cmd"
 	"github.com/tidwall/gjson"
 )

diff --git a/pkg/subnet/utils.go b/pkg/subnet/utils.go
@@ -27,7 +27,7 @@ import (
 
 	xhttp "github.com/minio/console/pkg/http"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	mc "github.com/minio/mc/cmd"
 	"github.com/minio/pkg/env"
 )

diff --git a/restapi/admin_arns_test.go b/restapi/admin_arns_test.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/go-openapi/loads"
 	"github.com/minio/console/restapi/operations"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 
 	asrt "github.com/stretchr/testify/assert"
 )

diff --git a/restapi/admin_config.go b/restapi/admin_config.go
@@ -25,7 +25,7 @@ import (
 	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
-	madmin "github.com/minio/madmin-go"
+	madmin "github.com/minio/madmin-go/v2"
 
 	cfgApi "github.com/minio/console/restapi/operations/configuration"
 )

diff --git a/restapi/admin_config_test.go b/restapi/admin_config_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 const (

diff --git a/restapi/admin_console.go b/restapi/admin_console.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 const logTimeFormat string = "15:04:05 MST 01/02/2006"

diff --git a/restapi/admin_console_test.go b/restapi/admin_console_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_groups.go b/restapi/admin_groups.go
@@ -23,7 +23,7 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/minio/console/pkg/utils"
 	"github.com/minio/console/restapi/operations"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 
 	groupApi "github.com/minio/console/restapi/operations/group"
 

diff --git a/restapi/admin_groups_test.go b/restapi/admin_groups_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_heal.go b/restapi/admin_heal.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 // An alias of string to represent the health color code of an object

diff --git a/restapi/admin_heal_test.go b/restapi/admin_heal_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_health_info.go b/restapi/admin_health_info.go
@@ -28,7 +28,7 @@ import (
 	"github.com/klauspost/compress/gzip"
 
 	"github.com/gorilla/websocket"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 // startHealthInfo starts fetching mc.ServerHealthInfo and

diff --git a/restapi/admin_health_info_test.go b/restapi/admin_health_info_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	madmin "github.com/minio/madmin-go"
+	madmin "github.com/minio/madmin-go/v2"
 )
 
 // assigning mock at runtime instead of compile time

diff --git a/restapi/admin_info.go b/restapi/admin_info.go
@@ -33,7 +33,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	systemApi "github.com/minio/console/restapi/operations/system"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 func registerAdminInfoHandlers(api *operations.ConsoleAPI) {

diff --git a/restapi/admin_info_test.go b/restapi/admin_info_test.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	asrt "github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_inspect.go b/restapi/admin_inspect.go
@@ -29,7 +29,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	inspectApi "github.com/minio/console/restapi/operations/inspect"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/secure-io/sio-go"
 )
 

diff --git a/restapi/admin_kms.go b/restapi/admin_kms.go
@@ -25,7 +25,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	kmsAPI "github.com/minio/console/restapi/operations/k_m_s"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 func registerKMSHandlers(api *operations.ConsoleAPI) {

diff --git a/restapi/admin_kms_test.go b/restapi/admin_kms_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	kmsAPI "github.com/minio/console/restapi/operations/k_m_s"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

diff --git a/restapi/admin_profiling.go b/restapi/admin_profiling.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 var items []*models.StartProfilingItem

diff --git a/restapi/admin_profiling_test.go b/restapi/admin_profiling_test.go
@@ -25,7 +25,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_remote_buckets.go b/restapi/admin_remote_buckets.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/swag"

diff --git a/restapi/admin_replication_status.go b/restapi/admin_replication_status.go
@@ -23,7 +23,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	siteRepApi "github.com/minio/console/restapi/operations/site_replication"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 func registerSiteReplicationStatusHandler(api *operations.ConsoleAPI) {

diff --git a/restapi/admin_service_test.go b/restapi/admin_service_test.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_site_replication.go b/restapi/admin_site_replication.go
@@ -23,7 +23,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	siteRepApi "github.com/minio/console/restapi/operations/site_replication"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 func registerSiteReplicationHandler(api *operations.ConsoleAPI) {

diff --git a/restapi/admin_site_replication_test.go b/restapi/admin_site_replication_test.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_speedtest.go b/restapi/admin_speedtest.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/gorilla/websocket"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 // getSpeedtesthOptionsFromReq gets duration, size & concurrent requests from a websocket

diff --git a/restapi/admin_subnet.go b/restapi/admin_subnet.go
@@ -32,7 +32,7 @@ import (
 	"github.com/minio/console/pkg/subnet"
 	"github.com/minio/console/restapi/operations"
 	subnetApi "github.com/minio/console/restapi/operations/subnet"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 func registerSubnetHandlers(api *operations.ConsoleAPI) {

diff --git a/restapi/admin_test.go b/restapi/admin_test.go
@@ -19,7 +19,7 @@ package restapi
 import (
 	"context"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 // Define a mock struct of Admin Client interface implementation

diff --git a/restapi/admin_tiers.go b/restapi/admin_tiers.go
@@ -29,7 +29,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	tieringApi "github.com/minio/console/restapi/operations/tiering"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"

diff --git a/restapi/admin_tiers_test.go b/restapi/admin_tiers_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/minio/console/models"
 	tieringApi "github.com/minio/console/restapi/operations/tiering"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_trace.go b/restapi/admin_trace.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 )
 
 // shortTraceMsg Short trace record

diff --git a/restapi/admin_trace_test.go b/restapi/admin_trace_test.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/restapi/admin_users.go b/restapi/admin_users.go
@@ -33,7 +33,7 @@ import (
 	accountApi "github.com/minio/console/restapi/operations/account"
 	bucketApi "github.com/minio/console/restapi/operations/bucket"
 	userApi "github.com/minio/console/restapi/operations/user"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	iampolicy "github.com/minio/pkg/iam/policy"
 )
 

diff --git a/restapi/admin_users_test.go b/restapi/admin_users_test.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	iampolicy "github.com/minio/pkg/iam/policy"
 	asrt "github.com/stretchr/testify/assert"
 )

diff --git a/restapi/client-admin.go b/restapi/client-admin.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/minio/console/models"
 	"github.com/minio/console/pkg"
-	"github.com/minio/madmin-go"
+	"github.com/minio/madmin-go/v2"
 	mcCmd "github.com/minio/mc/cmd"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7/pkg/credentials"