Bump up madmin-go to v3.0.2 (#2896)

go.mod

@@ -21,10 +21,10 @@ require (
 	github.com/minio/cli v1.24.2
 	github.com/minio/highwayhash v1.0.2
 	github.com/minio/kes v0.22.3
-	github.com/minio/madmin-go/v2 v2.2.0
-	github.com/minio/mc v0.0.0-20230526175537-0fac0e006eae
+	github.com/minio/madmin-go/v3 v3.0.2
+	github.com/minio/mc v0.0.0-20230619193119-5f39522e6902
 	github.com/minio/minio-go/v7 v7.0.55-0.20230525060734-b7836f021bfb
-	github.com/minio/pkg v1.6.5
+	github.com/minio/pkg v1.7.5
 	github.com/minio/selfupdate v0.6.0
 	github.com/minio/websocket v1.6.0
 	github.com/mitchellh/go-homedir v1.1.0
@@ -94,7 +94,7 @@ require (
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/minio/colorjson v1.0.4 // indirect
+	github.com/minio/colorjson v1.0.5 // indirect
 	github.com/minio/filepath v1.0.0 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect

pkg/logger/config/config.go

@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 // Default keys

pkg/subnet/subnet.go

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

pkg/subnet/utils.go

@@ -28,7 +28,7 @@ import (
 
 	xhttp "github.com/minio/console/pkg/http"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	mc "github.com/minio/mc/cmd"
 	"github.com/minio/pkg/env"
 )

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/v2"
+	"github.com/minio/madmin-go/v3"
 
 	asrt "github.com/stretchr/testify/assert"
 )

restapi/admin_client_mock.go

@@ -21,7 +21,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	iampolicy "github.com/minio/pkg/iam/policy"
 )
 

restapi/admin_config.go

@@ -26,7 +26,7 @@ import (
 	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
-	madmin "github.com/minio/madmin-go/v2"
+	madmin "github.com/minio/madmin-go/v3"
 
 	cfgApi "github.com/minio/console/restapi/operations/configuration"
 )

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/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 const (

restapi/admin_console.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/websocket"
 )
 

restapi/admin_console_test.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

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/v2"
+	"github.com/minio/madmin-go/v3"
 
 	groupApi "github.com/minio/console/restapi/operations/group"
 

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/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

restapi/admin_heal.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/websocket"
 )
 

restapi/admin_heal_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

restapi/admin_health_info.go

@@ -32,7 +32,7 @@ import (
 	"github.com/klauspost/compress/gzip"
 	xhttp "github.com/minio/console/pkg/http"
 	subnet "github.com/minio/console/pkg/subnet"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/websocket"
 )
 

restapi/admin_health_info_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	madmin "github.com/minio/madmin-go/v2"
+	madmin "github.com/minio/madmin-go/v3"
 )
 
 func Test_serverHealthInfo(t *testing.T) {

restapi/admin_idp.go

@@ -26,7 +26,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	"github.com/minio/console/restapi/operations/idp"
-	madmin "github.com/minio/madmin-go/v2"
+	madmin "github.com/minio/madmin-go/v3"
 )
 
 var errInvalidIDPType = fmt.Errorf("IDP type must be one of %v", madmin.ValidIDPConfigTypes)

restapi/admin_idp_test.go

@@ -25,7 +25,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"

restapi/admin_info_test.go

@@ -28,7 +28,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/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

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/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/secure-io/sio-go"
 )
 

