Merge pull request #230 from carmark/region

support multiple regions for hyper.sh

Author: Jimmy-Xu

Dockerfile.dev

@@ -29,11 +29,11 @@ ENV DOCKER_TLS_VERIFY=
 ENV DOCKER_HOST=
 ENV ACCESS_KEY=
 ENV SECRET_KEY=
-
+ENV REGION=
 
 ## Ensure /usr/bin/hyper
 RUN ln -s /go/src/github.com/hyperhq/hypercli/hyper/hyper /usr/bin/hyper
-RUN echo alias hypercli=\"hyper -H \${DOCKER_HOST}\" >> /root/.bashrc
+RUN echo alias hypercli=\"hyper --region \${DOCKER_HOST}\" >> /root/.bashrc
 
 
 ## Ensure /go/src/github.com/docker/docker
@@ -51,7 +51,7 @@ ENTRYPOINT ["hack/generate-hyper-conf-dev.sh"]
 RUN yum install -y zsh
 RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 RUN sed -i "s/^ZSH_THEME=.*/ZSH_THEME=\"gianu\"/g" /root/.zshrc
-RUN echo alias hypercli=\"hyper -H \${DOCKER_HOST}\" >> /root/.zshrc
+RUN echo alias hypercli=\"hyper --region \${DOCKER_HOST}\" >> /root/.zshrc
 
 # config git
 RUN git config --global color.ui true; \

Dockerfile.qa

@@ -33,6 +33,7 @@ ENV BRANCH="master"
 
 ENV ACCESS_KEY=
 ENV SECRET_KEY=
+ENV REGION=
 
 RUN mkdir -p /go/src/github.com/hyperhq
 WORKDIR /go/src/github.com/hyperhq

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, dft, err := cli.getServerHost(clientFlags.Common.Region, clientFlags.Common.TLSOptions)
 		if err != nil {
 			return err
 		}
@@ -155,13 +157,19 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
 			return err
 		}
 		var cloudConfig cliconfig.CloudConfig
-		cc, ok := configFile.CloudConfig[host]
-		if ok {
+		cc, ok := configFile.CloudConfig[cliconfig.DefaultHyperFormat]
+		if ok && dft {
 			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[host]
+			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,12 @@ 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.region == "" {
+			if cli.region = cc.Region; cli.region == "" {
+				cli.region = cli.getDefaultRegion()
+			}
+		}
 
 		if cli.in != nil {
 			cli.inFd, cli.isTerminalIn = term.GetFdInfo(cli.in)
@@ -187,14 +201,16 @@ 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, dft bool, err error) {
+	dft = false
+	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
+		dft = true
 	}
 
 	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,33 +49,75 @@ 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
 }
 
 func (cli *DockerCli) checkCloudConfig() error {
 	_, ok := cli.configFile.CloudConfig[cli.host]
 	if !ok {
-		return fmt.Errorf("Config info for the host is not found, please run 'hyper config %s' first.", cli.host)
+		_, ok = cli.configFile.CloudConfig[cliconfig.DefaultHyperFormat]
+		if !ok {
+			return fmt.Errorf("Config info for the host is not found, please run 'hyper config %s' first.", cli.host)
+		}
 	}
 	return nil
 }
+
+func (cli *DockerCli) getDefaultRegion() string {
+	cc, ok := cli.configFile.CloudConfig[cliconfig.DefaultHyperFormat]
+	if ok && cc.Region != "" {
+		return cc.Region
+	}
+	return cliconfig.DefaultHyperRegion
+}

api/client/func.go

@@ -218,7 +218,7 @@ func (cli *DockerCli) CmdFuncCreate(args ...string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Fprintf(cli.out, "%s is created with the address of https://us-west-1.hyperfunc.io/call/%s/%s\n", fn.Name, fn.Name, fn.UUID)
+	fmt.Fprintf(cli.out, "%s is created with the address of https://%s.hyperfunc.io/call/%s/%s\n", fn.Name, cli.region, fn.Name, fn.UUID)
 	return nil
 }
 
@@ -400,7 +400,7 @@ func (cli *DockerCli) CmdFuncCall(args ...string) error {
 		}
 	}
 
-	body, err := cli.client.FuncCall(context.Background(), name, stdin, *sync)
+	body, err := cli.client.FuncCall(context.Background(), cli.region, name, stdin, *sync)
 	if err != nil {
 		return err
 	}
