From 1dd2b4494d4cce65b51a30d5800f3a8f4ea044f9 Mon Sep 17 00:00:00 2001 From: poornas Date: Fri, 6 Sep 2019 17:09:44 -0700 Subject: [PATCH] Fix error message wording in `mc admin` commands (#2887) --- cmd/admin-config-get.go | 2 +- cmd/admin-config-set.go | 2 +- cmd/admin-group-add.go | 2 +- cmd/admin-group-enable.go | 2 +- cmd/admin-group-info.go | 2 +- cmd/admin-group-list.go | 2 +- cmd/admin-group-remove.go | 2 +- cmd/admin-info-cpu.go | 2 +- cmd/admin-info-mem.go | 2 +- cmd/admin-info-server.go | 2 +- cmd/admin-policy-add.go | 2 +- cmd/admin-policy-info.go | 2 +- cmd/admin-policy-list.go | 2 +- cmd/admin-policy-remove.go | 2 +- cmd/admin-policy-set.go | 2 +- cmd/admin-service-restart.go | 2 +- cmd/admin-service-stop.go | 2 +- cmd/admin-top-locks.go | 2 +- cmd/admin-update.go | 2 +- cmd/admin-user-add.go | 2 +- cmd/admin-user-disable.go | 2 +- cmd/admin-user-enable.go | 2 +- cmd/admin-user-info.go | 2 +- cmd/admin-user-list.go | 2 +- cmd/admin-user-remove.go | 2 +- cmd/client-admin.go | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cmd/admin-config-get.go b/cmd/admin-config-get.go index 43fc8390..568e6362 100644 --- a/cmd/admin-config-get.go +++ b/cmd/admin-config-get.go @@ -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() diff --git a/cmd/admin-config-set.go b/cmd/admin-config-set.go index 91db37cb..75250af0 100644 --- a/cmd/admin-config-set.go +++ b/cmd/admin-config-set.go @@ -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.") diff --git a/cmd/admin-group-add.go b/cmd/admin-group-add.go index 35521953..5e257a08 100644 --- a/cmd/admin-group-add.go +++ b/cmd/admin-group-add.go @@ -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++ { diff --git a/cmd/admin-group-enable.go b/cmd/admin-group-enable.go index d56c25d3..1b4cd087 100644 --- a/cmd/admin-group-enable.go +++ b/cmd/admin-group-enable.go @@ -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 diff --git a/cmd/admin-group-info.go b/cmd/admin-group-info.go index 02d077e1..5b961534 100644 --- a/cmd/admin-group-info.go +++ b/cmd/admin-group-info.go @@ -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) diff --git a/cmd/admin-group-list.go b/cmd/admin-group-list.go index 60001f2c..be860f08 100644 --- a/cmd/admin-group-list.go +++ b/cmd/admin-group-list.go @@ -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") diff --git a/cmd/admin-group-remove.go b/cmd/admin-group-remove.go index b3311a7d..7c642300 100644 --- a/cmd/admin-group-remove.go +++ b/cmd/admin-group-remove.go @@ -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++ { diff --git a/cmd/admin-info-cpu.go b/cmd/admin-info-cpu.go index 3a2ab899..a85171e2 100644 --- a/cmd/admin-info-cpu.go +++ b/cmd/admin-info-cpu.go @@ -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 := "" diff --git a/cmd/admin-info-mem.go b/cmd/admin-info-mem.go index 5f16ef58..ed91f41d 100644 --- a/cmd/admin-info-mem.go +++ b/cmd/admin-info-mem.go @@ -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 := "" diff --git a/cmd/admin-info-server.go b/cmd/admin-info-server.go index 6bad3476..f1d977e5 100644 --- a/cmd/admin-info-server.go +++ b/cmd/admin-info-server.go @@ -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 := "" diff --git a/cmd/admin-policy-add.go b/cmd/admin-policy-add.go index 33be4af9..dfa82e36 100644 --- a/cmd/admin-policy-add.go +++ b/cmd/admin-policy-add.go @@ -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") diff --git a/cmd/admin-policy-info.go b/cmd/admin-policy-info.go index 6a7259db..154f5a15 100644 --- a/cmd/admin-policy-info.go +++ b/cmd/admin-policy-info.go @@ -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") diff --git a/cmd/admin-policy-list.go b/cmd/admin-policy-list.go index 232a9636..ff8908a0 100644 --- a/cmd/admin-policy-list.go +++ b/cmd/admin-policy-list.go @@ -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") diff --git a/cmd/admin-policy-remove.go b/cmd/admin-policy-remove.go index 2e4cb311..497d223f 100644 --- a/cmd/admin-policy-remove.go +++ b/cmd/admin-policy-remove.go @@ -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") diff --git a/cmd/admin-policy-set.go b/cmd/admin-policy-set.go index 9a9f14fa..0ac5b6c1 100644 --- a/cmd/admin-policy-set.go +++ b/cmd/admin-policy-set.go @@ -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) diff --git a/cmd/admin-service-restart.go b/cmd/admin-service-restart.go index b8ea09ca..df062bdc 100644 --- a/cmd/admin-service-restart.go +++ b/cmd/admin-service-restart.go @@ -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.") diff --git a/cmd/admin-service-stop.go b/cmd/admin-service-stop.go index de9229f4..3ddc94ab 100644 --- a/cmd/admin-service-stop.go +++ b/cmd/admin-service-stop.go @@ -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.") diff --git a/cmd/admin-top-locks.go b/cmd/admin-top-locks.go index 46a4e51d..c1d0e05d 100644 --- a/cmd/admin-top-locks.go +++ b/cmd/admin-top-locks.go @@ -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() diff --git a/cmd/admin-update.go b/cmd/admin-update.go index f0412eca..3df17921 100644 --- a/cmd/admin-update.go +++ b/cmd/admin-update.go @@ -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) diff --git a/cmd/admin-user-add.go b/cmd/admin-user-add.go index 74ab3e5a..b445279e 100644 --- a/cmd/admin-user-add.go +++ b/cmd/admin-user-add.go @@ -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") diff --git a/cmd/admin-user-disable.go b/cmd/admin-user-disable.go index 47ac50d8..12a19a43 100644 --- a/cmd/admin-user-disable.go +++ b/cmd/admin-user-disable.go @@ -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") diff --git a/cmd/admin-user-enable.go b/cmd/admin-user-enable.go index 39c19b4d..315bfe18 100644 --- a/cmd/admin-user-enable.go +++ b/cmd/admin-user-enable.go @@ -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") diff --git a/cmd/admin-user-info.go b/cmd/admin-user-info.go index 0bc89af4..2387cf52 100644 --- a/cmd/admin-user-info.go +++ b/cmd/admin-user-info.go @@ -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") diff --git a/cmd/admin-user-list.go b/cmd/admin-user-list.go index 2765a21d..a43b8d89 100644 --- a/cmd/admin-user-list.go +++ b/cmd/admin-user-list.go @@ -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") diff --git a/cmd/admin-user-remove.go b/cmd/admin-user-remove.go index 15c187a1..41194753 100644 --- a/cmd/admin-user-remove.go +++ b/cmd/admin-user-remove.go @@ -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") diff --git a/cmd/client-admin.go b/cmd/client-admin.go index 9ea8fb77..410824de 100644 --- a/cmd/client-admin.go +++ b/cmd/client-admin.go @@ -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)