admin: fatal message for unknown aliases (#1953)

This change issues a fatal message when the provided alias in cli is not known

cmd/admin-lock-clear.go

@@ -117,9 +117,7 @@ func mainAdminLockClear(ctx *cli.Context) error {
 
 	// Create a new Minio Admin Client
 	client, err := newAdminClient(aliasedURL)
-	if err != nil {
+	fatalIf(err, "Cannot get a configured admin connection.")
-		return err.ToGoError()
-	}
 
 	aliasedURL = filepath.ToSlash(aliasedURL)
 

cmd/admin-lock-list.go

@@ -117,9 +117,7 @@ func mainAdminLockList(ctx *cli.Context) error {
 
 	// Create a new Minio Admin Client
 	client, err := newAdminClient(aliasedURL)
-	if err != nil {
+	fatalIf(err, "Cannot get a configured admin connection.")
-		return err.ToGoError()
-	}
 
 	aliasedURL = filepath.ToSlash(aliasedURL)
 

cmd/admin-service-restart.go

@@ -67,9 +67,7 @@ func mainAdminServiceRestart(ctx *cli.Context) error {
 	aliasedURL := args.Get(0)
 
 	client, err := newAdminClient(aliasedURL)
-	if err != nil {
+	fatalIf(err, "Cannot get a configured admin connection.")
-		return err.ToGoError()
-	}
 
 	// Restart the specified Minio server
 	e := client.ServiceRestart()

cmd/admin-service-status.go

@@ -97,9 +97,7 @@ func mainAdminServiceStatus(ctx *cli.Context) error {
 
 	// Create a new Minio Admin Client
 	client, err := newAdminClient(aliasedURL)
-	if err != nil {
+	fatalIf(err, "Cannot get a configured admin connection.")
-		return err.ToGoError()
-	}
 
 	// Fetch the storage info of the specified Minio server
 	status, e := client.ServiceStatus()

cmd/admin-service-stop.go

@@ -68,9 +68,7 @@ func mainAdminServiceStop(ctx *cli.Context) error {
 
 	// Create a new Minio Admin Client
 	client, err := newAdminClient(aliasedURL)
-	if err != nil {
+	fatalIf(err, "Cannot get a configured admin connection.")
-		return err.ToGoError()
-	}
 
 	// Stop the specified Minio server
 	e := client.ServiceStop()

cmd/client-admin.go

@@ -36,7 +36,10 @@ func newAdminFactory() func(config *Config) (*madmin.AdminClient, *probe.Error)
 	// Return New function.
 	return func(config *Config) (*madmin.AdminClient, *probe.Error) {
 		// Creates a parsed URL.
-		targetURL, _ := url.Parse(config.HostURL)
+		targetURL, e := url.Parse(config.HostURL)
+		if e != nil {
+			return nil, probe.NewError(e)
+		}
 		// By default enable HTTPs.
 		useTLS := true
 		if targetURL.Scheme == "http" {
@@ -99,7 +102,10 @@ func newAdminFactory() func(config *Config) (*madmin.AdminClient, *probe.Error)
 // alias entry in the mc config file. If no matching host config entry
 // is found, fs client is returned.
 func newAdminClientFromAlias(alias string, urlStr string) (*madmin.AdminClient, *probe.Error) {
-	s3Config := buildConfig(alias, urlStr)
+	s3Config, err := buildS3Config(alias, urlStr)
+	if err != nil {
+		return nil, err
+	}
 	s3Client, err := s3AdminNew(s3Config)
 	if err != nil {
 		return nil, err.Trace(alias, urlStr)

cmd/common-methods.go

@@ -146,13 +146,13 @@ func uploadSourceToTargetURL(urls URLs, progress io.Reader) URLs {
 // alias entry in the mc config file. If no matching host config entry
 // is found, fs client is returned.
 func newClientFromAlias(alias string, urlStr string) (Client, *probe.Error) {
-	s3Config := buildConfig(alias, urlStr)
+	s3Config, err := buildS3Config(alias, urlStr)
-	if s3Config == nil {
+	if err != nil {
 		// No matching host config. So we treat it like a
 		// filesystem.
-		fsClient, err := fsNew(urlStr)
+		fsClient, fsErr := fsNew(urlStr)
-		if err != nil {
+		if fsErr != nil {
-			return nil, err.Trace(alias, urlStr)
+			return nil, fsErr.Trace(alias, urlStr)
 		}
 		return fsClient, nil
 	}

cmd/utils.go

@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"crypto/tls"
+	"errors"
 	"io"
 	"math/rand"
 	"os"
@@ -89,12 +90,12 @@ func splitStr(path, sep string, n int) []string {
 	return splits
 }
 
-// buildConfig fetches config related to the specified alias
+// buildS3Config fetches config related to the specified alias
 // to create a new config structure
-func buildConfig(alias, urlStr string) *Config {
+func buildS3Config(alias, urlStr string) (*Config, *probe.Error) {
 	hostCfg := mustGetHostConfig(alias)
 	if hostCfg == nil {
-		return nil
+		return nil, probe.NewError(errors.New("The specified alias cannot be found"))
 	}
 
 	// We have a valid alias and hostConfig. We populate the
@@ -127,5 +128,5 @@ func buildConfig(alias, urlStr string) *Config {
 	s3Config.Debug = globalDebug
 	s3Config.Insecure = globalInsecure
 
-	return s3Config
+	return s3Config, nil
 }