Merge pull request #196 from alrs/clientconfig-errs

openstack/clientconfig: fix dropped errors

Author: pierreprinetti

openstack/clientconfig/requests.go

@@ -332,7 +332,7 @@ func GetCloudFromYAML(opts *ClientOpts) (*Cloud, error) {
 
 	cloud.Interface = ""
 
-	return cloud, nil
+	return cloud, err
 }
 
 // AuthOptions creates a gophercloud.AuthOptions structure with the

openstack/clientconfig/utils.go

@@ -46,6 +46,9 @@ func mergeClouds(override, cloud interface{}) (*Cloud, error) {
 	var mergedCloud Cloud
 	mergedInterface := mergeInterfaces(overrideInterface, cloudInterface)
 	mergedJson, err := json.Marshal(mergedInterface)
+	if err != nil {
+		return nil, err
+	}
 	err = json.Unmarshal(mergedJson, &mergedCloud)
 	if err != nil {
 		return nil, err