restapi/admin_kms.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/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func registerKMSHandlers(api *operations.ConsoleAPI) {

restapi/admin_profiling.go

@@ -22,7 +22,7 @@ import (
 	"net/http"
 
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/websocket"
 )
 

restapi/admin_profiling_test.go

@@ -25,7 +25,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

restapi/admin_remote_buckets.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/minio/console/pkg/utils"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/swag"

restapi/admin_remote_buckets_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	bucketApi "github.com/minio/console/restapi/operations/bucket"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

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/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func registerSiteReplicationStatusHandler(api *operations.ConsoleAPI) {

restapi/admin_service_test.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

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/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func registerSiteReplicationHandler(api *operations.ConsoleAPI) {

restapi/admin_site_replication_test.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

restapi/admin_speedtest.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/websocket"
 )
 

restapi/admin_subnet.go

@@ -34,7 +34,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/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func registerSubnetHandlers(api *operations.ConsoleAPI) {

restapi/admin_subnet_test.go

@@ -27,7 +27,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	subnetApi "github.com/minio/console/restapi/operations/subnet"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

restapi/admin_tiers.go

@@ -26,7 +26,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/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func registerAdminTiersHandlers(api *operations.ConsoleAPI) {

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/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

restapi/admin_trace.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/websocket"
 )
 

restapi/admin_trace_test.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/stretchr/testify/assert"
 )
 

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/v2"
+	"github.com/minio/madmin-go/v3"
 	iampolicy "github.com/minio/pkg/iam/policy"
 )
 

restapi/admin_users_test.go

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

restapi/client-admin.go

@@ -31,7 +31,7 @@ import (
 	"github.com/minio/console/pkg/utils"
 
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	mcCmd "github.com/minio/mc/cmd"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	iampolicy "github.com/minio/pkg/iam/policy"

restapi/errors.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio-go/v7"
 )
 

restapi/policy/policies.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 // ReplacePolicyVariables replaces known variables from policies with known values

restapi/policy/policies_test.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	minioIAMPolicy "github.com/minio/pkg/iam/policy"
 )
 

restapi/service_accounts_handlers.go

@@ -31,7 +31,7 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	saApi "github.com/minio/console/restapi/operations/service_account"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	iampolicy "github.com/minio/pkg/iam/policy"
 )
 

restapi/service_accounts_handlers_test.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	iampolicy "github.com/minio/pkg/iam/policy"
 	"github.com/stretchr/testify/assert"
 )

restapi/tls.go

@@ -36,7 +36,7 @@ func (t *ConsoleTransport) RoundTrip(req *http.Request) (*http.Response, error)
 
 // PrepareSTSClientTransport :
 func PrepareSTSClientTransport(insecure bool, remoteAddress string) *ConsoleTransport {
-	// This takes github.com/minio/madmin-go/v2/transport.go as an example
+	// This takes github.com/minio/madmin-go/v3/transport.go as an example
 	//
 	// DefaultTransport - this default transport is similar to
 	// http.DefaultTransport but with additional param  DisableCompression

restapi/user_bucket_quota.go

@@ -25,7 +25,7 @@ import (
 	"github.com/minio/console/restapi/operations"
 	bucektApi "github.com/minio/console/restapi/operations/bucket"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 
 	"github.com/minio/console/models"
 )

restapi/user_buckets.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio-go/v7"
 
 	"github.com/minio/mc/cmd"

restapi/user_buckets_test.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/go-openapi/swag"
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/mc/pkg/probe"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/sse"

restapi/user_login.go

@@ -33,7 +33,7 @@ import (
 	"github.com/minio/console/pkg/auth/idp/oauth2"
 	"github.com/minio/console/restapi/operations"
 	authApi "github.com/minio/console/restapi/operations/auth"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/minio/pkg/env"
 )

restapi/user_login_test.go

@@ -24,7 +24,7 @@ import (
 
 	xoauth2 "golang.org/x/oauth2"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 
 	iampolicy "github.com/minio/pkg/iam/policy"
 

restapi/user_session.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	policies "github.com/minio/console/restapi/policy"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 
 	jwtgo "github.com/golang-jwt/jwt/v4"
 	"github.com/minio/pkg/bucket/policy/condition"

restapi/user_support_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/minio/console/models"
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 )
 
 func Test_getCallHomeRule(t *testing.T) {

restapi/ws_handle.go

@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/madmin-go/v2"
+	"github.com/minio/madmin-go/v3"
 
 	"github.com/minio/console/pkg/utils"