Handle err when importing k8s context

- print command execution errors to stderr
thecasualcoder · Mar 26, 2019 · 686f5fe · 686f5fe
1 parent e35dd16
commit 686f5fe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/pkg/commander/commander.go b/pkg/commander/commander.go
@@ -17,6 +17,7 @@ type Default struct{}
 // Execute executes a command on the actual machine
 func (d *Default) Execute(cmdStr string, args []string, envs []string) (string, error) {
 	cmd := exec.Command(cmdStr, args...)
+	cmd.Stderr = os.Stderr
 	cmd.Env = os.Environ()
 	cmd.Env = append(cmd.Env, envs...)
 	out, err := cmd.Output()

diff --git a/pkg/kubeconfig/kubeconfig.go b/pkg/kubeconfig/kubeconfig.go
@@ -38,8 +38,6 @@ func (k *KubeConfig) AddRegionalCluster(project string, cluster string, region s
 		fmt.Sprintf("--project=%s", project),
 	}
 	envs := []string{
-		"CLOUDSDK_CONTAINER_USE_V1_API_CLIENT=false",
-		"CLOUDSDK_CONTAINER_USE_V1_API=false",
 		fmt.Sprintf("KUBECONFIG=%s", kubeCfgFile),
 	}
 	if _, err := k.commander.Execute("gcloud", args, envs); err != nil {

diff --git a/pkg/kubeconfig/kubeconfig_test.go b/pkg/kubeconfig/kubeconfig_test.go
@@ -105,8 +105,6 @@ func TestAddRegionalCluster(t *testing.T) {
 			"--project=test-project",
 		}
 		envs := []string{
-			"CLOUDSDK_CONTAINER_USE_V1_API_CLIENT=false",
-			"CLOUDSDK_CONTAINER_USE_V1_API=false",
 			"KUBECONFIG=/Users/test/.kube/configs/test-context",
 		}
 		mockCmdr.EXPECT().Execute("gcloud", args, envs).Return("Context added successfully", nil)
@@ -135,8 +133,6 @@ func TestAddRegionalCluster(t *testing.T) {
 			"--project=test-project",
 		}
 		envs := []string{
-			"CLOUDSDK_CONTAINER_USE_V1_API_CLIENT=false",
-			"CLOUDSDK_CONTAINER_USE_V1_API=false",
 			"KUBECONFIG=/Users/test/.kube/configs/test-context",
 		}
 		mockCmdr.EXPECT().Execute("gcloud", args, envs).Return("", fmt.Errorf("some error"))

diff --git a/pkg/kubetmuxp/kubetmuxp.go b/pkg/kubetmuxp/kubetmuxp.go
@@ -121,9 +121,13 @@ func (c *Config) Process() error {
 			if regional, err := cluster.IsRegional(); err != nil {
 				return err
 			} else if regional {
-				c.kubeCfg.AddRegionalCluster(project.Name, cluster.Name, cluster.Region, kubeCfgFile)
+				if err := c.kubeCfg.AddRegionalCluster(project.Name, cluster.Name, cluster.Region, kubeCfgFile); err != nil {
+					return err
+				}
 			} else {
-				c.kubeCfg.AddZonalCluster(project.Name, cluster.Name, cluster.Zone, kubeCfgFile)
+				if err := c.kubeCfg.AddZonalCluster(project.Name, cluster.Name, cluster.Zone, kubeCfgFile); err != nil {
+					return err
+				}
 			}
 
 			fmt.Println("Renaming context...")