kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make structural type use OpenAPI lib. 

Kubernetes-commit: e11ea145eaa9c3261a3a6c3ef8c9c5ff29ad5e56
This commit is contained in:
Jiahui Feng 2023-01-11 10:08:11 -08:00 committed by Kubernetes Publisher
parent ac15595911
commit b0c0a5edc5
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/cel/openapi/maplist.go
View File

@ -23,12 +23,12 @@ import (
"k8s.io/kube-openapi/pkg/validation/spec"
)
// mapList provides a "lookup by key" operation for lists (arrays) with x-kubernetes-list-type=map.
type mapList interface {
// get returns the first element having given key, for all
// x-kubernetes-list-map-keys, to the provided object. If the provided object isn't itself a valid mapList element,
// MapList provides a "lookup by key" operation for lists (arrays) with x-kubernetes-list-type=map.
type MapList interface {
// Get returns the first element having given key, for all
// x-kubernetes-list-map-keys, to the provided object. If the provided object isn't itself a valid MapList element,
// get returns nil.
get(interface{}) interface{}
Get(interface{}) interface{}
}
type keyStrategy interface {
@ -91,10 +91,10 @@ func (ks *multiKeyStrategy) CompositeKeyFor(obj map[string]interface{}) (interfa
return delimited.String(), true
}
// emptyMapList is a mapList containing no elements.
// emptyMapList is a MapList containing no elements.
type emptyMapList struct{}
func (emptyMapList) get(interface{}) interface{} {
func (emptyMapList) Get(interface{}) interface{} {
return nil
}
@ -107,7 +107,7 @@ type mapListImpl struct {
unkeyedItems []interface{}
}
func (a *mapListImpl) get(obj interface{}) interface{} {
func (a *mapListImpl) Get(obj interface{}) interface{} {
mobj, ok := obj.(map[string]interface{})
if !ok {
return nil
@ -162,10 +162,10 @@ func makeKeyStrategy(sts *spec.Schema) keyStrategy {
}
}
// makeMapList returns a queryable interface over the provided x-kubernetes-list-type=map
// MakeMapList returns a queryable interface over the provided x-kubernetes-list-type=map
// keyedItems. If the provided schema is _not_ an array with x-kubernetes-list-type=map, returns an
// empty mapList.
func makeMapList(sts *spec.Schema, items []interface{}) (rv mapList) {
func MakeMapList(sts *spec.Schema, items []interface{}) (rv MapList) {
if !sts.Type.Contains("array") || getXListType(sts) != "map" || len(getXListMapKeys(sts)) == 0 {
return emptyMapList{}
}

6
pkg/cel/openapi/maplist_test.go
View File

@ -296,11 +296,11 @@ func TestMapList(t *testing.T) {
},
} {
t.Run(tc.name, func(t *testing.T) {
mapList := makeMapList(tc.sts, tc.items)
mapList := MakeMapList(tc.sts, tc.items)
for _, warmUp := range tc.warmUpQueries {
mapList.get(warmUp)
mapList.Get(warmUp)
}
actual := mapList.get(tc.query)
actual := mapList.Get(tc.query)
if !reflect.DeepEqual(tc.expected, actual) {
t.Errorf("got: %v, expected %v", actual, tc.expected)
}