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

Fix strict json decoder test

Browse Source
This commit is contained in:
Jordan Liggitt 2021-10-15 10:47:14 -04:00
parent fd64f8d7ef
commit b4632c38f0
1 changed files with 25 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json_test.go
View File

@ -22,6 +22,7 @@ import (
"strings" "strings"
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/json"
@ -30,11 +31,12 @@ import (
) )
type testDecodable struct { type testDecodable struct {
metav1.TypeMeta `json:",inline"`
Other string Other string
Value int `json:"value"` Value int `json:"value"`
Spec DecodableSpec `json:"spec"` Spec DecodableSpec `json:"spec"`
Interface interface{} `json:"interface"` Interface interface{} `json:"interface"`
gvk schema.GroupVersionKind
} }
// DecodableSpec has 15 fields. json-iterator treats struct with more than 10 // DecodableSpec has 15 fields. json-iterator treats struct with more than 10
@ -57,9 +59,6 @@ type DecodableSpec struct {
O int `json:"o"` O int `json:"o"`
} }
func (d *testDecodable) GetObjectKind() schema.ObjectKind { return d }
func (d *testDecodable) SetGroupVersionKind(gvk schema.GroupVersionKind) { d.gvk = gvk }
func (d *testDecodable) GroupVersionKind() schema.GroupVersionKind { return d.gvk }
func (d *testDecodable) DeepCopyObject() runtime.Object { func (d *testDecodable) DeepCopyObject() runtime.Object {
if d == nil { if d == nil {
return nil return nil
@ -74,7 +73,6 @@ func (d *testDecodable) DeepCopyInto(out *testDecodable) {
out.Value = d.Value out.Value = d.Value
out.Spec = d.Spec out.Spec = d.Spec
out.Interface = d.Interface out.Interface = d.Interface
out.gvk = d.gvk
return return
} }
@ -121,7 +119,7 @@ func TestDecode(t *testing.T) {
data: []byte(`{"apiVersion":"blah"}`), data: []byte(`{"apiVersion":"blah"}`),
defaultGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, defaultGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
creater: &mockCreater{obj: &testDecodable{}}, creater: &mockCreater{obj: &testDecodable{}},
expectedObject: &testDecodable{}, expectedObject: &testDecodable{TypeMeta: metav1.TypeMeta{APIVersion: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "", Version: "blah"},
}, },
// group without version is defaulted // group without version is defaulted
@ -129,7 +127,7 @@ func TestDecode(t *testing.T) {
data: []byte(`{"apiVersion":"other/"}`), data: []byte(`{"apiVersion":"other/"}`),
defaultGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, defaultGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
creater: &mockCreater{obj: &testDecodable{}}, creater: &mockCreater{obj: &testDecodable{}},
expectedObject: &testDecodable{}, expectedObject: &testDecodable{TypeMeta: metav1.TypeMeta{APIVersion: "other/"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
}, },
// group version, kind is defaulted // group version, kind is defaulted
@ -137,7 +135,7 @@ func TestDecode(t *testing.T) {
data: []byte(`{"apiVersion":"other1/blah1"}`), data: []byte(`{"apiVersion":"other1/blah1"}`),
defaultGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, defaultGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
creater: &mockCreater{obj: &testDecodable{}}, creater: &mockCreater{obj: &testDecodable{}},
expectedObject: &testDecodable{}, expectedObject: &testDecodable{TypeMeta: metav1.TypeMeta{APIVersion: "other1/blah1"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other1", Version: "blah1"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other1", Version: "blah1"},
}, },
// gvk all provided then not defaulted at all // gvk all provided then not defaulted at all
@ -145,17 +143,17 @@ func TestDecode(t *testing.T) {
data: []byte(`{"kind":"Test","apiVersion":"other/blah"}`), data: []byte(`{"kind":"Test","apiVersion":"other/blah"}`),
defaultGVK: &schema.GroupVersionKind{Kind: "Test1", Group: "other1", Version: "blah1"}, defaultGVK: &schema.GroupVersionKind{Kind: "Test1", Group: "other1", Version: "blah1"},
creater: &mockCreater{obj: &testDecodable{}}, creater: &mockCreater{obj: &testDecodable{}},
expectedObject: &testDecodable{}, expectedObject: &testDecodable{TypeMeta: metav1.TypeMeta{APIVersion: "other/blah", Kind: "Test"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
}, },
//gvk defaulting if kind not provided in data and defaultGVK use into's kind //gvk defaulting if kind not provided in data and defaultGVK use into's kind
{ {
data: []byte(`{"apiVersion":"b1/c1"}`), data: []byte(`{"apiVersion":"b1/c1"}`),
into: &testDecodable{gvk: schema.GroupVersionKind{Kind: "a3", Group: "b1", Version: "c1"}}, into: &testDecodable{TypeMeta: metav1.TypeMeta{Kind: "a3", APIVersion: "b1/c1"}},
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "a3", Group: "b1", Version: "c1"}}, typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "a3", Group: "b1", Version: "c1"}},
defaultGVK: nil, defaultGVK: nil,
creater: &mockCreater{obj: &testDecodable{}}, creater: &mockCreater{obj: &testDecodable{}},
expectedObject: &testDecodable{gvk: schema.GroupVersionKind{Kind: "a3", Group: "b1", Version: "c1"}}, expectedObject: &testDecodable{TypeMeta: metav1.TypeMeta{Kind: "a3", APIVersion: "b1/c1"}},
expectedGVK: &schema.GroupVersionKind{Kind: "a3", Group: "b1", Version: "c1"}, expectedGVK: &schema.GroupVersionKind{Kind: "a3", Group: "b1", Version: "c1"},
}, },
@ -199,8 +197,9 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})}, typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
expectedObject: &testDecodable{ expectedObject: &testDecodable{
Other: "test", TypeMeta: metav1.TypeMeta{APIVersion: "other/blah", Kind: "Test"},
Value: 1, Other: "test",
Value: 1,
}, },
}, },
// registered types get defaulted by the into object kind // registered types get defaulted by the into object kind
@ -243,7 +242,8 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})}, typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
expectedObject: &testDecodable{ expectedObject: &testDecodable{
Other: "test", TypeMeta: metav1.TypeMeta{APIVersion: "other/blah", Kind: "Test"},
Other: "test",
}, },
}, },
// Unmarshalling is case-sensitive for big struct. // Unmarshalling is case-sensitive for big struct.
@ -254,7 +254,8 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})}, typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
expectedObject: &testDecodable{ expectedObject: &testDecodable{
Spec: DecodableSpec{A: 1, H: 3}, TypeMeta: metav1.TypeMeta{APIVersion: "other/blah", Kind: "Test"},
Spec: DecodableSpec{A: 1, H: 3},
}, },
}, },
// Unknown fields should return an error from the strict JSON deserializer. // Unknown fields should return an error from the strict JSON deserializer.
@ -275,7 +276,7 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}}, typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "found unknown field") return strings.Contains(err.Error(), "found unknown field: unknown")
}, },
yaml: true, yaml: true,
strict: true, strict: true,
@ -287,7 +288,7 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}}, typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "already set in map") return strings.Contains(err.Error(), `"value" already set in map`)
}, },
strict: true, strict: true,
}, },
@ -299,33 +300,7 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}}, typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool { errFn: func(err error) bool {
return strings.Contains(err.Error(), "already set in map") return strings.Contains(err.Error(), `"value" already set in map`)
},
yaml: true,
strict: true,
},
// Strict JSON decode should fail for untagged fields.
{
data: []byte(`{"kind":"Test","apiVersion":"other/blah","value":1,"Other":"test"}`),
into: &testDecodable{},
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool {
return strings.Contains(err.Error(), "found unknown field")
},
strict: true,
},
// Strict YAML decode should fail for untagged fields.
{
data: []byte("kind: Test\n" +
"apiVersion: other/blah\n" +
"value: 1\n" +
"Other: test\n"),
into: &testDecodable{},
typer: &mockTyper{gvk: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
errFn: func(err error) bool {
return strings.Contains(err.Error(), "found unknown field")
}, },
yaml: true, yaml: true,
strict: true, strict: true,
@ -337,8 +312,9 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})}, typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
expectedObject: &testDecodable{ expectedObject: &testDecodable{
Other: "test", TypeMeta: metav1.TypeMeta{APIVersion: "other/blah", Kind: "Test"},
Value: 1, Other: "test",
Value: 1,
}, },
strict: true, strict: true,
}, },
@ -352,8 +328,9 @@ func TestDecode(t *testing.T) {
typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})}, typer: &mockTyper{err: runtime.NewNotRegisteredErrForKind("mock", schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"})},
expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"}, expectedGVK: &schema.GroupVersionKind{Kind: "Test", Group: "other", Version: "blah"},
expectedObject: &testDecodable{ expectedObject: &testDecodable{
Other: "test", TypeMeta: metav1.TypeMeta{APIVersion: "other/blah", Kind: "Test"},
Value: 1, Other: "test",
Value: 1,
}, },
yaml: true, yaml: true,
strict: true, strict: true,