mirror of
https://github.com/minio/mc.git
synced 2025-11-10 13:42:32 +03:00
Fix error message wording in mc admin commands (#2887)
This commit is contained in:
@@ -83,7 +83,7 @@ func mainAdminConfigGet(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
// Call get config API
|
||||
c, e := client.GetConfig()
|
||||
|
||||
@@ -107,7 +107,7 @@ func mainAdminConfigSet(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
// Call get config API
|
||||
fatalIf(probe.NewError(client.SetConfig(os.Stdin)), "Cannot set server configuration file.")
|
||||
|
||||
@@ -122,7 +122,7 @@ func mainAdminGroupAdd(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
members := []string{}
|
||||
for i := 2; i < ctx.NArg(); i++ {
|
||||
|
||||
@@ -66,7 +66,7 @@ func mainAdminGroupEnableDisable(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
group := args.Get(1)
|
||||
var err1 error
|
||||
|
||||
@@ -63,7 +63,7 @@ func mainAdminGroupInfo(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
group := args.Get(1)
|
||||
gd, err1 := client.GetGroupDescription(group)
|
||||
|
||||
@@ -63,7 +63,7 @@ func mainAdminGroupList(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
gs, err1 := client.ListGroups()
|
||||
fatalIf(probe.NewError(err1).Trace(args...), "Could not get group list")
|
||||
|
||||
@@ -67,7 +67,7 @@ func mainAdminGroupRemove(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
members := []string{}
|
||||
for i := 2; i < ctx.NArg(); i++ {
|
||||
|
||||
@@ -119,7 +119,7 @@ func mainAdminCPUInfo(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO admin client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
printOfflineErrorMessage := func(err error) {
|
||||
errMsg := ""
|
||||
|
||||
@@ -121,7 +121,7 @@ func mainAdminMemInfo(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO admin client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
printOfflineErrorMessage := func(err error) {
|
||||
errMsg := ""
|
||||
|
||||
@@ -243,7 +243,7 @@ func mainAdminServerInfo(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
printOfflineErrorMessage := func(err error) {
|
||||
errMsg := ""
|
||||
|
||||
@@ -119,7 +119,7 @@ func mainAdminPolicyAdd(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
fatalIf(probe.NewError(client.AddCannedPolicy(args.Get(1), string(policy))).Trace(args...), "Cannot add new policy")
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ func mainAdminPolicyInfo(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
policies, e := client.ListCannedPolicies()
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot list policy")
|
||||
|
||||
@@ -64,7 +64,7 @@ func mainAdminPolicyList(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
policies, e := client.ListCannedPolicies()
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot list policy")
|
||||
|
||||
@@ -66,7 +66,7 @@ func mainAdminPolicyRemove(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
fatalIf(probe.NewError(client.RemoveCannedPolicy(args.Get(1))).Trace(args...), "Cannot remove policy")
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@ func mainAdminPolicySet(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
e := client.SetPolicy(policyName, userOrGroup, isGroup)
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ func mainAdminServiceRestart(ctx *cli.Context) error {
|
||||
aliasedURL := args.Get(0)
|
||||
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
// Restart the specified MinIO server
|
||||
fatalIf(probe.NewError(client.ServiceRestart()), "Cannot restart the server.")
|
||||
|
||||
@@ -84,7 +84,7 @@ func mainAdminServiceStop(ctx *cli.Context) error {
|
||||
aliasedURL := args.Get(0)
|
||||
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
// Stop the specified MinIO server
|
||||
fatalIf(probe.NewError(client.ServiceStop()), "Unable to stop the server.")
|
||||
|
||||
@@ -111,7 +111,7 @@ func mainAdminTopLocks(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
// Call top locks API
|
||||
entries, e := client.TopLocks()
|
||||
|
||||
@@ -97,7 +97,7 @@ func mainAdminServerUpdate(ctx *cli.Context) error {
|
||||
aliasedURL := args.Get(0)
|
||||
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
updateURL := args.Get(1)
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ func mainAdminUserAdd(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
fatalIf(probe.NewError(client.AddUser(args.Get(1), args.Get(2))).Trace(args...), "Cannot add new user")
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ func mainAdminUserDisable(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
e := client.SetUserStatus(args.Get(1), madmin.AccountDisabled)
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot disable user")
|
||||
|
||||
@@ -64,7 +64,7 @@ func mainAdminUserEnable(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
e := client.SetUserStatus(args.Get(1), madmin.AccountEnabled)
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot enable user")
|
||||
|
||||
@@ -63,7 +63,7 @@ func mainAdminUserInfo(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
user, e := client.GetUserInfo(args.Get(1))
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot get user info")
|
||||
|
||||
@@ -67,7 +67,7 @@ func mainAdminUserList(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
users, e := client.ListUsers()
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot list user")
|
||||
|
||||
@@ -63,7 +63,7 @@ func mainAdminUserRemove(ctx *cli.Context) error {
|
||||
|
||||
// Create a new MinIO Admin Client
|
||||
client, err := newAdminClient(aliasedURL)
|
||||
fatalIf(err, "Cannot get a configured admin connection.")
|
||||
fatalIf(err, "Unable to initialize admin connection.")
|
||||
|
||||
e := client.RemoveUser(args.Get(1))
|
||||
fatalIf(probe.NewError(e).Trace(args...), "Cannot remove new user")
|
||||
|
||||
@@ -121,7 +121,7 @@ func newAdminClient(aliasedURL string) (*madmin.AdminClient, *probe.Error) {
|
||||
}
|
||||
|
||||
if hostCfg == nil {
|
||||
return nil, probe.NewError(fmt.Errorf("The specified alias: %s not found", urlStrFull))
|
||||
return nil, probe.NewError(fmt.Errorf("No valid configuration found for '%s' host alias", urlStrFull))
|
||||
}
|
||||
|
||||
s3Config := newS3Config(urlStrFull, hostCfg)
|
||||
|
||||
Reference in New Issue
Block a user