Skip to content

Commit 5f39522

Browse files
donatellodonatello
authored
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
1 parent bf3924b commit 5f39522

File tree

79 files changed

+107
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+107
-113
lines changed

‎cmd/admin-cluster-bucket-import.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/klauspost/compress/zip"
3131
"github.com/minio/cli"
3232
json "github.com/minio/colorjson"
33-
"github.com/minio/madmin-go/v2"
33+
"github.com/minio/madmin-go/v3"
3434
"github.com/minio/mc/pkg/probe"
3535
"github.com/minio/pkg/console"
3636
)

‎cmd/admin-config-get.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/fatih/color"
2828
"github.com/minio/cli"
2929
json "github.com/minio/colorjson"
30-
"github.com/minio/madmin-go/v2"
30+
"github.com/minio/madmin-go/v3"
3131
"github.com/minio/mc/pkg/probe"
3232
"github.com/minio/pkg/console"
3333
)

‎cmd/admin-config-help.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/fatih/color"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
)
3030

‎cmd/admin-config-set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

‎cmd/admin-decom-cancel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
humanize "github.com/dustin/go-humanize"
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
26-
"github.com/minio/madmin-go/v2"
26+
"github.com/minio/madmin-go/v3"
2727
"github.com/minio/mc/pkg/probe"
2828
"github.com/minio/pkg/console"
2929
)

‎cmd/admin-group-add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

‎cmd/admin-group-enable.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"github.com/fatih/color"
2222
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
"github.com/minio/mc/pkg/probe"
2525
"github.com/minio/pkg/console"
2626
)

‎cmd/admin-group-remove.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"github.com/fatih/color"
2222
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
"github.com/minio/mc/pkg/probe"
2525
"github.com/minio/pkg/console"
2626
)

‎cmd/admin-heal-result-item.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"fmt"
2222

23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
)
2525

2626
type hri struct {

‎cmd/admin-heal-ui.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
humanize "github.com/dustin/go-humanize"
2828
"github.com/fatih/color"
2929
json "github.com/minio/colorjson"
30-
"github.com/minio/madmin-go/v2"
30+
"github.com/minio/madmin-go/v3"
3131
"github.com/minio/mc/pkg/probe"
3232
"github.com/minio/pkg/console"
3333
)

‎cmd/admin-heal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/fatih/color"
3030
"github.com/minio/cli"
3131
json "github.com/minio/colorjson"
32-
"github.com/minio/madmin-go/v2"
32+
"github.com/minio/madmin-go/v3"
3333
"github.com/minio/mc/pkg/probe"
3434
"github.com/minio/pkg/console"
3535
)

‎cmd/admin-info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/fatih/color"
3131
"github.com/minio/cli"
3232
json "github.com/minio/colorjson"
33-
"github.com/minio/madmin-go/v2"
33+
"github.com/minio/madmin-go/v3"
3434
"github.com/minio/mc/pkg/probe"
3535
"github.com/minio/minio-go/v7/pkg/set"
3636
"github.com/minio/pkg/console"

‎cmd/admin-logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/fatih/color"
2727
"github.com/minio/cli"
2828
json "github.com/minio/colorjson"
29-
"github.com/minio/madmin-go/v2"
29+
"github.com/minio/madmin-go/v3"
3030
"github.com/minio/mc/pkg/probe"
3131
"github.com/minio/pkg/console"
3232
)

‎cmd/admin-policy-attach.go

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
package cmd
1919

2020
import (
21-
"github.com/fatih/color"
2221
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
22+
"github.com/minio/madmin-go/v3"
2423
"github.com/minio/mc/pkg/probe"
25-
"github.com/minio/pkg/console"
2624
)
2725

