EVnotify: fix template

evcc-io · Aug 25, 2022 · 1f425e9 · 1f425e9
1 parent 76a588b
commit 1f425e9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/charger/template_test.go b/charger/template_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 var acceptable = []string{
-	"invalid plugin type: ...",
+	"invalid plugin source: ...",
 	"missing mqtt broker configuration",
 	"mqtt not configured",
 	"invalid charger type: nrgkick-bluetooth",

diff --git a/meter/template_test.go b/meter/template_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 var acceptable = []string{
-	"invalid plugin type: ...",
+	"invalid plugin source: ...",
 	"missing mqtt broker configuration",
 	"mqtt not configured",
 	"not a SunSpec device",

diff --git a/provider/config.go b/provider/config.go
@@ -41,7 +41,7 @@ func (r providerRegistry) Add(name string, factory func(map[string]interface{})
 func (r providerRegistry) Get(name string) (func(map[string]interface{}) (IntProvider, error), error) {
 	factory, exists := r[name]
 	if !exists {
-		return nil, fmt.Errorf("invalid plugin type: %s", name)
+		return nil, fmt.Errorf("invalid plugin source: %s", name)
 	}
 	return factory, nil
 }
@@ -67,7 +67,7 @@ func NewIntGetterFromConfig(config Config) (res func() (int64, error), err error
 	}
 
 	if err == nil && res == nil {
-		err = fmt.Errorf("invalid plugin type: %s", config.Source)
+		err = fmt.Errorf("invalid plugin source: %s", config.Source)
 	}
 
 	return
@@ -86,7 +86,7 @@ func NewFloatGetterFromConfig(config Config) (res func() (float64, error), err e
 	}
 
 	if err == nil && res == nil {
-		err = fmt.Errorf("invalid plugin type: %s", config.Source)
+		err = fmt.Errorf("invalid plugin source: %s", config.Source)
 	}
 
 	return
@@ -111,7 +111,7 @@ func NewStringGetterFromConfig(config Config) (res func() (string, error), err e
 		}
 
 		if err == nil && res == nil {
-			err = fmt.Errorf("invalid plugin type: %s", config.Source)
+			err = fmt.Errorf("invalid plugin source: %s", config.Source)
 		}
 	}
 
@@ -131,7 +131,7 @@ func NewBoolGetterFromConfig(config Config) (res func() (bool, error), err error
 	}
 
 	if err == nil && res == nil {
-		err = fmt.Errorf("invalid plugin type: %s", config.Source)
+		err = fmt.Errorf("invalid plugin source: %s", config.Source)
 	}
 
 	return
@@ -150,7 +150,7 @@ func NewIntSetterFromConfig(param string, config Config) (res func(int64) error,
 	}
 
 	if err == nil && res == nil {
-		err = fmt.Errorf("invalid plugin type: %s", config.Source)
+		err = fmt.Errorf("invalid plugin source: %s", config.Source)
 	}
 
 	return
@@ -169,7 +169,7 @@ func NewBoolSetterFromConfig(param string, config Config) (res func(bool) error,
 	}
 
 	if err == nil && res == nil {
-		err = fmt.Errorf("invalid plugin type: %s", config.Source)
+		err = fmt.Errorf("invalid plugin source: %s", config.Source)
 	}
 
 	return

diff --git a/templates/definition/vehicle/evnotify.yaml b/templates/definition/vehicle/evnotify.yaml
@@ -24,7 +24,7 @@ render: |
   phases: {{ .phases }}
   {{- end }}
   soc:
-    type: http
+    source: http
     uri: https://app.evnotify.de/soc?akey={{ .akey }}&token={{ .token }} # evNotify Server + AKEY
     method: GET
     jq: .soc_display
diff --git a/vehicle/template_test.go b/vehicle/template_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 var acceptable = []string{
-	"invalid plugin type: ...",
+	"invalid plugin source: ...",
 	"missing mqtt broker configuration",
 	"received status code 404 (INVALID PARAMS)", // Nissan
 	"missing personID",