github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

guard against unexpected type during config manipulation

Browse Source
This commit is contained in:
deads2k 2015-02-13 13:15:47 -05:00
parent 2dcaab75f5
commit 941461044b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubectl/cmd/config/navigation_step_parser.go
View File

@ -51,7 +51,10 @@ func newNavigationSteps(path string) (*navigationSteps, error) {
// This set of reflective code pulls the type of the map values, uses that type to look up the set of legal tags. Those legal tags are used to // This set of reflective code pulls the type of the map values, uses that type to look up the set of legal tags. Those legal tags are used to
// walk the list of remaining parts until we find a match to a legal tag or the end of the string. That name is used to burn all the used parts. // walk the list of remaining parts until we find a match to a legal tag or the end of the string. That name is used to burn all the used parts.
mapValueType := currType.Elem() mapValueType := currType.Elem()
mapValueOptions := getPotentialTypeValues(mapValueType) mapValueOptions, err := getPotentialTypeValues(mapValueType)
if err != nil {
return nil, err
}
nextPart := findNameStep(individualParts[currPartIndex:], util.KeySet(reflect.ValueOf(mapValueOptions))) nextPart := findNameStep(individualParts[currPartIndex:], util.KeySet(reflect.ValueOf(mapValueOptions)))
steps = append(steps, navigationStep{nextPart, mapValueType}) steps = append(steps, navigationStep{nextPart, mapValueType})
@ -61,7 +64,10 @@ func newNavigationSteps(path string) (*navigationSteps, error) {
case reflect.Struct: case reflect.Struct:
nextPart := individualParts[currPartIndex] nextPart := individualParts[currPartIndex]
options := getPotentialTypeValues(currType) options, err := getPotentialTypeValues(currType)
if err != nil {
return nil, err
}
fieldType, exists := options[nextPart] fieldType, exists := options[nextPart]
if !exists { if !exists {
return nil, fmt.Errorf("unable to parse %v after %v at %v", path, steps, currType) return nil, fmt.Errorf("unable to parse %v after %v at %v", path, steps, currType)
@ -113,7 +119,11 @@ func findNameStep(parts []string, typeOptions util.StringSet) string {
} }
// getPotentialTypeValues takes a type and looks up the tags used to represent its fields when serialized. // getPotentialTypeValues takes a type and looks up the tags used to represent its fields when serialized.
func getPotentialTypeValues(typeValue reflect.Type) map[string]reflect.Type { func getPotentialTypeValues(typeValue reflect.Type) (map[string]reflect.Type, error) {
if typeValue.Kind() != reflect.Struct {
return nil, fmt.Errorf("%v is not of type struct", typeValue)
}
ret := make(map[string]reflect.Type) ret := make(map[string]reflect.Type)
for fieldIndex := 0; fieldIndex < typeValue.NumField(); fieldIndex++ { for fieldIndex := 0; fieldIndex < typeValue.NumField(); fieldIndex++ {
@ -124,7 +134,7 @@ func getPotentialTypeValues(typeValue reflect.Type) map[string]reflect.Type {
ret[yamlTagName] = fieldType.Type ret[yamlTagName] = fieldType.Type
} }
return ret return ret, nil
} }
func findKnownValue(parts []string, valueOptions util.StringSet) int { func findKnownValue(parts []string, valueOptions util.StringSet) int {