@@ -435,7 +435,7 @@ func (cli *DockerCli) CmdFuncGet(args ...string) error {
 
 	callId := cmd.Arg(0)
 
-	body, err := cli.client.FuncGet(context.Background(), callId, *wait)
+	body, err := cli.client.FuncGet(context.Background(), cli.region, callId, *wait)
 	if err != nil {
 		return err
 	}
@@ -463,7 +463,7 @@ func (cli *DockerCli) CmdFuncLogs(args ...string) error {
 	name := cmd.Arg(0)
 	name = strings.Replace(name, "/", "", -1)
 
-	reader, err := cli.client.FuncLogs(context.Background(), name, *callId, *follow, *tail)
+	reader, err := cli.client.FuncLogs(context.Background(), cli.region, name, *callId, *follow, *tail)
 	if err != nil {
 		return err
 	}
@@ -503,7 +503,6 @@ func (cli *DockerCli) CmdFuncLogs(args ...string) error {
 			}
 		}
 	}
-	return nil
 }
 
 // CmdFuncStatus Status the return of a func call
@@ -520,7 +519,7 @@ func (cli *DockerCli) CmdFuncStatus(args ...string) error {
 	name := cmd.Arg(0)
 	name = strings.Replace(name, "/", "", -1)
 
-	status, err := cli.client.FuncStatus(context.Background(), name)
+	status, err := cli.client.FuncStatus(context.Background(), cli.region, name)
 	if err != nil {
 		return err
 	}

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

hack/generate-hyper-conf-dev.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [ "${REGION}" == "" ];then
+    REGION="us-west-1"
+fi
+
 if [ "$@" != "./build.sh" ];then
     #ensure config for hyper cli
     mkdir -p ~/.hyper
@@ -9,6 +13,11 @@ if [ "$@" != "./build.sh" ];then
         "${DOCKER_HOST}": {
             "accesskey": "${ACCESS_KEY}",
             "secretkey": "${SECRET_KEY}"
+        },
+        "tcp://*.hyper.sh:443": {
+            "accesskey": "${ACCESS_KEY}",
+            "secretkey": "${SECRET_KEY}",
+            "region": "${REGION}"
         }
     }
 }
@@ -20,7 +29,7 @@ EOF
     echo "Current hyper config: ~/.hyper/config.json"
     echo "----------------------------------------------------------------------------------------------"
     cat ~/.hyper/config.json \
-      | sed 's/"secretkey":.*/"secretkey": "******************************"/g' \
+      | sed 's/"secretkey":.*/"secretkey": "******************************",/g' \
       | sed 's/"auth":.*/"auth": "******************************"/g'
     echo "----------------------------------------------------------------------------------------------"
 
@@ -36,7 +45,7 @@ Run in container(example):
   -----------------------------------------------------------
   cd integration-cli && go test             # start autotest
 
-# 'hypercli' is the alias of 'hyper -H \${DOCKER_HOST}'
+# 'hypercli' is the alias of 'hyper --region \${DOCKER_HOST}'
 
 EOF
 fi

hack/generate-hyper-conf-qa.sh

@@ -2,6 +2,10 @@
 
 env
 
+if [ "${REGION}" == "" ];then
+    REGION="us-west-1"
+fi
+
 # set default value of DOCKER_HOST and BRANCH
 if [[ "$DOCKER_HOST" == "" ]];then
   DOCKER_HOST="tcp://us-west-1.hyper.sh:443"
@@ -33,6 +37,11 @@ if [[ "$@" != "./build.sh" ]];then
         "${DOCKER_HOST}": {
             "accesskey": "${ACCESS_KEY}",
             "secretkey": "${SECRET_KEY}"
+        },
+        "tcp://*.hyper.sh:443": {
+            "accesskey": "${ACCESS_KEY}",
+            "secretkey": "${SECRET_KEY}",
+            "region": "${REGION}"
         }
     }
 }
@@ -73,7 +82,7 @@ fi
 ./build.sh
 ln -s /go/src/github.com/hyperhq/hypercli /go/src/github.com/docker/docker
 ln -s /go/src/github.com/hyperhq/hypercli/hyper/hyper /usr/bin/hyper
-echo alias hypercli=\"hyper -H \${DOCKER_HOST}\" >> /root/.bashrc
+echo alias hypercli=\"hyper --region \${DOCKER_HOST}\" >> /root/.bashrc
 source /root/.bashrc
 
 echo "##############################################################################################"
@@ -83,7 +92,7 @@ echo "##########################################################################
 echo "Current hyper config: ~/.hyper/config.json"
 echo "----------------------------------------------------------------------------------------------"
 cat ~/.hyper/config.json \
-  | sed 's/"secretkey":.*/"secretkey": "******************************"/g' \
+  | sed 's/"secretkey":.*/"secretkey": "******************************",/g' \
   | sed 's/"auth":.*/"auth": "******************************"/g'
 echo "----------------------------------------------------------------------------------------------"