fix: modbusproxy unmarshaling

api/globalconfig/types.go

@@ -61,7 +61,7 @@ type Go struct {
 
 type ModbusProxy struct {
 	Port            int    `json:"port"`
-	ReadOnly        string `yaml:",omitempty" json:"readonly,omitempty"`
+	ReadOnly        string `yaml:",omitempty" json:",omitempty"`
 	modbus.Settings `mapstructure:",squash" yaml:",inline,omitempty" json:"settings,omitempty"`
 }
 

cmd/setup.go

@@ -993,20 +993,16 @@ func configureModbusProxy(conf *[]globalconfig.ModbusProxy) error {
 		}
 	}
 
-	// prevent panic
-	if conf == nil {
-		return nil
-	}
-
-	for _, cfg := range *conf {
-		var mode modbus.ReadOnlyMode
-		mode, err := modbus.ReadOnlyModeString(cfg.ReadOnly)
-		if err != nil {
-			return err
-		}
+	if conf != nil {
+		for _, cfg := range *conf {
+			mode, err := modbus.ReadOnlyModeString(cfg.ReadOnly)
+			if err != nil {
+				return err
+			}
 
-		if err = modbus.StartProxy(cfg.Port, cfg.Settings, mode); err != nil {
-			return err
+			if err := modbus.StartProxy(cfg.Port, cfg.Settings, mode); err != nil {
+				return err
+			}
 		}
 	}
 

cmd/setup_test.go

@@ -8,27 +8,19 @@ import (
 	"github.com/evcc-io/evcc/api/globalconfig"
 	"github.com/evcc-io/evcc/core"
 	"github.com/evcc-io/evcc/util"
+	vpr "github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
 )
 
 func TestYamlOff(t *testing.T) {
 	var conf globalconfig.All
+	viper := vpr.NewWithOptions(vpr.ExperimentalBindStruct())
 	viper.SetConfigType("yaml")
-	if err := viper.ReadConfig(strings.NewReader(`loadpoints:
-- mode: off
-`)); err != nil {
-		t.Error(err)
-	}
 
-	if err := viper.UnmarshalExact(&conf); err != nil {
-		t.Error(err)
-	}
+	require.NoError(t, viper.ReadConfig(strings.NewReader("loadpoints:\n- mode: off")))
+	require.NoError(t, viper.UnmarshalExact(&conf))
 
 	var lp core.Loadpoint
-	if err := util.DecodeOther(conf.Loadpoints[0].Other, &lp); err != nil {
-		t.Error(err)
-	}
-
-	if lp.DefaultMode != api.ModeOff {
-		t.Errorf("expected `off`, got %s", lp.DefaultMode)
-	}
+	require.NoError(t, util.DecodeOther(conf.Loadpoints[0].Other, &lp))
+	require.Equal(t, api.ModeOff, lp.DefaultMode)
 }

server/modbus/readonlymode.go

@@ -6,6 +6,6 @@ type ReadOnlyMode int
 
 const (
 	ReadOnlyFalse ReadOnlyMode = iota
-	ReadOnlyDeny               // return modbus error
 	ReadOnlyTrue               // silently ignore writes
+	ReadOnlyDeny               // return modbus error
 )