From e4d880bd62fc694bffc188a680c9c088a86a5167 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Sat, 7 Sep 2019 19:42:56 -0700 Subject: [PATCH] Return proper Kind in error for Cacher --- .../src/k8s.io/apiserver/pkg/storage/cacher/cacher.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go index 822615fb6c6..69a9b236d1f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go @@ -624,7 +624,10 @@ func (c *Cacher) GetToList(ctx context.Context, key string, resourceVersion stri return err } listVal, err := conversion.EnforcePtr(listPtr) - if err != nil || listVal.Kind() != reflect.Slice { + if err != nil { + return err + } + if listVal.Kind() != reflect.Slice { return fmt.Errorf("need a pointer to slice, got %v", listVal.Kind()) } filter := filterWithAttrsFunction(key, pred) @@ -693,7 +696,10 @@ func (c *Cacher) List(ctx context.Context, key string, resourceVersion string, p return err } listVal, err := conversion.EnforcePtr(listPtr) - if err != nil || listVal.Kind() != reflect.Slice { + if err != nil { + return err + } + if listVal.Kind() != reflect.Slice { return fmt.Errorf("need a pointer to slice, got %v", listVal.Kind()) } filter := filterWithAttrsFunction(key, pred)