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

Tests pass now.

Browse Source
This commit is contained in:
Daniel Smith 2014-06-12 16:46:07 -07:00
parent 601f6bb4ad
commit 2abfd95d6b
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/cloudcfg/parse.go
View File

@ -24,18 +24,32 @@ func ToWireFormat(data []byte, storage string) ([]byte, error) {
return nil, fmt.Errorf("unknown storage type: %v", storage) return nil, fmt.Errorf("unknown storage type: %v", storage)
} }
// Try parsing as json and yaml // Try parsing json
parsed_json := reflect.New(prototypeType).Interface() json_out, json_err := tryJSON(data, reflect.New(prototypeType).Interface())
json_err := json.Unmarshal(data, parsed_json) if json_err == nil {
parsed_yaml := reflect.New(prototypeType).Interface() return json_out, json_err
yaml_err := yaml.Unmarshal(data, parsed_yaml) }
if json_err != nil && yaml_err != nil { // Try parsing yaml
yaml_out, yaml_err := tryYAML(data, reflect.New(prototypeType).Interface())
if yaml_err != nil {
return nil, fmt.Errorf("Could not parse input as json (error: %v) or yaml (error: %v", json_err, yaml_err) return nil, fmt.Errorf("Could not parse input as json (error: %v) or yaml (error: %v", json_err, yaml_err)
} }
return yaml_out, yaml_err
if json_err != nil { }
return json.Marshal(parsed_json)
} func tryJSON(data []byte, obj interface{}) ([]byte, error) {
return json.Marshal(parsed_yaml) err := json.Unmarshal(data, obj)
if err != nil {
return nil, err
}
return json.Marshal(obj)
}
func tryYAML(data []byte, obj interface{}) ([]byte, error) {
err := yaml.Unmarshal(data, obj)
if err != nil {
return nil, err
}
return json.Marshal(obj)
} }

2
pkg/cloudcfg/parse_test.go
View File

@ -18,6 +18,7 @@ func TestParseBadStorage(t *testing.T) {
func DoParseTest(t *testing.T, storage string, obj interface{}) { func DoParseTest(t *testing.T, storage string, obj interface{}) {
json_data, _ := json.Marshal(obj) json_data, _ := json.Marshal(obj)
yaml_data, _ := yaml.Marshal(obj) yaml_data, _ := yaml.Marshal(obj)
t.Logf("Intermediate yaml:\n%v\n", string(yaml_data))
json_got, json_err := ToWireFormat(json_data, storage) json_got, json_err := ToWireFormat(json_data, storage)
yaml_got, yaml_err := ToWireFormat(yaml_data, storage) yaml_got, yaml_err := ToWireFormat(yaml_data, storage)
@ -28,7 +29,6 @@ func DoParseTest(t *testing.T, storage string, obj interface{}) {
if yaml_err != nil { if yaml_err != nil {
t.Errorf("yaml err: %#v", yaml_err) t.Errorf("yaml err: %#v", yaml_err)
} }
t.Logf("Intermediate yaml:\n%v\n", string(yaml_data))
if string(json_got) != string(json_data) { if string(json_got) != string(json_data) {
t.Errorf("json output didn't match:\nGot:\n%v\n\nWanted:\n%v\n", t.Errorf("json output didn't match:\nGot:\n%v\n\nWanted:\n%v\n",
string(json_got), string(json_data)) string(json_got), string(json_data))