2826
var adminAttachPolicyFlags = []cli.Flag{
@@ -74,57 +72,53 @@ func userAttachOrDetachPolicy(ctx *cli.Context, attach bool) error {
7472
if len(ctx.Args()) < 2 {
7573
showCommandHelpAndExit(ctx, 1) // last argument is exit code
7674
}
77-
78-
console.SetColor("PolicyMessage", color.New(color.FgGreen))
79-
console.SetColor("Policy", color.New(color.FgBlue))
75+
user := ctx.String("user")
76+
group := ctx.String("group")
8077

8178
// Get the alias parameter from cli
8279
args := ctx.Args()
8380
aliasedURL := args.Get(0)
8481

85-
// Put args in PolicyAssociationReq, client checks for validity
82+
policies := args[1:]
8683
req := madmin.PolicyAssociationReq{
87-
User: ctx.String("user"),
88-
Group: ctx.String("group"),
89-
Policies: args.Tail(),
84+
User: user,
85+
Group: group,
86+
Policies: policies,
9087
}
9188

9289
// Create a new MinIO Admin Client
9390
client, err := newAdminClient(aliasedURL)
9491
fatalIf(err, "Unable to initialize admin connection.")
9592

9693
var e error
94+
var res madmin.PolicyAssociationResp
9795
if attach {
98-
e = client.AttachPolicy(globalContext, req)
96+
res, e = client.AttachPolicy(globalContext, req)
9997
} else {
100-
e = client.DetachPolicy(globalContext, req)
101-
}
102-
103-
isGroup := false
104-
if req.User == "" {
105-
isGroup = true
106-
}
107-
108-
userOrGroup := req.User
109-
if isGroup {
110-
userOrGroup = req.Group
98+
res, e = client.DetachPolicy(globalContext, req)
11199
}
100+
fatalIf(probe.NewError(e), "Unable to make user/group policy association")
112101

113-
if e == nil {
114-
for _, policy := range req.Policies {
115-
printMsg(userPolicyMessage{
116-
op: ctx.Command.Name,
117-
Policy: policy,
118-
UserOrGroup: userOrGroup,
119-
IsGroup: isGroup,
120-
})
121-
}
122-
} else {
102+
var emptyResp madmin.PolicyAssociationResp
103+
if res.UpdatedAt == emptyResp.UpdatedAt {
104+
// Older minio does not send a result, so we populate res manually to
105+
// simulate a result. TODO(aditya): remove this after newer minio is
106+
// released in a few months (Older API Deprecated in Jun 2023)
123107
if attach {
124-
fatalIf(probe.NewError(e), "Unable to attach the policy")
108+
res.PoliciesAttached = policies
125109
} else {
126-
fatalIf(probe.NewError(e), "Unable to detach the policy")
110+
res.PoliciesDetached = policies
127111
}
128112
}
113+
114+
m := policyAssociationMessage{
115+
attach: attach,
116+
Status: "success",
117+
PoliciesAttached: res.PoliciesAttached,
118+
PoliciesDetached: res.PoliciesDetached,
119+
User: user,
120+
Group: group,
121+
}
122+
printMsg(m)
129123
return nil
130124
}

‎cmd/admin-policy-create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

‎cmd/admin-policy-entities.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package cmd
1919

2020
import (
2121
"github.com/minio/cli"
22-
"github.com/minio/madmin-go/v2"
22+
"github.com/minio/madmin-go/v3"
2323
"github.com/minio/mc/pkg/probe"
2424
)
2525

‎cmd/admin-policy-info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/fatih/color"
2424
"github.com/minio/cli"
25-
"github.com/minio/madmin-go/v2"
25+
"github.com/minio/madmin-go/v3"
2626
"github.com/minio/mc/pkg/probe"
2727
"github.com/minio/pkg/console"
2828
)

‎cmd/admin-replicate-add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/fatih/color"
2424
"github.com/minio/cli"
2525
json "github.com/minio/colorjson"
26-
"github.com/minio/madmin-go/v2"
26+
"github.com/minio/madmin-go/v3"
2727
"github.com/minio/mc/pkg/probe"
2828
"github.com/minio/pkg/console"
2929
)

‎cmd/admin-replicate-info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/fatih/color"
2424
"github.com/minio/cli"
2525
json "github.com/minio/colorjson"
26-
"github.com/minio/madmin-go/v2"
26+
"github.com/minio/madmin-go/v3"
2727
"github.com/minio/mc/pkg/probe"
2828
"github.com/minio/pkg/console"
2929
)

