minio/mc
1
0
Fork 0
mirror of https://github.com/minio/mc.git synced 2025-07-30 07:23:03 +03:00
Code Activity

Add response details for policy attach/detach cmd (#4602)

Browse Source 
For internal IDP.

Also updates madmin-go to v3 as part of this change

- Temporarily disable test_admin_users until minio side fix is merged
This commit is contained in:
Aditya Manthramurthy
2023-06-19 12:31:19 -07:00
committed by GitHub
parent bf3924b583
commit 5f39522e69
79 changed files with 107 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/admin-cluster-bucket-import.go
View File

@ -30,7 +30,7 @@ import (
"github.com/klauspost/compress/zip"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-config-get.go
View File

@ -27,7 +27,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-config-help.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/admin-config-set.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-decom-cancel.go
View File

@ -23,7 +23,7 @@ import (
humanize "github.com/dustin/go-humanize"
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-group-add.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-group-enable.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-group-remove.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-heal-result-item.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"fmt"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
)
type hri struct {

2
cmd/admin-heal-ui.go
View File

@ -27,7 +27,7 @@ import (
humanize "github.com/dustin/go-humanize"
"github.com/fatih/color"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-heal.go
View File

@ -29,7 +29,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-info.go
View File

@ -30,7 +30,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/pkg/console"

2
cmd/admin-logs.go
View File

@ -26,7 +26,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

62
cmd/admin-policy-attach.go
View File

@ -18,11 +18,9 @@
package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)
var adminAttachPolicyFlags = []cli.Flag{
@ -74,19 +72,18 @@ func userAttachOrDetachPolicy(ctx *cli.Context, attach bool) error {
if len(ctx.Args()) < 2 {
showCommandHelpAndExit(ctx, 1) // last argument is exit code
}
console.SetColor("PolicyMessage", color.New(color.FgGreen))
console.SetColor("Policy", color.New(color.FgBlue))
user := ctx.String("user")
group := ctx.String("group")
// Get the alias parameter from cli
args := ctx.Args()
aliasedURL := args.Get(0)
// Put args in PolicyAssociationReq, client checks for validity
policies := args[1:]
req := madmin.PolicyAssociationReq{
User: ctx.String("user"),
Group: ctx.String("group"),
Policies: args.Tail(),
User: user,
Group: group,
Policies: policies,
}
// Create a new MinIO Admin Client
@ -94,37 +91,34 @@ func userAttachOrDetachPolicy(ctx *cli.Context, attach bool) error {
fatalIf(err, "Unable to initialize admin connection.")
var e error
var res madmin.PolicyAssociationResp
if attach {
e = client.AttachPolicy(globalContext, req)
res, e = client.AttachPolicy(globalContext, req)
} else {
e = client.DetachPolicy(globalContext, req)
res, e = client.DetachPolicy(globalContext, req)
}
fatalIf(probe.NewError(e), "Unable to make user/group policy association")
isGroup := false
if req.User == "" {
isGroup = true
}
userOrGroup := req.User
if isGroup {
userOrGroup = req.Group
}
if e == nil {
for _, policy := range req.Policies {
printMsg(userPolicyMessage{
op: ctx.Command.Name,
Policy: policy,
UserOrGroup: userOrGroup,
IsGroup: isGroup,
})
}
} else {
var emptyResp madmin.PolicyAssociationResp
if res.UpdatedAt == emptyResp.UpdatedAt {
// Older minio does not send a result, so we populate res manually to
// simulate a result. TODO(aditya): remove this after newer minio is
// released in a few months (Older API Deprecated in Jun 2023)
if attach {
fatalIf(probe.NewError(e), "Unable to attach the policy")
res.PoliciesAttached = policies
} else {
fatalIf(probe.NewError(e), "Unable to detach the policy")
res.PoliciesDetached = policies
}
}
m := policyAssociationMessage{
attach: attach,
Status: "success",
PoliciesAttached: res.PoliciesAttached,
PoliciesDetached: res.PoliciesDetached,
User: user,
Group: group,
}
printMsg(m)
return nil
}

2
cmd/admin-policy-create.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-policy-entities.go
View File

@ -19,7 +19,7 @@ package cmd
import (
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/admin-policy-info.go
View File

@ -22,7 +22,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-add.go
View File

@ -23,7 +23,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-info.go
View File

@ -23,7 +23,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-remove.go
View File

@ -23,7 +23,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-resync-cancel.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-resync-start.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-resync-status.go
View File

@ -30,7 +30,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
"github.com/olekukonko/tablewriter"

2
cmd/admin-replicate-status.go
View File

@ -25,7 +25,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-replicate-update.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-scanner-status.go
View File

@ -32,7 +32,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
"github.com/olekukonko/tablewriter"

2
cmd/admin-service-restart.go
View File

@ -25,7 +25,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-trace.go
View File

@ -32,7 +32,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-user-disable.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-user-enable.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-user-svcacct-add.go
View File

@ -30,7 +30,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
iampolicy "github.com/minio/pkg/iam/policy"

2
cmd/admin-user-svcacct-disable.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-user-svcacct-enable.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/admin-user-svcacct-set.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/batch-generate.go
View File

@ -22,7 +22,7 @@ import (
"strings"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/batch-list.go
View File

@ -24,7 +24,7 @@ import (
humanize "github.com/dustin/go-humanize"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/olekukonko/tablewriter"
)

2
cmd/batch-start.go
View File

@ -25,7 +25,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/batch-status.go
View File

@ -12,7 +12,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/dustin/go-humanize"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/olekukonko/tablewriter"
)

2
cmd/client-admin.go
View File

@ -29,7 +29,7 @@ import (
"github.com/klauspost/compress/gzhttp"
"github.com/mattn/go-ieproxy"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/httptracer"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/credentials"

2
cmd/globals.go
View File

@ -26,7 +26,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/pkg/console"
)

2
cmd/health_v1.go
View File

@ -23,7 +23,7 @@ import (
"sync"
"time"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/shirou/gopsutil/v3/cpu"

2
cmd/idp-ldap-policy-subcommands.go
View File

@ -26,7 +26,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/idp-ldap-subcommands.go
View File

@ -22,7 +22,7 @@ import (
"strings"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/idp-openid-subcommands.go
View File

@ -24,7 +24,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/ilm-tier-add.go
View File

@ -25,7 +25,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/ilm-tier-edit.go
View File

@ -22,7 +22,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/ilm-tier-info-ui.go
View File

@ -23,7 +23,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/gdamore/tcell/v2"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/navidys/tvxwidgets"
"github.com/rivo/tview"
)

2
cmd/ilm-tier-info.go
View File

@ -25,7 +25,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
"github.com/rivo/tview"

2
cmd/ilm-tier-list.go
View File

@ -21,7 +21,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
madmin "github.com/minio/madmin-go/v2"
madmin "github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/license-register.go
View File

@ -23,7 +23,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/ping.go
View File

@ -31,7 +31,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/quota-clear.go
View File

@ -20,7 +20,7 @@ package cmd
import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/quota-set.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/ready.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/replicate-add.go
View File

@ -30,7 +30,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/replication"
"github.com/minio/minio-go/v7/pkg/s3utils"

2
cmd/replicate-diff.go
View File

@ -33,7 +33,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/replicate-list.go
View File

@ -26,7 +26,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/replication"
"github.com/minio/pkg/console"

2
cmd/replicate-status.go
View File

@ -27,7 +27,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/replication"
"github.com/minio/pkg/console"

2
cmd/replicate-update.go
View File

@ -28,7 +28,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/replication"
"github.com/minio/minio-go/v7/pkg/s3utils"

2
cmd/speedtest-spinner.go
View File

@ -26,7 +26,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
humanize "github.com/dustin/go-humanize"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/olekukonko/tablewriter"
)

2
cmd/stat.go
View File

@ -29,7 +29,7 @@ import (
"github.com/dustin/go-humanize"
json "github.com/minio/colorjson"
"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/lifecycle"

2
cmd/subnet-utils.go
View File

@ -35,7 +35,7 @@ import (
"github.com/google/uuid"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/licverifier"
"github.com/tidwall/gjson"

2
cmd/support-callhome.go
View File

@ -24,7 +24,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/support-diag.go
View File

@ -35,7 +35,7 @@ import (
"github.com/klauspost/compress/gzip"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
"github.com/tidwall/gjson"

2
cmd/support-inspect.go
View File

@ -34,7 +34,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/support-perf-drive.go
View File

@ -24,7 +24,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/dustin/go-humanize"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/support-perf-net.go
View File

@ -24,7 +24,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/support-perf-object.go
View File

@ -25,7 +25,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/dustin/go-humanize"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/support-perf.go
View File

@ -28,7 +28,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/support-profile.go
View File

@ -25,7 +25,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/pkg/console"

2
cmd/support-top-api.go
View File

@ -22,7 +22,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/support-top-drive.go
View File

@ -23,7 +23,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/minio/cli"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
)

2
cmd/support-top-locks.go
View File

@ -24,7 +24,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/pkg/console"
)

2
cmd/support.go
View File

@ -23,7 +23,7 @@ import (
"github.com/fatih/color"
"github.com/minio/cli"
json "github.com/minio/colorjson"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/mc/pkg/probe"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/pkg/console"

2
cmd/top-api-spinner.go
View File

@ -28,7 +28,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/dustin/go-humanize"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/olekukonko/tablewriter"
)

2
cmd/top-drives-spinner.go
View File

@ -25,7 +25,7 @@ import (
"github.com/charmbracelet/bubbles/spinner"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/olekukonko/tablewriter"
)

2
cmd/utils.go
View File

@ -35,7 +35,7 @@ import (
"time"
"github.com/mattn/go-ieproxy"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/encrypt"

2
go.mod
View File

@ -19,7 +19,6 @@ require (
github.com/minio/cli v1.24.2
github.com/minio/colorjson v1.0.4
github.com/minio/filepath v1.0.0
github.com/minio/madmin-go/v2 v2.2.0
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.55-0.20230525060734-b7836f021bfb
github.com/minio/pkg v1.6.5
@ -48,6 +47,7 @@ require (
github.com/gdamore/tcell/v2 v2.6.0
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/juju/ratelimit v1.0.2
github.com/minio/madmin-go/v3 v3.0.1
github.com/muesli/reflow v0.3.0
github.com/navidys/tvxwidgets v0.3.0
github.com/olekukonko/tablewriter v0.0.5

4
go.sum
View File

@ -521,8 +521,8 @@ github.com/minio/colorjson v1.0.4/go.mod h1:ZgE8vYon4xC4yfBPclP/2gqMRYw+p+xRsBbL
github.com/minio/filepath v1.0.0 h1:fvkJu1+6X+ECRA6G3+JJETj4QeAYO9sV43I79H8ubDY=
github.com/minio/filepath v1.0.0/go.mod h1:/nRZA2ldl5z6jT9/KQuvZcQlxZIMQoFFQPvEXx9T/Bw=
github.com/minio/madmin-go v1.6.6/go.mod h1:ATvkBOLiP3av4D++2v1UEHC/QzsGtgXD5kYvvRYzdKs=
github.com/minio/madmin-go/v2 v2.2.0 h1:DtJPzallTD/7wx0ZaxPBl+HrKgI5L5Z+ULa6tAMvuH8=
github.com/minio/madmin-go/v2 v2.2.0/go.mod h1:8bL1RMNkblIENFSgGYjeHrzUx9PxROb7OqfNuMU9ivE=
github.com/minio/madmin-go/v3 v3.0.1 h1:+WuNw0q8gYTNHUmV5X1nCox28uYmJkeMT75vh9VKPkA=
github.com/minio/madmin-go/v3 v3.0.1/go.mod h1:lPrMoc1aeiIWmmrxBthkDqzMPQwC/Lu9ByuyM2wenJk=
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=