From 3c2eb067bcb4af79791922b552ea2c3ca5a038a3 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 12 Jun 2020 13:48:11 +0200 Subject: [PATCH 1/2] Fix typo in DOCKER ENPOINT --- cli/cmd/context/ls.go | 2 +- tests/e2e/testdata/ls-out-default-windows.golden | 2 +- tests/e2e/testdata/ls-out-default.golden | 2 +- tests/e2e/testdata/ls-out-test-example-windows.golden | 2 +- tests/e2e/testdata/ls-out-test-example.golden | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/cmd/context/ls.go b/cli/cmd/context/ls.go index 967df9d0..7ee38fc0 100644 --- a/cli/cmd/context/ls.go +++ b/cli/cmd/context/ls.go @@ -67,7 +67,7 @@ func runList(ctx context.Context) error { }) w := tabwriter.NewWriter(os.Stdout, 20, 1, 3, ' ', 0) - fmt.Fprintln(w, "NAME\tTYPE\tDESCRIPTION\tDOCKER ENPOINT\tKUBERNETES ENDPOINT\tORCHESTRATOR") + fmt.Fprintln(w, "NAME\tTYPE\tDESCRIPTION\tDOCKER ENDPOINT\tKUBERNETES ENDPOINT\tORCHESTRATOR") format := "%s\t%s\t%s\t%s\t%s\t%s\n" for _, c := range contexts { diff --git a/tests/e2e/testdata/ls-out-default-windows.golden b/tests/e2e/testdata/ls-out-default-windows.golden index d1fad0ef..19ebe37d 100644 --- a/tests/e2e/testdata/ls-out-default-windows.golden +++ b/tests/e2e/testdata/ls-out-default-windows.golden @@ -1,2 +1,2 @@ -NAME TYPE DESCRIPTION DOCKER ENPOINT KUBERNETES ENDPOINT ORCHESTRATOR +NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default * docker Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm diff --git a/tests/e2e/testdata/ls-out-default.golden b/tests/e2e/testdata/ls-out-default.golden index 87d06122..9e361fa7 100644 --- a/tests/e2e/testdata/ls-out-default.golden +++ b/tests/e2e/testdata/ls-out-default.golden @@ -1,2 +1,2 @@ -NAME TYPE DESCRIPTION DOCKER ENPOINT KUBERNETES ENDPOINT ORCHESTRATOR +NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default * docker Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm diff --git a/tests/e2e/testdata/ls-out-test-example-windows.golden b/tests/e2e/testdata/ls-out-test-example-windows.golden index b83ef4c1..1df1196f 100644 --- a/tests/e2e/testdata/ls-out-test-example-windows.golden +++ b/tests/e2e/testdata/ls-out-test-example-windows.golden @@ -1,3 +1,3 @@ -NAME TYPE DESCRIPTION DOCKER ENPOINT KUBERNETES ENDPOINT ORCHESTRATOR +NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default docker Current DOCKER_HOST based configuration npipe:////./pipe/docker_engine swarm test-example * example diff --git a/tests/e2e/testdata/ls-out-test-example.golden b/tests/e2e/testdata/ls-out-test-example.golden index af1a5952..2508cb89 100644 --- a/tests/e2e/testdata/ls-out-test-example.golden +++ b/tests/e2e/testdata/ls-out-test-example.golden @@ -1,3 +1,3 @@ -NAME TYPE DESCRIPTION DOCKER ENPOINT KUBERNETES ENDPOINT ORCHESTRATOR +NAME TYPE DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR default docker Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm test-example * example From f8ea0934f05b9feb4b992230b8ce345dcb6f43ac Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 12 Jun 2020 13:49:27 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Align=20login=20success=20message=20with=20?= =?UTF-8?q?old=20cli=20(&=20with=20=E2=80=9Ccanceled=E2=80=9D=20message)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli/cmd/login/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmd/login/login.go b/cli/cmd/login/login.go index a705266b..186e5901 100644 --- a/cli/cmd/login/login.go +++ b/cli/cmd/login/login.go @@ -57,6 +57,6 @@ func cloudLogin(cmd *cobra.Command, backendType string) error { if err != nil { return err } - fmt.Println("login successful") + fmt.Println("login succeeded") return nil }