kgo record formatter: accept %v{} to be a no-op (plain read/format)

twmb · Sep 1, 2023 · 14d21d2 · 14d21d2
1 parent e71ffc6
commit 14d21d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/pkg/kgo/record_formatter.go b/pkg/kgo/record_formatter.go
@@ -367,6 +367,9 @@ func NewRecordFormatter(layout string) (*RecordFormatter, error) {
 			var appendFn func([]byte, []byte) []byte
 			if handledBrace = isOpenBrace; handledBrace {
 				switch {
+				case strings.HasPrefix(layout, "}"):
+					layout = layout[len("}"):]
+					appendFn = appendPlain
 				case strings.HasPrefix(layout, "base64}"):
 					appendFn = appendBase64
 					layout = layout[len("base64}"):]
@@ -1298,6 +1301,8 @@ func (r *RecordReader) parseReadLayout(layout string) error {
 			var isJson bool
 			if handledBrace = isOpenBrace; handledBrace {
 				switch {
+				case strings.HasPrefix(layout, "}"):
+					layout = layout[len("}"):]
 				case strings.HasPrefix(layout, "base64}"):
 					decodeFn = decodeBase64
 					layout = layout[len("base64}"):]

diff --git a/pkg/kgo/record_formatter_test.go b/pkg/kgo/record_formatter_test.go
@@ -44,6 +44,10 @@ func TestRecordFormatter(t *testing.T) {
 			layout: "%v",
 			expR:   "value",
 		},
+		{
+			layout: "%v{}",
+			expR:   "value",
+		},
 
 		{
 			layout: "%T{hex16}%t %V{ascii} %v %V{little16} %k %K{big32} %o",
@@ -233,6 +237,11 @@ func TestRecordReader(t *testing.T) {
 			in:     "foo bar biz\nbaz",
 			exp:    []*Record{StringRecord("foo bar biz\nbaz")},
 		},
+		{
+			layout: "%v{}",
+			in:     "foo bar biz\nbaz",
+			exp:    []*Record{StringRecord("foo bar biz\nbaz")},
+		},
 
 		{
 			layout: "%k %v",