c077bac341
With the introduction of batch/v1 and batch/v2alpha1, any MultiRESTMapper that has per groupversion mappers (as a naive discovery client would create) would end up being unable to call RESTMapping() on batch.Jobs. As we finish up discovery we will need to be able to choose prioritized RESTMappings based on the service discovery doc. This change implements RESTMappings(groupversion) which returns all possible RESTMappings for that kind. That allows a higher level call to prioritize the returned mappings by server or client preferred version.
310 lines
10 KiB
Go
310 lines
10 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package meta
|
|
|
|
import (
|
|
"errors"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"k8s.io/kubernetes/pkg/api/unversioned"
|
|
)
|
|
|
|
func TestPriorityRESTMapperResourceForErrorHandling(t *testing.T) {
|
|
tcs := []struct {
|
|
name string
|
|
|
|
delegate RESTMapper
|
|
resourcePatterns []unversioned.GroupVersionResource
|
|
result unversioned.GroupVersionResource
|
|
err string
|
|
}{
|
|
{
|
|
name: "single hit",
|
|
delegate: fixedRESTMapper{resourcesFor: []unversioned.GroupVersionResource{{Resource: "single-hit"}}},
|
|
result: unversioned.GroupVersionResource{Resource: "single-hit"},
|
|
},
|
|
{
|
|
name: "ambiguous match",
|
|
delegate: fixedRESTMapper{resourcesFor: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: "a", Resource: "first"},
|
|
{Group: "two", Version: "b", Resource: "second"},
|
|
}},
|
|
err: "matches multiple resources",
|
|
},
|
|
{
|
|
name: "group selection",
|
|
delegate: fixedRESTMapper{resourcesFor: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: "a", Resource: "first"},
|
|
{Group: "two", Version: "b", Resource: "second"},
|
|
}},
|
|
resourcePatterns: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: AnyVersion, Resource: AnyResource},
|
|
},
|
|
result: unversioned.GroupVersionResource{Group: "one", Version: "a", Resource: "first"},
|
|
},
|
|
{
|
|
name: "empty match continues",
|
|
delegate: fixedRESTMapper{resourcesFor: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: "a", Resource: "first"},
|
|
{Group: "two", Version: "b", Resource: "second"},
|
|
}},
|
|
resourcePatterns: []unversioned.GroupVersionResource{
|
|
{Group: "fail", Version: AnyVersion, Resource: AnyResource},
|
|
{Group: "one", Version: AnyVersion, Resource: AnyResource},
|
|
},
|
|
result: unversioned.GroupVersionResource{Group: "one", Version: "a", Resource: "first"},
|
|
},
|
|
{
|
|
name: "group followed by version selection",
|
|
delegate: fixedRESTMapper{resourcesFor: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: "a", Resource: "first"},
|
|
{Group: "two", Version: "b", Resource: "second"},
|
|
{Group: "one", Version: "c", Resource: "third"},
|
|
}},
|
|
resourcePatterns: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: AnyVersion, Resource: AnyResource},
|
|
{Group: AnyGroup, Version: "a", Resource: AnyResource},
|
|
},
|
|
result: unversioned.GroupVersionResource{Group: "one", Version: "a", Resource: "first"},
|
|
},
|
|
{
|
|
name: "resource selection",
|
|
delegate: fixedRESTMapper{resourcesFor: []unversioned.GroupVersionResource{
|
|
{Group: "one", Version: "a", Resource: "first"},
|
|
{Group: "one", Version: "a", Resource: "second"},
|
|
}},
|
|
resourcePatterns: []unversioned.GroupVersionResource{
|
|
{Group: AnyGroup, Version: AnyVersion, Resource: "second"},
|
|
},
|
|
result: unversioned.GroupVersionResource{Group: "one", Version: "a", Resource: "second"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range tcs {
|
|
mapper := PriorityRESTMapper{Delegate: tc.delegate, ResourcePriority: tc.resourcePatterns}
|
|
|
|
actualResult, actualErr := mapper.ResourceFor(unversioned.GroupVersionResource{})
|
|
if e, a := tc.result, actualResult; e != a {
|
|
t.Errorf("%s: expected %v, got %v", tc.name, e, a)
|
|
}
|
|
if len(tc.err) == 0 && actualErr == nil {
|
|
continue
|
|
}
|
|
if len(tc.err) > 0 && actualErr == nil {
|
|
t.Errorf("%s: missing expected err: %v", tc.name, tc.err)
|
|
continue
|
|
}
|
|
if !strings.Contains(actualErr.Error(), tc.err) {
|
|
t.Errorf("%s: expected %v, got %v", tc.name, tc.err, actualErr)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPriorityRESTMapperKindForErrorHandling(t *testing.T) {
|
|
tcs := []struct {
|
|
name string
|
|
|
|
delegate RESTMapper
|
|
kindPatterns []unversioned.GroupVersionKind
|
|
result unversioned.GroupVersionKind
|
|
err string
|
|
}{
|
|
{
|
|
name: "single hit",
|
|
delegate: fixedRESTMapper{kindsFor: []unversioned.GroupVersionKind{{Kind: "single-hit"}}},
|
|
result: unversioned.GroupVersionKind{Kind: "single-hit"},
|
|
},
|
|
{
|
|
name: "ambiguous match",
|
|
delegate: fixedRESTMapper{kindsFor: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: "a", Kind: "first"},
|
|
{Group: "two", Version: "b", Kind: "second"},
|
|
}},
|
|
err: "matches multiple kinds",
|
|
},
|
|
{
|
|
name: "group selection",
|
|
delegate: fixedRESTMapper{kindsFor: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: "a", Kind: "first"},
|
|
{Group: "two", Version: "b", Kind: "second"},
|
|
}},
|
|
kindPatterns: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: AnyVersion, Kind: AnyKind},
|
|
},
|
|
result: unversioned.GroupVersionKind{Group: "one", Version: "a", Kind: "first"},
|
|
},
|
|
{
|
|
name: "empty match continues",
|
|
delegate: fixedRESTMapper{kindsFor: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: "a", Kind: "first"},
|
|
{Group: "two", Version: "b", Kind: "second"},
|
|
}},
|
|
kindPatterns: []unversioned.GroupVersionKind{
|
|
{Group: "fail", Version: AnyVersion, Kind: AnyKind},
|
|
{Group: "one", Version: AnyVersion, Kind: AnyKind},
|
|
},
|
|
result: unversioned.GroupVersionKind{Group: "one", Version: "a", Kind: "first"},
|
|
},
|
|
{
|
|
name: "group followed by version selection",
|
|
delegate: fixedRESTMapper{kindsFor: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: "a", Kind: "first"},
|
|
{Group: "two", Version: "b", Kind: "second"},
|
|
{Group: "one", Version: "c", Kind: "third"},
|
|
}},
|
|
kindPatterns: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: AnyVersion, Kind: AnyKind},
|
|
{Group: AnyGroup, Version: "a", Kind: AnyKind},
|
|
},
|
|
result: unversioned.GroupVersionKind{Group: "one", Version: "a", Kind: "first"},
|
|
},
|
|
{
|
|
name: "kind selection",
|
|
delegate: fixedRESTMapper{kindsFor: []unversioned.GroupVersionKind{
|
|
{Group: "one", Version: "a", Kind: "first"},
|
|
{Group: "one", Version: "a", Kind: "second"},
|
|
}},
|
|
kindPatterns: []unversioned.GroupVersionKind{
|
|
{Group: AnyGroup, Version: AnyVersion, Kind: "second"},
|
|
},
|
|
result: unversioned.GroupVersionKind{Group: "one", Version: "a", Kind: "second"},
|
|
},
|
|
}
|
|
|
|
for _, tc := range tcs {
|
|
mapper := PriorityRESTMapper{Delegate: tc.delegate, KindPriority: tc.kindPatterns}
|
|
|
|
actualResult, actualErr := mapper.KindFor(unversioned.GroupVersionResource{})
|
|
if e, a := tc.result, actualResult; e != a {
|
|
t.Errorf("%s: expected %v, got %v", tc.name, e, a)
|
|
}
|
|
if len(tc.err) == 0 && actualErr == nil {
|
|
continue
|
|
}
|
|
if len(tc.err) > 0 && actualErr == nil {
|
|
t.Errorf("%s: missing expected err: %v", tc.name, tc.err)
|
|
continue
|
|
}
|
|
if !strings.Contains(actualErr.Error(), tc.err) {
|
|
t.Errorf("%s: expected %v, got %v", tc.name, tc.err, actualErr)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPriorityRESTMapperRESTMapping(t *testing.T) {
|
|
mapping1 := &RESTMapping{
|
|
GroupVersionKind: unversioned.GroupVersionKind{Kind: "Foo", Version: "v1alpha1"},
|
|
}
|
|
mapping2 := &RESTMapping{
|
|
GroupVersionKind: unversioned.GroupVersionKind{Kind: "Foo", Version: "v1"},
|
|
}
|
|
mapping3 := &RESTMapping{
|
|
GroupVersionKind: unversioned.GroupVersionKind{Group: "other", Kind: "Foo", Version: "v1"},
|
|
}
|
|
allMappers := MultiRESTMapper{
|
|
fixedRESTMapper{mappings: []*RESTMapping{mapping1}},
|
|
fixedRESTMapper{mappings: []*RESTMapping{mapping2}},
|
|
fixedRESTMapper{mappings: []*RESTMapping{mapping3}},
|
|
}
|
|
tcs := []struct {
|
|
name string
|
|
|
|
mapper PriorityRESTMapper
|
|
input unversioned.GroupKind
|
|
result *RESTMapping
|
|
err error
|
|
}{
|
|
{
|
|
name: "empty",
|
|
mapper: PriorityRESTMapper{Delegate: MultiRESTMapper{}},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
err: &NoKindMatchError{PartialKind: unversioned.GroupVersionKind{Kind: "Foo"}},
|
|
},
|
|
{
|
|
name: "ignore not found",
|
|
mapper: PriorityRESTMapper{Delegate: MultiRESTMapper{fixedRESTMapper{err: &NoKindMatchError{PartialKind: unversioned.GroupVersionKind{Kind: "IGNORE_THIS"}}}}},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
err: &NoKindMatchError{PartialKind: unversioned.GroupVersionKind{Kind: "Foo"}},
|
|
},
|
|
{
|
|
name: "accept first failure",
|
|
mapper: PriorityRESTMapper{Delegate: MultiRESTMapper{fixedRESTMapper{err: errors.New("fail on this")}, fixedRESTMapper{mappings: []*RESTMapping{mapping1}}}},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
err: errors.New("fail on this"),
|
|
},
|
|
{
|
|
name: "return error for ambiguous",
|
|
mapper: PriorityRESTMapper{
|
|
Delegate: allMappers,
|
|
},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
err: &AmbiguousKindError{
|
|
PartialKind: unversioned.GroupVersionKind{Kind: "Foo"},
|
|
MatchingKinds: []unversioned.GroupVersionKind{
|
|
{Kind: "Foo", Version: "v1alpha1"},
|
|
{Kind: "Foo", Version: "v1"},
|
|
{Group: "other", Kind: "Foo", Version: "v1"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "accept only item",
|
|
mapper: PriorityRESTMapper{
|
|
Delegate: fixedRESTMapper{mappings: []*RESTMapping{mapping1}},
|
|
},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
result: mapping1,
|
|
},
|
|
{
|
|
name: "return single priority",
|
|
mapper: PriorityRESTMapper{
|
|
Delegate: allMappers,
|
|
KindPriority: []unversioned.GroupVersionKind{{Version: "v1", Kind: AnyKind}, {Version: "v1alpha1", Kind: AnyKind}},
|
|
},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
result: mapping2,
|
|
},
|
|
{
|
|
name: "return out of group match",
|
|
mapper: PriorityRESTMapper{
|
|
Delegate: allMappers,
|
|
KindPriority: []unversioned.GroupVersionKind{{Group: AnyGroup, Version: "v1", Kind: AnyKind}, {Group: "other", Version: AnyVersion, Kind: AnyKind}},
|
|
},
|
|
input: unversioned.GroupKind{Kind: "Foo"},
|
|
result: mapping3,
|
|
},
|
|
}
|
|
|
|
for _, tc := range tcs {
|
|
actualResult, actualErr := tc.mapper.RESTMapping(tc.input)
|
|
if e, a := tc.result, actualResult; !reflect.DeepEqual(e, a) {
|
|
t.Errorf("%s: expected %v, got %v", tc.name, e, a)
|
|
}
|
|
switch {
|
|
case tc.err == nil && actualErr == nil:
|
|
case tc.err == nil:
|
|
t.Errorf("%s: unexpected error: %v", tc.name, actualErr)
|
|
case actualErr == nil:
|
|
t.Errorf("%s: expected error: %v got nil", tc.name, tc.err)
|
|
case tc.err.Error() != actualErr.Error():
|
|
t.Errorf("%s: expected %v, got %v", tc.name, tc.err, actualErr)
|
|
}
|
|
}
|
|
}
|