commands/.../test/*: make the tests work and improve output

Author: AlexNPavel

commands/operator-sdk/cmd/test/cluster.go

@@ -15,6 +15,7 @@
 package cmdtest
 
 import (
+	"bytes"
 	"fmt"
 	"os"
 	"os/exec"
@@ -54,12 +55,22 @@ func NewTestClusterCmd() *cobra.Command {
 }
 
 func testClusterFunc(cmd *cobra.Command, args []string) {
+	if len(args) != 1 {
+		cmdError.ExitWithError(cmdError.ExitBadArgs, fmt.Errorf("operator-sdk test cluster requires exactly 1 argument"))
+	}
 	if globalManifestPathCluster != "" {
 		globalCmd := exec.Command("kubectl", "create", "-f", globalManifestPathCluster)
 		cmdOut, err := globalCmd.CombinedOutput()
 		if err != nil {
-			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("could not create global resources: %v\nKubectl Output: %v", err, cmdOut))
+			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("could not create global resources: %v\nKubectl Output: %v", err, string(cmdOut)))
 		}
+		defer func() {
+			globalCmd := exec.Command("kubectl", "delete", "-f", globalManifestPathCluster)
+			cmdOut, err := globalCmd.CombinedOutput()
+			if err != nil {
+				cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("could not delete global resources: %v\nKubectl Output: %v", err, string(cmdOut)))
+			}
+		}()
 	}
 	testPod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -91,19 +102,33 @@ func testClusterFunc(cmd *cobra.Command, args []string) {
 	if err != nil {
 		cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to create test pod: %v", err))
 	}
+	defer func() {
+		err = kubeclient.CoreV1().Pods(testNamespace).Delete(testPod.Name, &metav1.DeleteOptions{})
+		if err != nil {
+			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to delete test pod"))
+		}
+	}()
 	for {
-		testPod, err = kubeclient.CoreV1().Pods(testNamespace).Get("operator-test", metav1.GetOptions{})
+		testPod, err = kubeclient.CoreV1().Pods(testNamespace).Get(testPod.Name, metav1.GetOptions{})
 		if err != nil {
 			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to get test pod: %v", err))
 		}
 		if testPod.Status.Phase != v1.PodSucceeded && testPod.Status.Phase != v1.PodFailed {
 			time.Sleep(time.Second * 5)
 			continue
 		} else if testPod.Status.Phase == v1.PodSucceeded {
-			fmt.Printf("Test Successfully Completed")
+			fmt.Printf("Test Successfully Completed\n")
 			return
 		} else if testPod.Status.Phase == v1.PodFailed {
-			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("test Failed: %+v", kubeclient.CoreV1().Pods(testNamespace).GetLogs("operator-test", &v1.PodLogOptions{})))
+			req := kubeclient.CoreV1().Pods(testNamespace).GetLogs(testPod.Name, &v1.PodLogOptions{})
+			readCloser, err := req.Stream()
+			if err != nil {
+				cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("test failed and failed to get error logs"))
+			}
+			defer readCloser.Close()
+			buf := new(bytes.Buffer)
+			buf.ReadFrom(readCloser)
+			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("test failed:\n%+v", buf.String()))
 		}
 	}
 }

commands/operator-sdk/cmd/test/local.go

@@ -55,6 +55,9 @@ func NewTestLocalCmd() *cobra.Command {
 }
 
 func testLocalFunc(cmd *cobra.Command, args []string) {
+	if len(args) != 1 {
+		cmdError.ExitWithError(cmdError.ExitBadArgs, fmt.Errorf("operator-sdk test local requires exactly 1 argument"))
+	}
 	// if no namespaced manifest path is given, combine deploy/rbac.yaml and deploy/operator.yaml
 	if namespacedManifestPath == "" {
 		os.Mkdir("deploy/test", os.FileMode(int(0775)))