support multiple regions for hyper.sh

Author: carmark

api/client/cli.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"net/url"
 	"os"
 	"runtime"
 
@@ -46,8 +47,9 @@ type DockerCli struct {
 	// client is the http client that performs all API operations
 	client client.APIClient
 	// state holds the terminal state
-	state *term.State
-	host  string
+	state  *term.State
+	region string
+	host   string
 }
 
 // Initialize calls the init function that will setup the configuration for the client
@@ -134,7 +136,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 		}
 		cli.configFile = configFile
 
-		host, err := getServerHost(clientFlags.Common.Hosts, clientFlags.Common.TLSOptions)
+		host, err := cli.getServerHost(clientFlags.Common.Region, clientFlags.Common.TLSOptions)
 		if err != nil {
 			return err
 		}
@@ -160,8 +162,14 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 			cloudConfig.AccessKey = cc.AccessKey
 			cloudConfig.SecretKey = cc.SecretKey
 		} else {
-			cloudConfig.AccessKey = os.Getenv("HYPER_ACCESS")
-			cloudConfig.SecretKey = os.Getenv("HYPER_SECRET")
+			cc, ok := configFile.CloudConfig[cliconfig.DefaultHyperFormat]
+			if ok {
+				cloudConfig.AccessKey = cc.AccessKey
+				cloudConfig.SecretKey = cc.SecretKey
+			} else {
+				cloudConfig.AccessKey = os.Getenv("HYPER_ACCESS")
+				cloudConfig.SecretKey = os.Getenv("HYPER_SECRET")
+			}
 		}
 		if cloudConfig.AccessKey == "" || cloudConfig.SecretKey == "" {
 			fmt.Fprintf(cli.err, "WARNING: null cloud config\n")
@@ -173,6 +181,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 		}
 		cli.client = client
 		cli.host = host
+		cli.region = clientFlags.Common.Region
 
 		if cli.in != nil {
 			cli.inFd, cli.isTerminalIn = term.GetFdInfo(cli.in)
@@ -187,14 +196,14 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 	return cli
 }
 
