rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-15 22:49:08 +00:00
Code Issues Releases Wiki Activity

Fix validation for list of maps

Browse Source
This commit is contained in:
Josh Curl
2016-11-26 23:27:42 -08:00
parent 47a447cb67
commit f6ba07bf8b
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/validate.go
View File

@@ -6,23 +6,23 @@ import (
)
// TODO: use this function from libcompose
func convertKeysToStrings(item interface{}) interface{} {
func ConvertKeysToStrings(item interface{}) interface{} {
switch typedDatas := item.(type) {
case map[string]interface{}:
for key, value := range typedDatas {
typedDatas[key] = convertKeysToStrings(value)
typedDatas[key] = ConvertKeysToStrings(value)
}
return typedDatas
case map[interface{}]interface{}:
newMap := make(map[string]interface{})
for key, value := range typedDatas {
stringKey := key.(string)
newMap[stringKey] = convertKeysToStrings(value)
newMap[stringKey] = ConvertKeysToStrings(value)
}
return newMap
case []interface{}:
for i, value := range typedDatas {
typedDatas[i] = append(typedDatas, convertKeysToStrings(value))
typedDatas[i] = ConvertKeysToStrings(value)
}
return typedDatas
default:
@@ -35,7 +35,7 @@ func Validate(bytes []byte) (*gojsonschema.Result, error) {
if err := yaml.Unmarshal([]byte(bytes), &rawCfg); err != nil {
return nil, err
}
rawCfg = convertKeysToStrings(rawCfg).(map[string]interface{})
rawCfg = ConvertKeysToStrings(rawCfg).(map[string]interface{})
loader := gojsonschema.NewGoLoader(rawCfg)
schemaLoader := gojsonschema.NewStringLoader(schema)
return gojsonschema.Validate(schemaLoader, loader)