From 794f638becc80b6158f07fb813db328ca141d805 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@gmail.com>
Date: Tue, 2 Feb 2021 17:33:24 +0100
Subject: [PATCH] Check context description in kube e2e

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md |  3 ++-
 kube/context.go                  | 10 +++++-----
 kube/context_test.go             |  6 +++---
 kube/e2e/compose_test.go         |  2 ++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 565cad2da..a80dc1651 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,8 @@
 <!-- If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" -->
 
 <!-- optional tests
-You can add a / mention to run tests executed by default only on main branch : 
+You can add a / mention to run tests executed by default only on main branch :
+* `test-kube` to run Kube E2E tests
 * `test-aci` to run ACI E2E tests
 * `test-ecs` to run ECS E2E tests
 * `test-windows` to run tests & E2E tests on windows
diff --git a/kube/context.go b/kube/context.go
index 4520a6fbe..6749441cd 100644
--- a/kube/context.go
+++ b/kube/context.go
@@ -43,7 +43,7 @@ func (cp ContextParams) CreateContextData() (interface{}, string, error) {
 		// we use the current kubectl context from a $KUBECONFIG path
 		return store.KubeContext{
 			FromEnvironment: cp.FromEnvironment,
-		}, cp.Description, nil
+		}, cp.getDescription(), nil
 	}
 	user := prompt.User{}
 	selectContext := func() error {
@@ -69,7 +69,7 @@ func (cp ContextParams) CreateContextData() (interface{}, string, error) {
 				ContextName:     cp.KubeContextName,
 				KubeconfigPath:  cp.KubeConfigPath,
 				FromEnvironment: cp.FromEnvironment,
-			}, cp.Description, nil
+			}, cp.getDescription(), nil
 		}
 		err := selectContext()
 		if err != nil {
@@ -118,8 +118,8 @@ func (cp ContextParams) getDescription() string {
 		return "From environment variables"
 	}
 	configFile := "default kube config"
-	if cp.KubeconfigPath != "" {
-		configFile = cp.KubeconfigPath
+	if cp.KubeConfigPath != "" {
+		configFile = cp.KubeConfigPath
 	}
-	return fmt.Sprintf("%s (in %s)", cp.ContextName, configFile)
+	return fmt.Sprintf("%s (in %s)", cp.KubeContextName, configFile)
 }
diff --git a/kube/context_test.go b/kube/context_test.go
index 6e6cfe0d8..12913ce57 100644
--- a/kube/context_test.go
+++ b/kube/context_test.go
@@ -43,15 +43,15 @@ func TestContextDescriptionIfProvided(t *testing.T) {
 
 func TestContextDescriptionIfConfigFile(t *testing.T) {
 	cp := ContextParams{
-		ContextName:    "my-context",
-		KubeconfigPath: "~/.kube/config",
+		KubeContextName: "my-context",
+		KubeConfigPath:  "~/.kube/config",
 	}
 	description := cp.getDescription()
 	assert.Equal(t, description, "my-context (in ~/.kube/config)")
 }
 func TestContextDescriptionIfDefaultConfigFile(t *testing.T) {
 	cp := ContextParams{
-		ContextName: "my-context",
+		KubeContextName: "my-context",
 	}
 	description := cp.getDescription()
 	assert.Equal(t, description, "my-context (in default kube config)")
diff --git a/kube/e2e/compose_test.go b/kube/e2e/compose_test.go
index 688843e1c..0d14c8f7e 100644
--- a/kube/e2e/compose_test.go
+++ b/kube/e2e/compose_test.go
@@ -65,6 +65,8 @@ func TestComposeUp(t *testing.T) {
 		res := c.RunDockerCmd("context", "create", "kubernetes", "--kubeconfig", kubeconfig, "--kubecontext", kubeContextName, dockerContextName)
 		res.Assert(t, icmd.Expected{Out: fmt.Sprintf("Successfully created kube context %q", dockerContextName)})
 		c.RunDockerCmd("context", "use", dockerContextName)
+		res = c.RunDockerCmd("context", "ls")
+		res.Assert(t, icmd.Expected{Out: fmt.Sprintf("%s *      kube                %s (in %s)", dockerContextName, kubeContextName, kubeconfig)})
 	})
 
 	t.Run("up", func(t *testing.T) {