github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restmapper: add GetAPIGroupResources tests

pull/564/head
Dr. Stefan Schimanski 2019-02-11 17:22:29 +01:00
parent 3c2a4f0362
commit 57d0f9d972
3 changed files with 195 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/client-go/discovery/discovery_client.go
View File

@ -317,7 +317,7 @@ func ServerPreferredResources(d DiscoveryInterface) ([]*metav1.APIResourceList,
return result, &ErrGroupDiscoveryFailed{Groups: failedGroups}
}
// fetchServerResourcesForGroupVersions uses the discovery client to fetch the resources for the specified groups in parallel
// fetchServerResourcesForGroupVersions uses the discovery client to fetch the resources for the specified groups in parallel.
func fetchGroupVersionResources(d DiscoveryInterface, apiGroups *metav1.APIGroupList) (map[schema.GroupVersion]*metav1.APIResourceList, map[schema.GroupVersion]error) {
groupVersionResources := make(map[schema.GroupVersion]*metav1.APIResourceList)
failedGroups := make(map[schema.GroupVersion]error)
@ -341,7 +341,9 @@ func fetchGroupVersionResources(d DiscoveryInterface, apiGroups *metav1.APIGroup
if err != nil {
// TODO: maybe restrict this to NotFound errors
failedGroups[groupVersion] = err
} else {
}
if apiResourceList != nil {
// even in case of error, some fallback might have been returned
groupVersionResources[groupVersion] = apiResourceList
}
}()

1
staging/src/k8s.io/client-go/restmapper/BUILD
View File

@ -36,6 +36,7 @@ go_test(
"//staging/src/k8s.io/client-go/discovery:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/rest/fake:go_default_library",
"//vendor/github.com/davecgh/go-spew/spew:go_default_library",
"//vendor/github.com/googleapis/gnostic/OpenAPIv2:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
],

221
staging/src/k8s.io/client-go/restmapper/discovery_test.go
View File

@ -17,9 +17,11 @@ limitations under the License.
package restmapper
import (
"fmt"
"reflect"
"testing"
"github.com/davecgh/go-spew/spew"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -283,10 +285,143 @@ func TestDeferredDiscoveryRESTMapper_CacheMiss(t *testing.T) {
assert.Equal(cdc.invalidateCalls, 2, "should HAVE called Invalidate() again after another cache-miss, but with fresh==false")
}
func TestGetAPIGroupResources(t *testing.T) {
type Test struct {
name string
discovery DiscoveryInterface
expected []*APIGroupResources
expectedError error
}
for _, test := range []Test{
{"nil", &fakeFailingDiscovery{nil, nil, nil, nil}, nil, nil},
{"normal",
&fakeFailingDiscovery{
[]metav1.APIGroup{aGroup, bGroup}, nil,
map[string]*metav1.APIResourceList{"a/v1": &aResources, "b/v1": &bResources}, nil,
},
[]*APIGroupResources{
{aGroup, map[string][]metav1.APIResource{"v1": {aFoo}}},
{bGroup, map[string][]metav1.APIResource{"v1": {bBar}}},
}, nil,
},
{"groups failed, but has fallback with a only",
&fakeFailingDiscovery{
[]metav1.APIGroup{aGroup}, fmt.Errorf("error fetching groups"),
map[string]*metav1.APIResourceList{"a/v1": &aResources, "b/v1": &bResources}, nil,
},
[]*APIGroupResources{
{aGroup, map[string][]metav1.APIResource{"v1": {aFoo}}},
}, nil,
},
{"groups failed, but has no fallback",
&fakeFailingDiscovery{
nil, fmt.Errorf("error fetching groups"),
map[string]*metav1.APIResourceList{"a/v1": &aResources, "b/v1": &bResources}, nil,
},
nil, fmt.Errorf("error fetching groups"),
},
{"a failed, but has fallback",
&fakeFailingDiscovery{
[]metav1.APIGroup{aGroup, bGroup}, nil,
map[string]*metav1.APIResourceList{"a/v1": &aResources, "b/v1": &bResources}, map[string]error{"a/v1": fmt.Errorf("a failed")},
},
[]*APIGroupResources{
{aGroup, map[string][]metav1.APIResource{"v1": {aFoo}}},
{bGroup, map[string][]metav1.APIResource{"v1": {bBar}}},
}, nil, // TODO: do we want this?
},
{"a failed, but has no fallback",
&fakeFailingDiscovery{
[]metav1.APIGroup{aGroup, bGroup}, nil,
map[string]*metav1.APIResourceList{"b/v1": &bResources}, map[string]error{"a/v1": fmt.Errorf("a failed")},
},
[]*APIGroupResources{
{aGroup, map[string][]metav1.APIResource{}},
{bGroup, map[string][]metav1.APIResource{"v1": {bBar}}},
}, nil, // TODO: do we want this?
},
{"a and b failed, but have fallbacks",
&fakeFailingDiscovery{
[]metav1.APIGroup{aGroup, bGroup}, nil,
map[string]*metav1.APIResourceList{"a/v1": &aResources, "b/v1": &bResources}, // TODO: both fallbacks are ignored
map[string]error{"a/v1": fmt.Errorf("a failed"), "b/v1": fmt.Errorf("b failed")},
},
[]*APIGroupResources{
{aGroup, map[string][]metav1.APIResource{"v1": {aFoo}}},
{bGroup, map[string][]metav1.APIResource{"v1": {bBar}}},
}, nil, // TODO: do we want this?
},
} {
t.Run(test.name, func(t *testing.T) {
got, err := GetAPIGroupResources(test.discovery)
if err == nil && test.expectedError != nil {
t.Fatalf("expected error %q, but got none", test.expectedError)
} else if err != nil && test.expectedError == nil {
t.Fatalf("unexpected error: %v", err)
}
if !reflect.DeepEqual(test.expected, got) {
t.Errorf("unexpected result:\nexpected = %s\ngot = %s", spew.Sdump(test.expected), spew.Sdump(got))
}
})
}
}
var _ DiscoveryInterface = &fakeFailingDiscovery{}
type fakeFailingDiscovery struct {
groups []metav1.APIGroup
groupsErr error
resourcesForGroupVersion map[string]*metav1.APIResourceList
resourcesForGroupVersionErr map[string]error
}
func (*fakeFailingDiscovery) RESTClient() restclient.Interface {
return nil
}
func (d *fakeFailingDiscovery) ServerGroups() (*metav1.APIGroupList, error) {
if d.groups == nil && d.groupsErr != nil {
return nil, d.groupsErr
}
return &metav1.APIGroupList{Groups: d.groups}, d.groupsErr
}
func (d *fakeFailingDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
if rs, found := d.resourcesForGroupVersion[groupVersion]; found {
return rs, d.resourcesForGroupVersionErr[groupVersion]
}
return nil, fmt.Errorf("not found")
}
func (d *fakeFailingDiscovery) ServerResources() ([]*metav1.APIResourceList, error) {
return ServerResources(d)
}
func (d *fakeFailingDiscovery) ServerPreferredResources() ([]*metav1.APIResourceList, error) {
return ServerPreferredResources(d)
}
func (d *fakeFailingDiscovery) ServerPreferredNamespacedResources() ([]*metav1.APIResourceList, error) {
return ServerPreferredNamespacedResources(d)
}
func (*fakeFailingDiscovery) ServerVersion() (*version.Info, error) {
return &version.Info{}, nil
}
func (*fakeFailingDiscovery) OpenAPISchema() (*openapi_v2.Document, error) {
panic("implement me")
}
type fakeCachedDiscoveryInterface struct {
invalidateCalls int
fresh bool
enabledA bool
enabledGroupA bool
}
var _ CachedDiscoveryInterface = &fakeCachedDiscoveryInterface{}
@ -298,7 +433,7 @@ func (c *fakeCachedDiscoveryInterface) Fresh() bool {
func (c *fakeCachedDiscoveryInterface) Invalidate() {
c.invalidateCalls = c.invalidateCalls + 1
c.fresh = true
c.enabledA = true
c.enabledGroupA = true
}
func (c *fakeCachedDiscoveryInterface) RESTClient() restclient.Interface {
@ -306,47 +441,24 @@ func (c *fakeCachedDiscoveryInterface) RESTClient() restclient.Interface {
}
func (c *fakeCachedDiscoveryInterface) ServerGroups() (*metav1.APIGroupList, error) {
if c.enabledA {
if c.enabledGroupA {
return &metav1.APIGroupList{
Groups: []metav1.APIGroup{
{
Name: "a",
Versions: []metav1.GroupVersionForDiscovery{
{
GroupVersion: "a/v1",
Version: "v1",
},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "a/v1",
Version: "v1",
},
},
},
Groups: []metav1.APIGroup{aGroup},
}, nil
}
return &metav1.APIGroupList{}, nil
}
func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
if c.enabledA && groupVersion == "a/v1" {
return &metav1.APIResourceList{
GroupVersion: "a/v1",
APIResources: []metav1.APIResource{
{
Name: "foo",
Kind: "Foo",
Namespaced: false,
},
},
}, nil
if c.enabledGroupA && groupVersion == "a/v1" {
return &aResources, nil
}
return nil, errors.NewNotFound(schema.GroupResource{}, "")
}
func (c *fakeCachedDiscoveryInterface) ServerResources() ([]*metav1.APIResourceList, error) {
if c.enabledA {
if c.enabledGroupA {
av1, _ := c.ServerResourcesForGroupVersion("a/v1")
return []*metav1.APIResourceList{av1}, nil
}
@ -354,7 +466,7 @@ func (c *fakeCachedDiscoveryInterface) ServerResources() ([]*metav1.APIResourceL
}
func (c *fakeCachedDiscoveryInterface) ServerPreferredResources() ([]*metav1.APIResourceList, error) {
if c.enabledA {
if c.enabledGroupA {
return []*metav1.APIResourceList{
{
GroupVersion: "a/v1",
@ -382,3 +494,50 @@ func (c *fakeCachedDiscoveryInterface) ServerVersion() (*version.Info, error) {
func (c *fakeCachedDiscoveryInterface) OpenAPISchema() (*openapi_v2.Document, error) {
return &openapi_v2.Document{}, nil
}
var (
aGroup = metav1.APIGroup{
Name: "a",
Versions: []metav1.GroupVersionForDiscovery{
{
GroupVersion: "a/v1",
Version: "v1",
},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "a/v1",
Version: "v1",
},
}
bGroup = metav1.APIGroup{
Name: "b",
Versions: []metav1.GroupVersionForDiscovery{
{
GroupVersion: "b/v1",
Version: "v1",
},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "b/v1",
Version: "v1",
},
}
aResources = metav1.APIResourceList{
GroupVersion: "a/v1",
APIResources: []metav1.APIResource{aFoo},
}
aFoo = metav1.APIResource{
Name: "foo",
Kind: "Foo",
Namespaced: false,
}
bResources = metav1.APIResourceList{
GroupVersion: "b/v1",
APIResources: []metav1.APIResource{bBar},
}
bBar = metav1.APIResource{
Name: "bar",
Kind: "Bar",
Namespaced: true,
}
)