github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate YAML and JSON numbers

Browse Source 
Both YAML and JSON can contain numbers
This commit is contained in:
Clayton Coleman
2016-06-06 17:14:35 -04:00
parent 2ed3246631
commit 653ddbb01e
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/resource/quantity.go
View File

@@ -626,10 +626,7 @@ func (q *Quantity) UnmarshalJSON(value []byte) error {
q.i = int64Amount{} q.i = int64Amount{}
return nil return nil
} }
if l < 2 { if l >= 2 && value[0] == '"' && value[l-1] == '"' {
return ErrFormatWrong
}
if value[0] == '"' && value[l-1] == '"' {
value = value[1 : l-1] value = value[1 : l-1]
} }

21
pkg/api/resource/quantity_test.go
View File

@@ -826,11 +826,24 @@ func TestJSON(t *testing.T) {
func TestJSONWhitespace(t *testing.T) { func TestJSONWhitespace(t *testing.T) {
q := Quantity{} q := Quantity{}
for _, s := range []string{" 1", "1 "} { testCases := []struct {
if err := json.Unmarshal([]byte(`"`+s+`"`), &q); err != nil { in string
t.Errorf("%q: %v", s, err) expect string
}{
{`" 1"`, "1"},
{`"1 "`, "1"},
{`1`, "1"},
{` 1`, "1"},
{`1 `, "1"},
{`10`, "10"},
{`-1`, "-1"},
{` -1`, "-1"},
}
for _, test := range testCases {
if err := json.Unmarshal([]byte(test.in), &q); err != nil {
t.Errorf("%q: %v", test.in, err)
} }
if q.String() != "1" { if q.String() != test.expect {
t.Errorf("unexpected string: %q", q.String()) t.Errorf("unexpected string: %q", q.String())
} }
} }