Merge pull request #73 from wunderio/feature/cloud-login-test

test connection after cloud login, remove failed release log

Author: Rade333

cmd/ciCloudLogin.go

@@ -48,6 +48,9 @@ var cloudLoginCmd = &cobra.Command{
 	  - "--aks-tenant-id" flag or "AKS_TENANT_ID" environment variable
 	  - "--aks-sp-app-id" flag or "AKS_SP_APP_ID" environment variable
 	  - "--aks-sp-password" flag or "AKS_SP_PASSWORD" environment variable
+
+	After login, the connection is tested by running "kubectl can-i get pods" command, 
+	disable with "--test-connection=false" flag.
 	`,
 	Run: func(cmd *cobra.Command, args []string) {
 
@@ -77,7 +80,7 @@ var cloudLoginCmd = &cobra.Command{
 		}
 
 		// Environment value fallback
-		if useEnv == true {
+		if useEnv {
 			if len(clusterName) == 0 {
 				clusterName = os.Getenv("CLUSTER_NAME")
 			}
@@ -267,7 +270,7 @@ var cloudLoginCmd = &cobra.Command{
 
 		// Execute login commands
 		if command != "" {
-			if debug == true {
+			if debug {
 				fmt.Printf("Command (not executed): %s\n", command)
 			} else {
 				out, err := exec.Command("bash", "-c", command).CombinedOutput()
@@ -278,6 +281,20 @@ var cloudLoginCmd = &cobra.Command{
 				fmt.Printf("%s\n", out)
 			}
 		}
+
+		// Test connection
+		testConnection, _ := cmd.Flags().GetBool("test-connection")
+		if testConnection {
+			if !debug {
+				command = "kubectl auth can-i get pods"
+				_, err := exec.Command("bash", "-c", command).CombinedOutput()
+				if err != nil {
+					log.Fatal("Error: ", err)
+				}
+			} else {
+				fmt.Printf("Command (not executed): %s\n", command)
+			}
+		}
 	},
 }
 
@@ -299,4 +316,5 @@ func init() {
 	cloudLoginCmd.Flags().String("aks-tenant-id", "", "Azure Services tenant id")
 	cloudLoginCmd.Flags().String("aks-sp-app-id", "", "Azure Services servicePrincipal app id")
 	cloudLoginCmd.Flags().String("aks-sp-password", "", "Azure Services servicePrincipal password")
+	cloudLoginCmd.Flags().Bool("test-connection", true, "Test connection after login")
 }

cmd/ciReleaseDeploy.go

@@ -353,6 +353,7 @@ var ciReleaseDeployCmd = &cobra.Command{
 				else
 					true
 				fi
+				rm -f helm-output.log
 			}
 
 			trap show_failing_pods ERR
@@ -421,6 +422,7 @@ var ciReleaseDeployCmd = &cobra.Command{
 					echo "$statefulsets" | xargs -n 1 kubectl rollout status statefulset -n "$NAMESPACE" --timeout 5m
 				fi
 				kubectl get deployment -n "$NAMESPACE" -l "release=${RELEASE_NAME}" -o name | xargs -n 1 kubectl rollout status -n "$NAMESPACE" --timeout 5m
+				rm -f helm-output.log
 				`,
 				releaseName, chartName, chartRepository, chartVersionOverride,
 				siltaEnvironmentName, branchname,
@@ -612,6 +614,7 @@ var ciReleaseDeployCmd = &cobra.Command{
 				else
 					true
 				fi
+				rm -f helm-output.log
 			}
 
 			trap show_failing_pods ERR
@@ -684,6 +687,7 @@ var ciReleaseDeployCmd = &cobra.Command{
 					echo "$statefulsets" | xargs -n 1 kubectl rollout status statefulset -n "$NAMESPACE" --timeout 5m
 				fi
 				kubectl get deployment -n "$NAMESPACE" -l "release=${RELEASE_NAME}" -o name | xargs -n 1 kubectl rollout status -n "$NAMESPACE" --timeout 5m
+				rm -f helm-output.log
 				`,
 				releaseName, chartName, chartRepository, chartVersionOverride,
 				siltaEnvironmentName, branchname,

tests/cloud_test.go

@@ -14,7 +14,9 @@ func TestCloudLoginCmd(t *testing.T) {
 	// Custom kubeconfig
 	command := "cloud login --kubeconfig `echo \"TEST\" | base64` --kubeconfigpath tmpkubeconfig --debug; cat tmpkubeconfig; rm tmpkubeconfig"
 	environment := []string{}
-	testString := "TEST\n"
+	testString := `Command (not executed): 
+TEST
+`
 	CliExecTest(t, command, environment, testString, true)
 
 	// Custom kubeconfig as env variable
@@ -23,7 +25,9 @@ func TestCloudLoginCmd(t *testing.T) {
 		// echo "TEST2" | base64 => "VEVTVDIK"
 		"KUBECTL_CONFIG=VEVTVDIK",
 	}
-	testString = "TEST2\n"
+	testString = `Command (not executed): 
+TEST2
+`
 	CliExecTest(t, command, environment, testString, true)
 
 	// TODO: test gcp, aws and aks

tests/release_test.go

@@ -197,6 +197,7 @@ func TestReleaseDeployCmd(t *testing.T) {
 				else
 					true
 				fi
+				rm -f helm-output.log
 			}
 
 			trap show_failing_pods ERR
@@ -308,6 +309,7 @@ func TestReleaseDeployCmd(t *testing.T) {
 				else
 					true
 				fi
+				rm -f helm-output.log
 			}
 
 			trap show_failing_pods ERR