From 3fb10702338f1d216fd1e1d533f19a30018c8b58 Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 9 May 2018 13:53:07 -0400 Subject: [PATCH] construct resource.Builder from kubeconfig flags Kubernetes-commit: 1f5357034b4a8ef4ed68f0c2415e280601968e91 --- restmapper/category_expansion.go | 4 ++-- restmapper/category_expansion_test.go | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/restmapper/category_expansion.go b/restmapper/category_expansion.go index fe6f884bce..1620bbcf81 100644 --- a/restmapper/category_expansion.go +++ b/restmapper/category_expansion.go @@ -48,11 +48,11 @@ type discoveryCategoryExpander struct { // NewDiscoveryCategoryExpander returns a category expander that makes use of the "categories" fields from // the API, found through the discovery client. In case of any error or no category found (which likely // means we're at a cluster prior to categories support, fallback to the expander provided. -func NewDiscoveryCategoryExpander(client discovery.DiscoveryInterface) (CategoryExpander, error) { +func NewDiscoveryCategoryExpander(client discovery.DiscoveryInterface) CategoryExpander { if client == nil { panic("Please provide discovery client to shortcut expander") } - return discoveryCategoryExpander{discoveryClient: client}, nil + return discoveryCategoryExpander{discoveryClient: client} } // Expand fulfills CategoryExpander diff --git a/restmapper/category_expansion_test.go b/restmapper/category_expansion_test.go index bda77a89c4..8537a6b49b 100644 --- a/restmapper/category_expansion_test.go +++ b/restmapper/category_expansion_test.go @@ -135,10 +135,7 @@ func TestDiscoveryCategoryExpander(t *testing.T) { dc.serverResourcesHandler = func() ([]*metav1.APIResourceList, error) { return test.serverResponse, nil } - expander, err := NewDiscoveryCategoryExpander(dc) - if err != nil { - t.Fatalf("unexpected error %v", err) - } + expander := NewDiscoveryCategoryExpander(dc) expanded, _ := expander.Expand(test.category) if !reflect.DeepEqual(expanded, test.expected) { t.Errorf("expected %v, got %v", test.expected, expanded)