From a6dafe401f10d30dfeb9c74d08c1bde68e3bdb97 Mon Sep 17 00:00:00 2001 From: Mike Bryant Date: Mon, 10 Oct 2016 18:28:36 +0100 Subject: [PATCH] Use correct variable in thirdpartyresourcedata codec. Fixes #34459 --- pkg/registry/extensions/thirdpartyresourcedata/codec.go | 2 +- .../extensions/thirdpartyresourcedata/codec_test.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index 89993400194..29b416b9ab8 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -418,7 +418,7 @@ func (t *thirdPartyResourceDataDecoder) Decode(data []byte, gvk *unversioned.Gro return nil, nil, fmt.Errorf("unexpected object for 'kind': %v", kindObj) } if len(t.kind) > 0 && kindStr != t.kind { - return nil, nil, fmt.Errorf("kind doesn't match, expecting: %s, got %s", gvk.Kind, kindStr) + return nil, nil, fmt.Errorf("kind doesn't match, expecting: %s, got %s", t.kind, kindStr) } actual.Kind = kindStr } diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go index 0ebdfde2175..6e093f4c132 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go @@ -80,6 +80,15 @@ func TestCodec(t *testing.T) { }, name: "basic", }, + { + into: &extensions.ThirdPartyResourceData{}, + obj: &Foo{ + ObjectMeta: api.ObjectMeta{Name: "bar"}, + TypeMeta: unversioned.TypeMeta{Kind: "ThirdPartyResourceData"}, + }, + expectErr: true, + name: "broken kind", + }, { obj: &Foo{ ObjectMeta: api.ObjectMeta{Name: "bar", ResourceVersion: "baz"},