Fix error value swallowed

This commit is contained in:
andig 2020-10-29 19:47:45 +01:00
parent d07695a812
commit fcc52a3ad0
3 changed files with 9 additions and 9 deletions

View file

@ -77,7 +77,7 @@ func NewBMWFromConfig(other map[string]interface{}) (api.Vehicle, error) {
}
}
return v, nil
return v, err
}
func (v *BMW) login(user, password string) error {
@ -141,18 +141,18 @@ func (v *BMW) request(uri string) (*http.Request, error) {
// vehicles implements returns the list of user vehicles
func (v *BMW) vehicles() ([]string, error) {
var br bmwVehiclesResponse
var resp bmwVehiclesResponse
uri := fmt.Sprintf("%s/me/vehicles/v2/", bmwAPI)
var vehicles []string
req, err := v.request(uri)
if err == nil {
err = v.DoJSON(req, &br)
err = v.DoJSON(req, &resp)
}
if err == nil {
for _, v := range br {
for _, v := range resp {
vehicles = append(vehicles, v.VIN)
}
}
@ -162,7 +162,7 @@ func (v *BMW) vehicles() ([]string, error) {
// chargeState implements the Vehicle.ChargeState interface
func (v *BMW) chargeState() (float64, error) {
var br bmwDynamicResponse
var resp bmwDynamicResponse
uri := fmt.Sprintf("%s/vehicle/dynamic/v1/%s", bmwAPI, v.vin)
req, err := v.request(uri)
@ -170,8 +170,8 @@ func (v *BMW) chargeState() (float64, error) {
return 0, err
}
err = v.DoJSON(req, &br)
return br.AttributesMap.ChargingLevelHv, err
err = v.DoJSON(req, &resp)
return resp.AttributesMap.ChargingLevelHv, err
}
// ChargeState implements the Vehicle.ChargeState interface

View file

@ -65,7 +65,7 @@ func NewFordFromConfig(other map[string]interface{}) (api.Vehicle, error) {
}
}
return v, nil
return v, err
}
func (v *Ford) login(user, password string) error {

View file

@ -139,7 +139,7 @@ func NewRenaultFromConfig(other map[string]interface{}) (api.Vehicle, error) {
v.apiG = provider.NewCached(v.batteryAPI, cc.Cache).InterfaceGetter()
return v, nil
return v, err
}
func (v *Renault) apiKeys(region string) error {