fix: switch to bufio.Reader for KubeTask output parsing

BUILD.md

@@ -114,6 +114,14 @@ Kanister is using `check` library to extend go testing capabilities: https://git
 It's recommended to write new tests using this library for consistency.
 
 `make test` runs all tests in the repository.
+It's possible to run a specific test with `TEST_FILTER` environment variable:
+
+```
+make tests TEST_FILTER=OutputTestSuite
+```
+
+This variable will be passed to `-check.f` flag and supports regex filters.
+
 To run tests for specific package you can run `go test` in that package directory.
 It's recommended to do that in build image shell, you can run it with `make shell`.
 

Makefile

@@ -155,7 +155,7 @@ deploy: release-controller .deploy-$(DOTFILE_IMAGE)
 	@kubectl apply -f .deploy-$(DOTFILE_IMAGE)
 
 test: build-dirs
-	@$(MAKE) run CMD="./build/test.sh $(SRC_DIRS)"
+	@$(MAKE) run CMD="TEST_FILTER=$(TEST_FILTER) ./build/test.sh $(SRC_DIRS)"
 
 helm-test: build-dirs
 	@$(MAKE) run CMD="./build/helm-test.sh $(SRC_DIRS)"

build/test.sh

@@ -24,6 +24,13 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 export CGO_ENABLED=0
 export GO111MODULE=on
 
+TEST_FILTER="${TEST_FILTER:-}"
+GOCHECK_FILTER=""
+if [ -n "${TEST_FILTER}" ]; then
+    echo "Using test filter ${TEST_FILTER}"
+    GOCHECK_FILTER="-check.f ${TEST_FILTER}"
+fi
+
 TARGETS=$(for d in "$@"; do echo ./$d/...; done)
 
 echo -n "Checking gofmt: "
@@ -79,7 +86,7 @@ check_dependencies
 
 echo "Running tests:"
 go test -v ${TARGETS} -list .
-go test -v -installsuffix "static" ${TARGETS} -check.v
+go test -v -installsuffix "static" ${TARGETS} -check.v ${GOCHECK_FILTER}
 echo
 
 echo "PASS"

pkg/function/kube_exec.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"io"
 	"os"
-	"regexp"
+	"strings"
 	"time"
 
 	kanister "github.com/kanisterio/kanister/pkg"
