[region] fix integration-cli

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; \

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
@@ -21,7 +25,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 "----------------------------------------------------------------------------------------------"
 
@@ -37,7 +41,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"
@@ -74,7 +78,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 "##############################################################################################"
@@ -84,7 +88,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 "----------------------------------------------------------------------------------------------"
 

integration-cli/docker_utils.go

@@ -482,7 +482,7 @@ func (d *Daemon) waitRun(contID string) error {
 }
 
 // Cmd will execute a docker CLI command against this Daemon.
-// Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version
+// Example: d.Cmd("version") will run docker --region unix://path/to/unix.sock version
 func (d *Daemon) Cmd(name string, arg ...string) (string, error) {
 	args := []string{"--region", os.Getenv("DOCKER_HOST"), name}
 	args = append(args, arg...)
@@ -647,7 +647,7 @@ func newRequestClient(method, endpoint string, data io.Reader, ct string) (*http
 		fmt.Println("--------------------------------------------------------------------------------------------")
 		fmt.Println("curl -v -k \\")
 		for k, v := range req.Header {
-			fmt.Printf("  -H \"%v: %v\" \\\n", k, v[0])
+			fmt.Printf("  --region \"%v: %v\" \\\n", k, v[0])
 		}
 		fmt.Printf("  -X %v \\\n", method)
 		if req.Body != nil {
@@ -991,7 +991,7 @@ func dockerCmdWithStdoutStderr(c *check.C, args ...string) (string, string, int)
 }
 
 func dockerCmd(c *check.C, args ...string) (string, int) {
-	//append -H (--region)
+	//append --region
 	arg := []string{"--region=" + os.Getenv("DOCKER_HOST")}
 	args = append(arg, args...)
 	return integration.DockerCmd(dockerBinary, c, args...)

integration-cli/final/cli/hyper_cli_load_local_ext_test.go

@@ -18,7 +18,7 @@ func (s *DockerSuite) TestCliLoadFromLocalDocker(c *check.C) {
 	testImage := "hello-world:latest"
 
 	//local docker pull image
-	pullCmd := exec.Command("docker", "-H", os.Getenv("LOCAL_DOCKER_HOST"), "pull", testImage)
+	pullCmd := exec.Command("docker", "--region", os.Getenv("LOCAL_DOCKER_HOST"), "pull", testImage)
 	output, exitCode, err := runCommandWithOutput(pullCmd)
 	c.Assert(err, checker.IsNil)
 	c.Assert(exitCode, checker.Equals, 0)

integration-cli/hyper_cli_config_test.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"path/filepath"
+	"os"
 	"time"
-
+	
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/go-check/check"
 	"github.com/hyperhq/hypercli/cliconfig"
@@ -14,7 +15,7 @@ func (s *DockerSuite) TestCliConfigAndRewrite(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
-	out, _ := dockerCmd(c, "config", "--accesskey", "xx", "--secretkey", "xxxx", "tcp://127.0.0.1:6443")
+	out, _ := dockerCmd(c, "config", "--default-region" , os.Getenv("REGION"), "--accesskey", "xx", "--secretkey", "xxxx", "tcp://127.0.0.1:6443")
 	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	configDir := filepath.Join(homedir.Get(), ".hyper")
@@ -23,7 +24,7 @@ func (s *DockerSuite) TestCliConfigAndRewrite(c *check.C) {
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].AccessKey, checker.Equals, "xx", check.Commentf("Should get xx, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].AccessKey))
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey, checker.Equals, "xxxx", check.Commentf("Should get xxxx, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey))
 
-	out, _ = dockerCmd(c, "config", "--accesskey", "yy", "--secretkey", "yyyy", "tcp://127.0.0.1:6443")
+	out, _ = dockerCmd(c, "config", "--default-region" , os.Getenv("REGION"), "--accesskey", "yy", "--secretkey", "yyyy", "tcp://127.0.0.1:6443")
 	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	conf, err = cliconfig.Load(configDir)
@@ -36,7 +37,7 @@ func (s *DockerSuite) TestCliConfigMultiHostBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
-	out, _ := dockerCmd(c, "config", "--accesskey", "xx", "--secretkey", "xxxx", "tcp://127.0.0.1:6443")
+	out, _ := dockerCmd(c, "config", "--default-region" , os.Getenv("REGION"), "--accesskey", "xx", "--secretkey", "xxxx", "tcp://127.0.0.1:6443")
 	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	configDir := filepath.Join(homedir.Get(), ".hyper")
@@ -45,7 +46,7 @@ func (s *DockerSuite) TestCliConfigMultiHostBasic(c *check.C) {
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].AccessKey, checker.Equals, "xx", check.Commentf("Should get xx, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].AccessKey))
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey, checker.Equals, "xxxx", check.Commentf("Should get xxxx, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey))
 
-	out, _ = dockerCmd(c, "config", "--accesskey", "yy", "--secretkey", "yyyy", "tcp://127.0.0.1:6444")
+	out, _ = dockerCmd(c, "config", "--default-region" , os.Getenv("REGION"), "--accesskey", "yy", "--secretkey", "yyyy", "tcp://127.0.0.1:6444")
 	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	conf, err = cliconfig.Load(configDir)

integration-cli/hyper_cli_links_test.go

@@ -43,8 +43,8 @@ func (s *DockerSuite) TestCliLinksPingLinkedContainersBasic(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 
 	pullImageIfNotExist("busybox")
-	dockerCmd(c, "run", "-d", "--name", "container1", "--regionname", "fred", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--name", "container2", "--regionname", "wilma", "busybox", "top")
+	dockerCmd(c, "run", "-d", "--name", "container1", "--hostname", "fred", "busybox", "top")
+	dockerCmd(c, "run", "-d", "--name", "container2", "--hostname", "wilma", "busybox", "top")
 
 	runArgs := []string{"run", "--rm", "--link", "container1:alias1", "--link", "container2:alias2", "busybox", "sh", "-c"}
 	pingCmd := "ping -c 1 %s -W 5 && ping -c 1 %s -W 5"

integration-cli/hyper_cli_load_local_test.go

@@ -28,7 +28,7 @@ func (s *DockerSuite) TestCliLoadFromLocalTarPipeBasic(c *check.C) {
 
 	//load via pipe
 	catCmd := exec.Command("cat", imagePath)
-	loadCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "--config", os.Getenv("HYPER_CONFIG"), "load")
+	loadCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "--config", os.Getenv("HYPER_CONFIG"), "load")
 
 	catOut, err := catCmd.StdoutPipe()
 	catCmd.Start()

integration-cli/hyper_cli_login_test.go

@@ -12,7 +12,7 @@ import (
 func (s *DockerSuite) TestCliLoginWithoutTTYBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
-	cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "login")
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "login")
 
 	// Send to stdin so the process does not get the TTY
 	cmd.Stdin = bytes.NewBufferString("buffer test string \n")

integration-cli/hyper_cli_run_test.go

@@ -111,7 +111,7 @@ func (s *DockerSuite) TestCliRunStdinPipe(c *check.C) {
 	// TODO Windows: This needs some work to make compatible.
 	testRequires(c, DaemonIsLinux)
 	printTestCaseName(); defer printTestDuration(time.Now())
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-i", "-a", "stdin", "busybox", "cat")
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-i", "-a", "stdin", "busybox", "cat")
 	runCmd.Stdin = strings.NewReader("blahblah")
 	out, _, _, err := runCommandWithStdoutStderr(runCmd)
 	if err != nil {
@@ -328,7 +328,7 @@ func (s *DockerSuite) TestCliRunEnvironment(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	printTestCaseName(); defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")
-	cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-h", "testing", "-e=FALSE=true", "-e=TRUE=", "-e=TRICKY=", "-e=HOME=", "busybox", "env")
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-h", "testing", "-e=FALSE=true", "-e=TRUE=", "-e=TRICKY=", "-e=HOME=", "busybox", "env")
 	cmd.Env = append(os.Environ(),
 		"TRUE=false",
 		"TRICKY=tri\ncky\n",
@@ -376,7 +376,7 @@ func (s *DockerSuite) TestCliRunEnvironmentErase(c *check.C) {
 	// not set in our local env that they're removed (if present) in
 	// the container
 
-	cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-e", "FOO", "-e", "HOSTNAME", "busybox", "env")
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-e", "FOO", "-e", "HOSTNAME", "busybox", "env")
 	cmd.Env = appendBaseEnv([]string{})
 
 	out, _, err := runCommandWithOutput(cmd)
@@ -415,7 +415,7 @@ func (s *DockerSuite) TestCliRunEnvironmentOverride(c *check.C) {
 	// Test to make sure that when we use -e on env vars that are
 	// already in the env that we're overriding them
 
-	cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-e", "HOSTNAME", "-e", "HOME=/root2", "busybox", "env")
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-e", "HOSTNAME", "-e", "HOME=/root2", "busybox", "env")
 	cmd.Env = appendBaseEnv([]string{"HOSTNAME=bar"})
 
 	out, _, err := runCommandWithOutput(cmd)
@@ -693,7 +693,7 @@ func (s *DockerSuite) TestCliRunExitOnStdinClose(c *check.C) {
 		meow = "cat"
 		delay = 60
 	}
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "--name", name, "-i", "busybox", meow)
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "--name", name, "-i", "busybox", meow)
 
 	stdin, err := runCmd.StdinPipe()
 	if err != nil {
@@ -976,7 +976,7 @@ func (s *DockerSuite) TestCliRunNoOutputFromPullInStdout(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 
 	// just run with unknown image
-	cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "asdfsg")
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "asdfsg")
 	stdout := bytes.NewBuffer(nil)
 	cmd.Stdout = stdout
 	if err := cmd.Run(); err == nil {
@@ -995,7 +995,7 @@ func (s *DockerSuite) TestCliRunSlowStdoutConsumer(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	printTestCaseName(); defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")
-	cont := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv")
+	cont := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv")
 
 	stdout, err := cont.StdoutPipe()
 	if err != nil {
@@ -1133,7 +1133,7 @@ func (s *DockerSuite) TestCliRunTTYWithPipe(c *check.C) {
 	go func() {
 		defer close(errChan)
 
-		cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-ti", "busybox", "true")
+		cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-ti", "busybox", "true")
 		if _, err := cmd.StdinPipe(); err != nil {
 			errChan <- err
 			return
@@ -1363,7 +1363,7 @@ func (s *DockerTrustSuite) TestCliRunWhenCertExpired(c *check.C) {
 
 	runAtDifferentDate(elevenYearsFromNow, func() {
 		// Try run
-		runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", repoName)
+		runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", repoName)
 		s.trustedCmd(runCmd)
 		out, _, err := runCommandWithOutput(runCmd)
 		if err == nil {
@@ -1377,7 +1377,7 @@ func (s *DockerTrustSuite) TestCliRunWhenCertExpired(c *check.C) {
 
 	runAtDifferentDate(elevenYearsFromNow, func() {
 		// Try run
-		runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "--disable-content-trust", repoName)
+		runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "--disable-content-trust", repoName)
 		s.trustedCmd(runCmd)
 		out, _, err := runCommandWithOutput(runCmd)
 		if err != nil {
@@ -1432,7 +1432,7 @@ func (s *DockerSuite) TestCliRunStdinBlockedAfterContainerExit(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 
 	pullImageIfNotExist("busybox")
-	cmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-i", "--name=test", "busybox", "true")
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-i", "--name=test", "busybox", "true")
 	in, err := cmd.StdinPipe()
 	c.Assert(err, check.IsNil)
 	defer in.Close()
@@ -1459,7 +1459,7 @@ func (s *DockerSuite) TestCliRunNonExecutableCmd(c *check.C) {
 
 	pullImageIfNotExist("busybox")
 	name := "test-non-executable-cmd"
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "--name", name, "busybox", "foo")
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "--name", name, "busybox", "foo")
 	_, exit, _ := runCommandWithOutput(runCmd)
 	stateExitCode := findContainerExitCode(c, name)
 	if !(exit == 127 && strings.Contains(stateExitCode, "127")) {
@@ -1475,7 +1475,7 @@ func (s *DockerSuite) TestCliRunNonExistingCmd(c *check.C) {
 
 	pullImageIfNotExist("busybox")
 	name := "test-non-existing-cmd"
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "--name", name, "busybox", "/bin/foo")
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "--name", name, "busybox", "/bin/foo")
 	_, exit, _ := runCommandWithOutput(runCmd)
 	stateExitCode := findContainerExitCode(c, name)
 	if !(exit == 127 && strings.Contains(stateExitCode, "127")) {
@@ -1497,7 +1497,7 @@ func (s *DockerSuite) TestCliRunCmdCannotBeInvoked(c *check.C) {
 		expected = 127
 	}
 	name := "test-cmd-cannot-be-invoked"
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "--name", name, "busybox", "/etc")
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "--name", name, "busybox", "/etc")
 	_, exit, _ := runCommandWithOutput(runCmd)
 	stateExitCode := findContainerExitCode(c, name)
 	if !(exit == expected && strings.Contains(stateExitCode, strconv.Itoa(expected))) {
@@ -1511,7 +1511,7 @@ func (s *DockerSuite) TestCliRunNonExistingImage(c *check.C) {
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
 
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "foo")
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "foo")
 	out, exit, err := runCommandWithOutput(runCmd)
 	if !(err != nil && exit == 125 && strings.Contains(out, "Unable to find image")) {
 		c.Fatalf("Run non-existing image should have errored with 'Unable to find image' code 125, but we got out: %s, exit: %d, err: %s", out, exit, err)
@@ -1525,7 +1525,7 @@ func (s *DockerSuite) TestCliRunDockerFails(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 
 	pullImageIfNotExist("busybox")
-	runCmd := exec.Command(dockerBinary, "-H", os.Getenv("DOCKER_HOST"), "run", "-foo", "busybox")
+	runCmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "run", "-foo", "busybox")
 	out, exit, err := runCommandWithOutput(runCmd)
 	if !(err != nil && exit == 125) {
 		c.Fatalf("Docker run with flag not defined should exit with 125, but we got out: %s, exit: %d, err: %s", out, exit, err)