From 5f39522e69025bea6be0d350b65fdec2de2785c8 Mon Sep 17 00:00:00 2001 From: Aditya Manthramurthy Date: Mon, 19 Jun 2023 12:31:19 -0700 Subject: [PATCH] Add response details for policy attach/detach cmd (#4602) 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 --- cmd/admin-cluster-bucket-import.go | 2 +- cmd/admin-config-get.go | 2 +- cmd/admin-config-help.go | 2 +- cmd/admin-config-set.go | 2 +- cmd/admin-decom-cancel.go | 2 +- cmd/admin-group-add.go | 2 +- cmd/admin-group-enable.go | 2 +- cmd/admin-group-remove.go | 2 +- cmd/admin-heal-result-item.go | 2 +- cmd/admin-heal-ui.go | 2 +- cmd/admin-heal.go | 2 +- cmd/admin-info.go | 2 +- cmd/admin-logs.go | 2 +- cmd/admin-policy-attach.go | 62 +++++++++++++--------------- cmd/admin-policy-create.go | 2 +- cmd/admin-policy-entities.go | 2 +- cmd/admin-policy-info.go | 2 +- cmd/admin-replicate-add.go | 2 +- cmd/admin-replicate-info.go | 2 +- cmd/admin-replicate-remove.go | 2 +- cmd/admin-replicate-resync-cancel.go | 2 +- cmd/admin-replicate-resync-start.go | 2 +- cmd/admin-replicate-resync-status.go | 2 +- cmd/admin-replicate-status.go | 2 +- cmd/admin-replicate-update.go | 2 +- cmd/admin-scanner-status.go | 2 +- cmd/admin-service-restart.go | 2 +- cmd/admin-trace.go | 2 +- cmd/admin-user-disable.go | 2 +- cmd/admin-user-enable.go | 2 +- cmd/admin-user-svcacct-add.go | 2 +- cmd/admin-user-svcacct-disable.go | 2 +- cmd/admin-user-svcacct-enable.go | 2 +- cmd/admin-user-svcacct-set.go | 2 +- cmd/batch-generate.go | 2 +- cmd/batch-list.go | 2 +- cmd/batch-start.go | 2 +- cmd/batch-status.go | 2 +- cmd/client-admin.go | 2 +- cmd/globals.go | 2 +- cmd/health_v1.go | 2 +- cmd/idp-ldap-policy-subcommands.go | 2 +- cmd/idp-ldap-subcommands.go | 2 +- cmd/idp-openid-subcommands.go | 2 +- cmd/ilm-tier-add.go | 2 +- cmd/ilm-tier-edit.go | 2 +- cmd/ilm-tier-info-ui.go | 2 +- cmd/ilm-tier-info.go | 2 +- cmd/ilm-tier-list.go | 2 +- cmd/license-register.go | 2 +- cmd/ping.go | 2 +- cmd/quota-clear.go | 2 +- cmd/quota-set.go | 2 +- cmd/ready.go | 2 +- cmd/replicate-add.go | 2 +- cmd/replicate-diff.go | 2 +- cmd/replicate-list.go | 2 +- cmd/replicate-status.go | 2 +- cmd/replicate-update.go | 2 +- cmd/speedtest-spinner.go | 2 +- cmd/stat.go | 2 +- cmd/subnet-utils.go | 2 +- cmd/support-callhome.go | 2 +- cmd/support-diag.go | 2 +- cmd/support-inspect.go | 2 +- cmd/support-perf-drive.go | 2 +- cmd/support-perf-net.go | 2 +- cmd/support-perf-object.go | 2 +- cmd/support-perf.go | 2 +- cmd/support-profile.go | 2 +- cmd/support-top-api.go | 2 +- cmd/support-top-drive.go | 2 +- cmd/support-top-locks.go | 2 +- cmd/support.go | 2 +- cmd/top-api-spinner.go | 2 +- cmd/top-drives-spinner.go | 2 +- cmd/utils.go | 2 +- go.mod | 2 +- go.sum | 4 +- 79 files changed, 107 insertions(+), 113 deletions(-) diff --git a/cmd/admin-cluster-bucket-import.go b/cmd/admin-cluster-bucket-import.go index f4234619..46e9e5e5 100644 --- a/cmd/admin-cluster-bucket-import.go +++ b/cmd/admin-cluster-bucket-import.go @@ -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" ) diff --git a/cmd/admin-config-get.go b/cmd/admin-config-get.go index 5d4c4858..18ab8434 100644 --- a/cmd/admin-config-get.go +++ b/cmd/admin-config-get.go @@ -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" ) diff --git a/cmd/admin-config-help.go b/cmd/admin-config-help.go index 012813e7..9f16dd68 100644 --- a/cmd/admin-config-help.go +++ b/cmd/admin-config-help.go @@ -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" ) diff --git a/cmd/admin-config-set.go b/cmd/admin-config-set.go index 7385464f..6d8a7311 100644 --- a/cmd/admin-config-set.go +++ b/cmd/admin-config-set.go @@ -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" ) diff --git a/cmd/admin-decom-cancel.go b/cmd/admin-decom-cancel.go index b7570ff0..88e3ed14 100644 --- a/cmd/admin-decom-cancel.go +++ b/cmd/admin-decom-cancel.go @@ -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" ) diff --git a/cmd/admin-group-add.go b/cmd/admin-group-add.go index 87fb9c9d..967b4179 100644 --- a/cmd/admin-group-add.go +++ b/cmd/admin-group-add.go @@ -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" ) diff --git a/cmd/admin-group-enable.go b/cmd/admin-group-enable.go index baaaf7b6..998a8a3f 100644 --- a/cmd/admin-group-enable.go +++ b/cmd/admin-group-enable.go @@ -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" ) diff --git a/cmd/admin-group-remove.go b/cmd/admin-group-remove.go index a5551b51..042451d3 100644 --- a/cmd/admin-group-remove.go +++ b/cmd/admin-group-remove.go @@ -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" ) diff --git a/cmd/admin-heal-result-item.go b/cmd/admin-heal-result-item.go index 3426923c..23904537 100644 --- a/cmd/admin-heal-result-item.go +++ b/cmd/admin-heal-result-item.go @@ -20,7 +20,7 @@ package cmd import ( "fmt" - "github.com/minio/madmin-go/v2" + "github.com/minio/madmin-go/v3" ) type hri struct { diff --git a/cmd/admin-heal-ui.go b/cmd/admin-heal-ui.go index 1feb9977..8b46d406 100644 --- a/cmd/admin-heal-ui.go +++ b/cmd/admin-heal-ui.go @@ -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" ) diff --git a/cmd/admin-heal.go b/cmd/admin-heal.go index 02a30b4d..46c74d6c 100644 --- a/cmd/admin-heal.go +++ b/cmd/admin-heal.go @@ -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" ) diff --git a/cmd/admin-info.go b/cmd/admin-info.go index d3f3fcab..48b7207c 100644 --- a/cmd/admin-info.go +++ b/cmd/admin-info.go @@ -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" diff --git a/cmd/admin-logs.go b/cmd/admin-logs.go index 4b573b5b..9069cfea 100644 --- a/cmd/admin-logs.go +++ b/cmd/admin-logs.go @@ -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" ) diff --git a/cmd/admin-policy-attach.go b/cmd/admin-policy-attach.go index 1453db4c..e37b3a03 100644 --- a/cmd/admin-policy-attach.go +++ b/cmd/admin-policy-attach.go @@ -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 } diff --git a/cmd/admin-policy-create.go b/cmd/admin-policy-create.go index 3e567a0b..99bcc934 100644 --- a/cmd/admin-policy-create.go +++ b/cmd/admin-policy-create.go @@ -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" ) diff --git a/cmd/admin-policy-entities.go b/cmd/admin-policy-entities.go index fb51185e..8f17fb88 100644 --- a/cmd/admin-policy-entities.go +++ b/cmd/admin-policy-entities.go @@ -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" ) diff --git a/cmd/admin-policy-info.go b/cmd/admin-policy-info.go index 99549c46..44d2e353 100644 --- a/cmd/admin-policy-info.go +++ b/cmd/admin-policy-info.go @@ -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" ) diff --git a/cmd/admin-replicate-add.go b/cmd/admin-replicate-add.go index 72b39735..5f7f3dac 100644 --- a/cmd/admin-replicate-add.go +++ b/cmd/admin-replicate-add.go @@ -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" ) diff --git a/cmd/admin-replicate-info.go b/cmd/admin-replicate-info.go index a9a2e1b0..f1c727c2 100644 --- a/cmd/admin-replicate-info.go +++ b/cmd/admin-replicate-info.go @@ -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" ) diff --git a/cmd/admin-replicate-remove.go b/cmd/admin-replicate-remove.go index 7609d2cc..30802848 100644 --- a/cmd/admin-replicate-remove.go +++ b/cmd/admin-replicate-remove.go @@ -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" ) diff --git a/cmd/admin-replicate-resync-cancel.go b/cmd/admin-replicate-resync-cancel.go index 9c604834..b7be140a 100644 --- a/cmd/admin-replicate-resync-cancel.go +++ b/cmd/admin-replicate-resync-cancel.go @@ -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" ) diff --git a/cmd/admin-replicate-resync-start.go b/cmd/admin-replicate-resync-start.go index 204aa6b2..040558ed 100644 --- a/cmd/admin-replicate-resync-start.go +++ b/cmd/admin-replicate-resync-start.go @@ -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" ) diff --git a/cmd/admin-replicate-resync-status.go b/cmd/admin-replicate-resync-status.go index 67eb1377..8f87308a 100644 --- a/cmd/admin-replicate-resync-status.go +++ b/cmd/admin-replicate-resync-status.go @@ -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" diff --git a/cmd/admin-replicate-status.go b/cmd/admin-replicate-status.go index b97c834e..ec160189 100644 --- a/cmd/admin-replicate-status.go +++ b/cmd/admin-replicate-status.go @@ -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" ) diff --git a/cmd/admin-replicate-update.go b/cmd/admin-replicate-update.go index 6e73e6e0..46bc441c 100644 --- a/cmd/admin-replicate-update.go +++ b/cmd/admin-replicate-update.go @@ -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" ) diff --git a/cmd/admin-scanner-status.go b/cmd/admin-scanner-status.go index f570c9b0..6d06c210 100644 --- a/cmd/admin-scanner-status.go +++ b/cmd/admin-scanner-status.go @@ -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" diff --git a/cmd/admin-service-restart.go b/cmd/admin-service-restart.go index f119de2b..bd79613b 100644 --- a/cmd/admin-service-restart.go +++ b/cmd/admin-service-restart.go @@ -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" ) diff --git a/cmd/admin-trace.go b/cmd/admin-trace.go index 3139c277..89fd3832 100644 --- a/cmd/admin-trace.go +++ b/cmd/admin-trace.go @@ -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" ) diff --git a/cmd/admin-user-disable.go b/cmd/admin-user-disable.go index a01e8e70..a0b395f2 100644 --- a/cmd/admin-user-disable.go +++ b/cmd/admin-user-disable.go @@ -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" ) diff --git a/cmd/admin-user-enable.go b/cmd/admin-user-enable.go index 99e52d8e..4fc629cf 100644 --- a/cmd/admin-user-enable.go +++ b/cmd/admin-user-enable.go @@ -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" ) diff --git a/cmd/admin-user-svcacct-add.go b/cmd/admin-user-svcacct-add.go index 4ca65887..58cbba90 100644 --- a/cmd/admin-user-svcacct-add.go +++ b/cmd/admin-user-svcacct-add.go @@ -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" diff --git a/cmd/admin-user-svcacct-disable.go b/cmd/admin-user-svcacct-disable.go index d10b2171..48d6d189 100644 --- a/cmd/admin-user-svcacct-disable.go +++ b/cmd/admin-user-svcacct-disable.go @@ -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" ) diff --git a/cmd/admin-user-svcacct-enable.go b/cmd/admin-user-svcacct-enable.go index 3daaab36..25683fed 100644 --- a/cmd/admin-user-svcacct-enable.go +++ b/cmd/admin-user-svcacct-enable.go @@ -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" ) diff --git a/cmd/admin-user-svcacct-set.go b/cmd/admin-user-svcacct-set.go index 6ba6cebb..b5192464 100644 --- a/cmd/admin-user-svcacct-set.go +++ b/cmd/admin-user-svcacct-set.go @@ -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" ) diff --git a/cmd/batch-generate.go b/cmd/batch-generate.go index 0bbe2ca6..728831a8 100644 --- a/cmd/batch-generate.go +++ b/cmd/batch-generate.go @@ -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" ) diff --git a/cmd/batch-list.go b/cmd/batch-list.go index 6c9cc639..3634c64b 100644 --- a/cmd/batch-list.go +++ b/cmd/batch-list.go @@ -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" ) diff --git a/cmd/batch-start.go b/cmd/batch-start.go index a3eab24d..d6d11334 100644 --- a/cmd/batch-start.go +++ b/cmd/batch-start.go @@ -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" ) diff --git a/cmd/batch-status.go b/cmd/batch-status.go index 17476f05..801f166a 100644 --- a/cmd/batch-status.go +++ b/cmd/batch-status.go @@ -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" ) diff --git a/cmd/client-admin.go b/cmd/client-admin.go index 3f42f5b4..6f624139 100644 --- a/cmd/client-admin.go +++ b/cmd/client-admin.go @@ -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" diff --git a/cmd/globals.go b/cmd/globals.go index 70ef2733..94c9133c 100644 --- a/cmd/globals.go +++ b/cmd/globals.go @@ -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" ) diff --git a/cmd/health_v1.go b/cmd/health_v1.go index 9df8fa8c..961cbf45 100644 --- a/cmd/health_v1.go +++ b/cmd/health_v1.go @@ -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" diff --git a/cmd/idp-ldap-policy-subcommands.go b/cmd/idp-ldap-policy-subcommands.go index 3436dc64..544b1a48 100644 --- a/cmd/idp-ldap-policy-subcommands.go +++ b/cmd/idp-ldap-policy-subcommands.go @@ -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" ) diff --git a/cmd/idp-ldap-subcommands.go b/cmd/idp-ldap-subcommands.go index 9d974c9a..eb71f293 100644 --- a/cmd/idp-ldap-subcommands.go +++ b/cmd/idp-ldap-subcommands.go @@ -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" ) diff --git a/cmd/idp-openid-subcommands.go b/cmd/idp-openid-subcommands.go index 0876f175..46779199 100644 --- a/cmd/idp-openid-subcommands.go +++ b/cmd/idp-openid-subcommands.go @@ -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" ) diff --git a/cmd/ilm-tier-add.go b/cmd/ilm-tier-add.go index 43ad3c31..6614c33f 100644 --- a/cmd/ilm-tier-add.go +++ b/cmd/ilm-tier-add.go @@ -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" ) diff --git a/cmd/ilm-tier-edit.go b/cmd/ilm-tier-edit.go index f6cee6f9..65acd962 100644 --- a/cmd/ilm-tier-edit.go +++ b/cmd/ilm-tier-edit.go @@ -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" ) diff --git a/cmd/ilm-tier-info-ui.go b/cmd/ilm-tier-info-ui.go index 7dd8b7b9..fd7b844a 100644 --- a/cmd/ilm-tier-info-ui.go +++ b/cmd/ilm-tier-info-ui.go @@ -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" ) diff --git a/cmd/ilm-tier-info.go b/cmd/ilm-tier-info.go index 5f823416..8607b4d9 100644 --- a/cmd/ilm-tier-info.go +++ b/cmd/ilm-tier-info.go @@ -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" diff --git a/cmd/ilm-tier-list.go b/cmd/ilm-tier-list.go index 2e3ebe7b..d5dc76e9 100644 --- a/cmd/ilm-tier-list.go +++ b/cmd/ilm-tier-list.go @@ -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" ) diff --git a/cmd/license-register.go b/cmd/license-register.go index 0eea93af..a702a15e 100644 --- a/cmd/license-register.go +++ b/cmd/license-register.go @@ -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" ) diff --git a/cmd/ping.go b/cmd/ping.go index d51e82c9..f8d430af 100644 --- a/cmd/ping.go +++ b/cmd/ping.go @@ -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" ) diff --git a/cmd/quota-clear.go b/cmd/quota-clear.go index 7b1a5201..4606f929 100644 --- a/cmd/quota-clear.go +++ b/cmd/quota-clear.go @@ -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" ) diff --git a/cmd/quota-set.go b/cmd/quota-set.go index d5158762..da8eb3b3 100644 --- a/cmd/quota-set.go +++ b/cmd/quota-set.go @@ -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" ) diff --git a/cmd/ready.go b/cmd/ready.go index 3f53b261..c0755017 100644 --- a/cmd/ready.go +++ b/cmd/ready.go @@ -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" ) diff --git a/cmd/replicate-add.go b/cmd/replicate-add.go index 80b6f1fb..1bdfffa9 100644 --- a/cmd/replicate-add.go +++ b/cmd/replicate-add.go @@ -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" diff --git a/cmd/replicate-diff.go b/cmd/replicate-diff.go index 308b8cba..c8c5367c 100644 --- a/cmd/replicate-diff.go +++ b/cmd/replicate-diff.go @@ -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" ) diff --git a/cmd/replicate-list.go b/cmd/replicate-list.go index 7038e74d..8cd5269a 100644 --- a/cmd/replicate-list.go +++ b/cmd/replicate-list.go @@ -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" diff --git a/cmd/replicate-status.go b/cmd/replicate-status.go index 38056f6c..1515926e 100644 --- a/cmd/replicate-status.go +++ b/cmd/replicate-status.go @@ -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" diff --git a/cmd/replicate-update.go b/cmd/replicate-update.go index 0d37b507..3bd139e4 100644 --- a/cmd/replicate-update.go +++ b/cmd/replicate-update.go @@ -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" diff --git a/cmd/speedtest-spinner.go b/cmd/speedtest-spinner.go index 3a5de6f5..fb743a0f 100644 --- a/cmd/speedtest-spinner.go +++ b/cmd/speedtest-spinner.go @@ -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" ) diff --git a/cmd/stat.go b/cmd/stat.go index 216fca02..33ee8e0b 100644 --- a/cmd/stat.go +++ b/cmd/stat.go @@ -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" diff --git a/cmd/subnet-utils.go b/cmd/subnet-utils.go index 480576b5..7da74a4e 100644 --- a/cmd/subnet-utils.go +++ b/cmd/subnet-utils.go @@ -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" diff --git a/cmd/support-callhome.go b/cmd/support-callhome.go index 818d7942..4d84a4ea 100644 --- a/cmd/support-callhome.go +++ b/cmd/support-callhome.go @@ -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" ) diff --git a/cmd/support-diag.go b/cmd/support-diag.go index 85cf8e62..be84cb21 100644 --- a/cmd/support-diag.go +++ b/cmd/support-diag.go @@ -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" diff --git a/cmd/support-inspect.go b/cmd/support-inspect.go index 1dd19b00..dcc3b25a 100644 --- a/cmd/support-inspect.go +++ b/cmd/support-inspect.go @@ -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" ) diff --git a/cmd/support-perf-drive.go b/cmd/support-perf-drive.go index 51292b6a..7acfce7a 100644 --- a/cmd/support-perf-drive.go +++ b/cmd/support-perf-drive.go @@ -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" ) diff --git a/cmd/support-perf-net.go b/cmd/support-perf-net.go index 0d7b5d3e..6a5483a9 100644 --- a/cmd/support-perf-net.go +++ b/cmd/support-perf-net.go @@ -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" ) diff --git a/cmd/support-perf-object.go b/cmd/support-perf-object.go index 5d3e03bc..0fb59294 100644 --- a/cmd/support-perf-object.go +++ b/cmd/support-perf-object.go @@ -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" ) diff --git a/cmd/support-perf.go b/cmd/support-perf.go index c45b505c..dc414d00 100644 --- a/cmd/support-perf.go +++ b/cmd/support-perf.go @@ -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" ) diff --git a/cmd/support-profile.go b/cmd/support-profile.go index 42e7a94f..c4ddd5a2 100644 --- a/cmd/support-profile.go +++ b/cmd/support-profile.go @@ -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" diff --git a/cmd/support-top-api.go b/cmd/support-top-api.go index fa472a49..7e42f4f5 100644 --- a/cmd/support-top-api.go +++ b/cmd/support-top-api.go @@ -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" ) diff --git a/cmd/support-top-drive.go b/cmd/support-top-drive.go index b316aa68..d6884747 100644 --- a/cmd/support-top-drive.go +++ b/cmd/support-top-drive.go @@ -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" ) diff --git a/cmd/support-top-locks.go b/cmd/support-top-locks.go index bd091465..00c56799 100644 --- a/cmd/support-top-locks.go +++ b/cmd/support-top-locks.go @@ -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" ) diff --git a/cmd/support.go b/cmd/support.go index 0cf87677..385fd477 100644 --- a/cmd/support.go +++ b/cmd/support.go @@ -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" diff --git a/cmd/top-api-spinner.go b/cmd/top-api-spinner.go index 5051cf9d..833fb5ca 100644 --- a/cmd/top-api-spinner.go +++ b/cmd/top-api-spinner.go @@ -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" ) diff --git a/cmd/top-drives-spinner.go b/cmd/top-drives-spinner.go index ea659d30..ef9dfcaa 100644 --- a/cmd/top-drives-spinner.go +++ b/cmd/top-drives-spinner.go @@ -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" ) diff --git a/cmd/utils.go b/cmd/utils.go index b5c106c2..4d78577f 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -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" diff --git a/go.mod b/go.mod index 44d81499..1b82849a 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index a67013ba..5bb1602d 100644 --- a/go.sum +++ b/go.sum @@ -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=