From 40f3f3bd0e086f935f7ae617bf77ba5d5a16d630 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Tue, 4 Jun 2019 11:52:26 +0800 Subject: [PATCH] Fix return value for ExtractFieldPathAsString --- pkg/fieldpath/fieldpath.go | 2 +- pkg/fieldpath/fieldpath_test.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/fieldpath/fieldpath.go b/pkg/fieldpath/fieldpath.go index b997751ec81..a104a70bc73 100644 --- a/pkg/fieldpath/fieldpath.go +++ b/pkg/fieldpath/fieldpath.go @@ -46,7 +46,7 @@ func FormatMap(m map[string]string) (fmtStr string) { func ExtractFieldPathAsString(obj interface{}, fieldPath string) (string, error) { accessor, err := meta.Accessor(obj) if err != nil { - return "", nil + return "", err } if path, subscript, ok := SplitMaybeSubscriptedPath(fieldPath); ok { diff --git a/pkg/fieldpath/fieldpath_test.go b/pkg/fieldpath/fieldpath_test.go index efa8e99477f..0aa6ad56d72 100644 --- a/pkg/fieldpath/fieldpath_test.go +++ b/pkg/fieldpath/fieldpath_test.go @@ -33,9 +33,10 @@ func TestExtractFieldPathAsString(t *testing.T) { expectedMessageFragment string }{ { - name: "not an API object", - fieldPath: "metadata.name", - obj: "", + name: "not an API object", + fieldPath: "metadata.name", + obj: "", + expectedMessageFragment: "object does not implement the Object interfaces", }, { name: "ok - namespace",