Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change format.Writer to not format phase output log lines #1431

Merged
merged 2 commits into from
May 6, 2022
Merged

Change format.Writer to not format phase output log lines #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c73560f
Change format.Writer to not format phase output log lines
ihcsim May 6, 2022
1f2cb3a
Merge branch 'master' into fix-output-parse
mergify[bot] May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"github.com/kanisterio/kanister/pkg/field"
"github.com/kanisterio/kanister/pkg/log"
pkgout "github.com/kanisterio/kanister/pkg/output"
)

var regex = regexp.MustCompile("[\r\n]")
Expand All @@ -36,6 +37,10 @@ func Log(podName string, containerName string, output string) {
func LogTo(w io.Writer, pod string, container string, output string) {
if output != "" {
for _, line := range regex.Split(output, -1) {
if strings.Contains(line, pkgout.PhaseOpString) {
continue
}

if line != "" {
fields := field.M{
"Pod": pod,
Expand Down
6 changes: 2 additions & 4 deletions pkg/function/kube_exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,9 @@ func (s *KubeExecTest) TestParseLogAndCreateOutput(c *C) {
outChecker Checker
}{
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"}", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"}\n###Phase-output###: {\"key\":\"path\",\"value\":\"/backup/path\"}",
map[string]interface{}{"version": "0.78.0", "path": "/backup/path"}, IsNil, NotNil},
{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"}", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"},Random message", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"Random message ###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"},Random message", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"{\"Out\":\"###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"}\"}", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"{\"Out\":\"###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"}\", \"Pod\":\"my-pod\"}", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"Random message with newline \n###Phase-output###: {\"key\":\"version\",\"value\":\"0.78.0\"}", map[string]interface{}{"version": "0.78.0"}, IsNil, NotNil},
{"###Phase-output###: Invalid message", nil, NotNil, IsNil},
{"Random message", nil, IsNil, IsNil},
Expand Down
17 changes: 2 additions & 15 deletions pkg/output/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,7 @@ func fPrintOutput(w io.Writer, key, value string) error {
return nil
}

// reStr looks for phase output patterns from log lines.
// it matches these patterns:
// case1: some-prefix###Phase-output###: {"foo":"bar"}
// case2: ###Phase-output###: {"foo":"bar","baz":"bazz"}some-suffix
// case3: ###Phase-output###: {"foo":"bar","baz":"bazz"}
// case4: ###Phase-output###: foo
// See unit tests.
// {.*?} ensures non-greedy evaluation so that the matching will stop at the
// first curly bracket.
// The Parse function return case4 as errors to the caller.
const reStr = `(.*)` + PhaseOpString + `( *)({.*?}|.*)`
const reStr = PhaseOpString + `(.*)$`

var logRE = regexp.MustCompile(reStr)

Expand All @@ -101,12 +91,9 @@ func Parse(l string) (*Output, error) {
if len(match) == 0 {
return nil, nil
}

stripped := strings.Replace(match[0][3], "\\", "", -1)
op, err := UnmarshalOutput(stripped)
op, err := UnmarshalOutput(match[0][1])
if err != nil {
return nil, err
}

return op, nil
}