-func getServerHost(hosts []string, tlsOptions *tlsconfig.Options) (host string, err error) {
-	switch len(hosts) {
-	case 0:
-		host = cliconfig.DefaultHyperServer
-	case 1:
-		host = hosts[0]
-	default:
-		return "", errors.New("Please specify only one -H")
+func (cli *DockerCli) getServerHost(region string, tlsOptions *tlsconfig.Options) (host string, err error) {
+	host = region
+	if host == "" {
+		host = os.Getenv("HYPER_DEFAULT_REGION")
+		region = cli.getDefaultRegion()
+	}
+	if _, err := url.ParseRequestURI(host); err != nil {
+		host = "tcp://" + region + "." + cliconfig.DefaultHyperEndpoint
 	}
 
 	host, err = opts.ParseHost(tlsOptions != nil, host)

api/client/config.go

@@ -15,11 +15,12 @@ import (
 //
 // Usage: hyper config
 func (cli *DockerCli) CmdConfig(args ...string) error {
-	cmd := Cli.Subcmd("config", []string{"[SERVER]"}, Cli.DockerCommands["config"].Description+".\nIf no server is specified, the default is defined as "+cliconfig.DefaultHyperServer, true)
+	cmd := Cli.Subcmd("config", []string{"[REGION]"}, Cli.DockerCommands["config"].Description+".\nIf no region is specified, the default is defined as "+cliconfig.DefaultHyperRegion, true)
 	cmd.Require(flag.Max, 1)
 
 	flAccesskey := cmd.String([]string{"-accesskey"}, "", "Access Key")
 	flSecretkey := cmd.String([]string{"-secretkey"}, "", "Secret Key")
+	flDefaultRegion := cmd.String([]string{"-default-region"}, "", "Default Region Endpoint")
 
 	cmd.ParseFlags(args, true)
 
@@ -32,10 +33,10 @@ func (cli *DockerCli) CmdConfig(args ...string) error {
 	if len(cmd.Args()) > 0 {
 		serverAddress = cmd.Arg(0)
 	} else {
-		serverAddress = cliconfig.DefaultHyperServer
+		serverAddress = cliconfig.DefaultHyperFormat
 	}
 
-	_, err := cli.configureCloud(serverAddress, *flAccesskey, *flSecretkey)
+	_, err := cli.configureCloud(serverAddress, *flDefaultRegion, *flAccesskey, *flSecretkey)
 	if err != nil {
 		return err
 	}
@@ -48,26 +49,57 @@ func (cli *DockerCli) CmdConfig(args ...string) error {
 	return nil
 }
 
-func (cli *DockerCli) configureCloud(serverAddress, flAccesskey, flSecretkey string) (cliconfig.CloudConfig, error) {
-	cloudConfig, ok := cli.configFile.CloudConfig[serverAddress]
-	if !ok {
-		cloudConfig = cliconfig.CloudConfig{}
+func (cli *DockerCli) configureCloud(serverAddress, flRegion, flAccesskey, flSecretkey string) (cliconfig.CloudConfig, error) {
+	cloudConfig := cliconfig.CloudConfig{}
+	if serverAddress != "" {
+		if cc, ok := cli.configFile.CloudConfig[serverAddress]; ok {
+			cloudConfig = cc
+		} else {
+			// for legacy format
+			defaultHost := "tcp://" + cliconfig.DefaultHyperRegion + "." + cliconfig.DefaultHyperEndpoint
+			cloudConfig, ok = cli.configFile.CloudConfig[defaultHost]
+			if ok {
+				delete(cli.configFile.CloudConfig, defaultHost)
+			}
+		}
 	}
 
+	defaultRegion := cli.getDefaultRegion()
+	if cloudConfig.Region != "" {
+		defaultRegion = cloudConfig.Region
+	}
 	if flAccesskey = strings.TrimSpace(flAccesskey); flAccesskey == "" {
 		cli.promptWithDefault("Enter Access Key", cloudConfig.AccessKey)
 		flAccesskey = readInput(cli.in, cli.out)
 		flAccesskey = strings.TrimSpace(flAccesskey)
+		if flAccesskey == "" {
+			flAccesskey = cloudConfig.AccessKey
+		}
 	}
 	if flSecretkey = strings.TrimSpace(flSecretkey); flSecretkey == "" {
 		cli.promptWithDefault("Enter Secret Key", cloudConfig.SecretKey)
 		flSecretkey = readInput(cli.in, cli.out)
 		flSecretkey = strings.TrimSpace(flSecretkey)
+		if flSecretkey == "" {
+			flSecretkey = cloudConfig.SecretKey
+		}
+	}
+	if flRegion = strings.TrimSpace(flRegion); flRegion == "" {
+		cli.promptWithDefault("Enter Default Region", defaultRegion)
+		flRegion = readInput(cli.in, cli.out)
+		flRegion = strings.TrimSpace(flRegion)
+		if flRegion == "" {
+			flRegion = defaultRegion
+		}
 	}
 
 	cloudConfig.AccessKey = flAccesskey
 	cloudConfig.SecretKey = flSecretkey
-	cli.configFile.CloudConfig[serverAddress] = cloudConfig
+	cloudConfig.Region = flRegion
+	if serverAddress != "" {
+		cli.configFile.CloudConfig[serverAddress] = cloudConfig
+	}
+
 	return cloudConfig, nil
 }
 
@@ -78,3 +110,7 @@ func (cli *DockerCli) checkCloudConfig() error {
 	}
 	return nil
 }
+
+func (cli *DockerCli) getDefaultRegion() string {
+	return cliconfig.DefaultHyperRegion
+}

cli/common.go

@@ -11,7 +11,7 @@ type CommonFlags struct {
 	PostParse func()
 
 	Debug      bool
-	Hosts      []string
+	Region     string
 	LogLevel   string
 	TLS        bool
 	TLSVerify  bool

cliconfig/config.go

@@ -24,7 +24,9 @@ const (
 	// assumed to be this value.
 	defaultIndexserver = "https://index.docker.io/v1/"
 
-	DefaultHyperServer = "tcp://us-west-1.hyper.sh:443"
+	DefaultHyperFormat   = "tcp://*.hyper.sh:443"
+	DefaultHyperRegion   = "us-west-1"
+	DefaultHyperEndpoint = "hyper.sh:443"
 )
 
 var (
@@ -50,6 +52,7 @@ func SetConfigDir(dir string) {
 type CloudConfig struct {
 	AccessKey string `json:"accesskey"`
 	SecretKey string `json:"secretkey"`
+	Region    string `json:"region"`
 }
 
 // ConfigFile ~/.docker/config.json file info

hyper/common.go

@@ -9,7 +9,6 @@ import (
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/hyperhq/hypercli/cli"
 	"github.com/hyperhq/hypercli/cliconfig"
-	"github.com/hyperhq/hypercli/opts"
 	flag "github.com/hyperhq/hypercli/pkg/mflag"
 )
 
@@ -50,7 +49,7 @@ func init() {
 	cmd.StringVar(&tlsOptions.CertFile, []string{}, filepath.Join(dockerCertPath, defaultCertFile), "Path to TLS certificate file")
 	cmd.StringVar(&tlsOptions.KeyFile, []string{}, filepath.Join(dockerCertPath, defaultKeyFile), "Path to TLS key file")
 
-	cmd.Var(opts.NewNamedListOptsRef("hosts", &commonFlags.Hosts, opts.ValidateHost), []string{"H", "-host"}, "Daemon socket(s) to connect to")
+	cmd.StringVar(&commonFlags.Region, []string{"R", "-region"}, "", "Set the region of hyper.sh")
 }
 
 func postParseCommon() {