‎cmd/admin-replicate-remove.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/fatih/color"
2424
"github.com/minio/cli"
2525
json "github.com/minio/colorjson"
26-
"github.com/minio/madmin-go/v2"
26+
"github.com/minio/madmin-go/v3"
2727
"github.com/minio/mc/pkg/probe"
2828
"github.com/minio/pkg/console"
2929
)

‎cmd/admin-replicate-resync-cancel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

‎cmd/admin-replicate-resync-start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

‎cmd/admin-replicate-resync-status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/dustin/go-humanize"
3131
"github.com/fatih/color"
3232
"github.com/minio/cli"
33-
"github.com/minio/madmin-go/v2"
33+
"github.com/minio/madmin-go/v3"
3434
"github.com/minio/mc/pkg/probe"
3535
"github.com/minio/pkg/console"
3636
"github.com/olekukonko/tablewriter"

‎cmd/admin-replicate-status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/fatih/color"
2626
"github.com/minio/cli"
2727
json "github.com/minio/colorjson"
28-
"github.com/minio/madmin-go/v2"
28+
"github.com/minio/madmin-go/v3"
2929
"github.com/minio/mc/pkg/probe"
3030
"github.com/minio/pkg/console"
3131
)

‎cmd/admin-replicate-update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/fatih/color"
2525
"github.com/minio/cli"
2626
json "github.com/minio/colorjson"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

‎cmd/admin-scanner-status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/fatih/color"
3333
"github.com/minio/cli"
3434
json "github.com/minio/colorjson"
35-
"github.com/minio/madmin-go/v2"
35+
"github.com/minio/madmin-go/v3"
3636
"github.com/minio/mc/pkg/probe"
3737
"github.com/minio/pkg/console"
3838
"github.com/olekukonko/tablewriter"

‎cmd/admin-service-restart.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/fatih/color"
2626
"github.com/minio/cli"
2727
json "github.com/minio/colorjson"
28-
"github.com/minio/madmin-go/v2"
28+
"github.com/minio/madmin-go/v3"
2929
"github.com/minio/mc/pkg/probe"
3030
"github.com/minio/pkg/console"
3131
)

‎cmd/admin-trace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/fatih/color"
3333
"github.com/minio/cli"
3434
json "github.com/minio/colorjson"
35-
"github.com/minio/madmin-go/v2"
35+
"github.com/minio/madmin-go/v3"
3636
"github.com/minio/mc/pkg/probe"
3737
"github.com/minio/pkg/console"
3838
)

‎cmd/admin-user-disable.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"github.com/fatih/color"
2222
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
"github.com/minio/mc/pkg/probe"
2525
"github.com/minio/pkg/console"
2626
)

‎cmd/admin-user-enable.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"github.com/fatih/color"
2222
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
"github.com/minio/mc/pkg/probe"
2525
"github.com/minio/pkg/console"
2626
)

‎cmd/admin-user-svcacct-add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/fatih/color"
3131
"github.com/minio/cli"
3232
json "github.com/minio/colorjson"
33-
"github.com/minio/madmin-go/v2"
33+
"github.com/minio/madmin-go/v3"
3434
"github.com/minio/mc/pkg/probe"
3535
"github.com/minio/pkg/console"
3636
iampolicy "github.com/minio/pkg/iam/policy"

‎cmd/admin-user-svcacct-disable.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"github.com/fatih/color"
2222
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
"github.com/minio/mc/pkg/probe"
2525
"github.com/minio/pkg/console"
2626
)

‎cmd/admin-user-svcacct-enable.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package cmd
2020
import (
2121
"github.com/fatih/color"
2222
"github.com/minio/cli"
23-
"github.com/minio/madmin-go/v2"
23+
"github.com/minio/madmin-go/v3"
2424
"github.com/minio/mc/pkg/probe"
2525
"github.com/minio/pkg/console"
2626
)

‎cmd/admin-user-svcacct-set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/fatih/color"
2626
"github.com/minio/cli"
27-
"github.com/minio/madmin-go/v2"
27+
"github.com/minio/madmin-go/v3"
2828
"github.com/minio/mc/pkg/probe"
2929
"github.com/minio/pkg/console"
3030
)

0 commit comments

Comments
 (0)