@@ -60,22 +60,15 @@ func parseLogAndCreateOutput(out string) (map[string]interface{}, error) {
 	if out == "" {
 		return nil, nil
 	}
-	var op map[string]interface{}
-	logs := regexp.MustCompile("[\n]").Split(out, -1)
-	for _, l := range logs {
-		opObj, err := output.Parse(l)
-		if err != nil {
-			return nil, err
-		}
-		if opObj == nil {
-			continue
-		}
-		if op == nil {
-			op = make(map[string]interface{})
-		}
-		op[opObj.Key] = opObj.Value
+
+	reader := io.NopCloser(strings.NewReader(out))
+	output, err := output.LogAndParse(context.Background(), reader)
+
+	// For some reason we expect empty output to be returned as nil here
+	if len(output) == 0 {
+		return nil, err
 	}
-	return op, nil
+	return output, err
 }
 
 func (kef *kubeExecFunc) Exec(ctx context.Context, tp param.TemplateParams, args map[string]interface{}) (map[string]interface{}, error) {

pkg/function/kube_task_test.go

@@ -16,7 +16,9 @@ package function
 
 import (
 	"context"
+	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	. "gopkg.in/check.v1"
@@ -61,6 +63,24 @@ func (s *KubeTaskSuite) TearDownSuite(c *C) {
 	}
 }
 
+func bigOutputPhase(namespace string) crv1alpha1.BlueprintPhase {
+	longstring := strings.Repeat("a", 100000)
+	return crv1alpha1.BlueprintPhase{
+		Name: "testOutput",
+		Func: KubeTaskFuncName,
+		Args: map[string]interface{}{
+			KubeTaskNamespaceArg: namespace,
+			KubeTaskImageArg:     consts.LatestKanisterToolsImage,
+			KubeTaskCommandArg: []string{
+				"sh",
+				"-c",
+				// We output a line for log only, and a line with output at the tail
+				fmt.Sprintf("echo -n %s > tmpfile; cat tmpfile; echo; cat tmpfile; kando output longstring $(cat tmpfile)", longstring),
+			},
+		},
+	}
+}
+
 func outputPhase(namespace string) crv1alpha1.BlueprintPhase {
 	return crv1alpha1.BlueprintPhase{
 		Name: "testOutput",
@@ -161,3 +181,45 @@ func (s *KubeTaskSuite) TestKubeTask(c *C) {
 		}
 	}
 }
+
+func (s *KubeTaskSuite) TestKubeTaskWithBigOutput(c *C) {
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	defer cancel()
+	tp := param.TemplateParams{
+		StatefulSet: &param.StatefulSetParams{
+			Namespace: s.namespace,
+		},
+		PodOverride: crv1alpha1.JSONMap{
+			"containers": []map[string]interface{}{
+				{
+					"name":            "container",
+					"imagePullPolicy": "Always",
+				},
+			},
+		},
+	}
+	expectedOut := strings.Repeat("a", 100000)
+	action := "test"
+	for _, tc := range []struct {
+		bp   *crv1alpha1.Blueprint
+		outs []map[string]interface{}
+	}{
+		{
+			bp: newTaskBlueprint(bigOutputPhase(s.namespace)),
+			outs: []map[string]interface{}{
+				{
+					"longstring": expectedOut,
+				},
+			},
+		},
+	} {
+		phases, err := kanister.GetPhases(*tc.bp, action, kanister.DefaultVersion, tp)
+		c.Assert(err, IsNil)
+		c.Assert(phases, HasLen, len(tc.outs))
+		for i, p := range phases {
+			out, err := p.Exec(ctx, *tc.bp, action, tp)
+			c.Assert(err, IsNil, Commentf("Phase %s failed", p.Name()))
+			c.Assert(out, DeepEquals, tc.outs[i])
+		}
+	}
+}

pkg/output/output.go

@@ -20,7 +20,6 @@ import (
 	"io"
 	"os"
 	"regexp"
-	"strings"
 
 	"github.com/pkg/errors"
 )
@@ -47,7 +46,7 @@ func marshalOutput(key, value string) (string, error) {
 }
 
 // UnmarshalOutput unmarshals output json into Output struct
-func UnmarshalOutput(opString string) (*Output, error) {
+func UnmarshalOutput(opString []byte) (*Output, error) {
 	p := &Output{}
 	err := json.Unmarshal([]byte(opString), p)
 	return p, errors.Wrap(err, "Failed to unmarshal key-value pair")
@@ -85,20 +84,3 @@ func fPrintOutput(w io.Writer, key, value string) error {
 	fmt.Fprintln(w, PhaseOpString, outString)
 	return nil
 }
-
-const reStr = PhaseOpString + `(.*)$`
-
-var logRE = regexp.MustCompile(reStr)
-
-func Parse(l string) (*Output, error) {
-	l = strings.TrimSpace(l)
-	match := logRE.FindAllStringSubmatch(l, 1)
-	if len(match) == 0 {
-		return nil, nil
-	}
-	op, err := UnmarshalOutput(match[0][1])
-	if err != nil {
-		return nil, err
-	}
-	return op, nil
-}

pkg/output/output_test.go

@@ -16,6 +16,9 @@ package output
 
 import (
 	"bytes"
+	"context"
+	"io"
+	"strings"
 	"testing"
 
 	. "gopkg.in/check.v1"
@@ -45,13 +48,27 @@ func (s *OutputSuite) TestValidateKey(c *C) {
 	}
 }
 
+// FIXME: replace this with TestLogAndParse
+func parse(str string) (*Output, error) {
+	reader := io.NopCloser(strings.NewReader(str))
+	output, err := LogAndParse(context.Background(), reader)
+	var o *Output
+	for k, v := range output {
+		o = &Output{
+			Key:   k,
+			Value: v.(string),
+		}
+	}
+	return o, err
+}
+
 func (s *OutputSuite) TestParseValid(c *C) {
 	key, val := "foo", "bar"
 	b := bytes.NewBuffer(nil)
 	err := fPrintOutput(b, key, val)
 	c.Check(err, IsNil)
 
-	o, err := Parse(b.String())
+	o, err := parse(b.String())
 	c.Assert(err, IsNil)
 	c.Assert(o, NotNil)
 	c.Assert(o.Key, Equals, key)
@@ -77,7 +94,7 @@ func (s *OutputSuite) TestParseNoOutput(c *C) {
 			checker: IsNil,
 		},
 	} {
-		o, err := Parse(tc.s)
+		o, err := parse(tc.s)
 		c.Assert(err, tc.checker)
 		c.Assert(o, IsNil)
 	}