Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Increase max token size in multidoc yaml parser #826

Merged
merged 1 commit into from
Nov 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cluster/kubernetes/resource/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ func Load(roots ...string) (map[string]resource.Resource, error) {
func ParseMultidoc(multidoc []byte, source string) (map[string]resource.Resource, error) {
objs := map[string]resource.Resource{}
chunks := bufio.NewScanner(bytes.NewReader(multidoc))
initialBuffer := make([]byte, 4096) // Matches startBufSize in bufio/scan.go
chunks.Buffer(initialBuffer, 1024*1024) // Allow growth to 1MB
chunks.Split(splitYAMLDocument)

var obj resource.Resource
Expand Down
21 changes: 21 additions & 0 deletions cluster/kubernetes/resource/load_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package resource

import (
"bytes"
"reflect"
"testing"

Expand Down Expand Up @@ -96,6 +97,26 @@ metadata:
}
}

func TestParseSomeLong(t *testing.T) {
doc := `---
kind: ConfigMap
metadata:
name: bigmap
data:
bigdata: |
`
buffer := bytes.NewBufferString(doc)
line := " The quick brown fox jumps over the lazy dog.\n"
for buffer.Len()+len(line) < 1024*1024 {
buffer.WriteString(line)
}

_, err := ParseMultidoc(buffer.Bytes(), "test")
if err != nil {
t.Error(err)
}
}

func debyte(r resource.Resource) resource.Resource {
if res, ok := r.(interface {
debyte()
Expand Down