refactor config validation to remove some code duplication

Author: umbynos

cli/config/add.go

@@ -44,11 +44,7 @@ func initAddCommand() *cobra.Command {
 
 func runAddCommand(cmd *cobra.Command, args []string) {
 	key := args[0]
-	kind, err := typeOf(key)
-	if err != nil {
-		feedback.Error(err)
-		os.Exit(errorcodes.ErrGeneric)
-	}
+	kind := validateKey(key)
 
 	if kind != reflect.Slice {
 		feedback.Errorf(tr("The key '%[1]v' is not a list of items, can't add to it.\nMaybe use '%[2]s'?"), key, "config set")

cli/config/remove.go

@@ -44,11 +44,7 @@ func initRemoveCommand() *cobra.Command {
 
 func runRemoveCommand(cmd *cobra.Command, args []string) {
 	key := args[0]
-	kind, err := typeOf(key)
-	if err != nil {
-		feedback.Error(err)
-		os.Exit(errorcodes.ErrGeneric)
-	}
+	kind := validateKey(key)
 
 	if kind != reflect.Slice {
 		feedback.Errorf(tr("The key '%[1]v' is not a list of items, can't remove from it.\nMaybe use '%[2]s'?"), key, "config delete")

cli/config/set.go

@@ -47,11 +47,7 @@ func initSetCommand() *cobra.Command {
 
 func runSetCommand(cmd *cobra.Command, args []string) {
 	key := args[0]
-	kind, err := typeOf(key)
-	if err != nil {
-		feedback.Error(err)
-		os.Exit(errorcodes.ErrGeneric)
-	}
+	kind := validateKey(key)
 
 	if kind != reflect.Slice && len(args) > 2 {
 		feedback.Errorf(tr("Can't set multiple values in key %v"), key)

cli/config/validate.go

@@ -17,7 +17,11 @@ package config
 
 import (
 	"fmt"
+	"os"
 	"reflect"
+
+	"github.com/arduino/arduino-cli/cli/errorcodes"
+	"github.com/arduino/arduino-cli/cli/feedback"
 )
 
 var validMap = map[string]reflect.Kind{
@@ -46,3 +50,12 @@ func typeOf(key string) (reflect.Kind, error) {
 	}
 	return t, nil
 }
+
+func validateKey(key string) reflect.Kind {
+	kind, err := typeOf(key)
+	if err != nil {
+		feedback.Error(err)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+	return kind
+}

i18n/data/en.po

@@ -268,17 +268,17 @@ msgstr "Can't find dependencies for platform %s"
 msgid "Can't open sketch"
 msgstr "Can't open sketch"
 
-#: cli/config/set.go:57
+#: cli/config/set.go:53
 msgid "Can't set multiple values in key %v"
 msgstr "Can't set multiple values in key %v"
 
 #: cli/config/init.go:59
 msgid "Can't use both --dest-file and --dest-dir flags at the same time."
 msgstr "Can't use both --dest-file and --dest-dir flags at the same time."
 
-#: cli/config/add.go:63
+#: cli/config/add.go:59
 #: cli/config/delete.go:70
-#: cli/config/remove.go:72
+#: cli/config/remove.go:68
 msgid "Can't write config file: %v"
 msgstr "Can't write config file: %v"
 
@@ -1879,7 +1879,7 @@ msgid "Setting"
 msgstr "Setting"
 
 #: cli/config/delete.go:60
-#: cli/config/validate.go:45
+#: cli/config/validate.go:49
 msgid "Settings key doesn't exist"
 msgstr "Settings key doesn't exist"
 
@@ -2046,13 +2046,13 @@ msgstr "The custom config file (if not specified the default will be used)."
 msgid "The flags --run-post-install and --skip-post-install can't be both set at the same time."
 msgstr "The flags --run-post-install and --skip-post-install can't be both set at the same time."
 
-#: cli/config/add.go:54
+#: cli/config/add.go:50
 msgid "The key '%[1]v' is not a list of items, can't add to it.\n"
 "Maybe use '%[2]s'?"
 msgstr "The key '%[1]v' is not a list of items, can't add to it.\n"
 "Maybe use '%[2]s'?"
 
-#: cli/config/remove.go:54
+#: cli/config/remove.go:50
 msgid "The key '%[1]v' is not a list of items, can't remove from it.\n"
 "Maybe use '%[2]s'?"
 msgstr "The key '%[1]v' is not a list of items, can't remove from it.\n"
@@ -2409,7 +2409,7 @@ msgstr "Writes current configuration to a configuration file."
 msgid "Writes current configuration to the configuration file in the data directory."
 msgstr "Writes current configuration to the configuration file in the data directory."
 
-#: cli/config/set.go:79
+#: cli/config/set.go:75
 msgid "Writing config file: %v"
 msgstr "Writing config file: %v"
 
@@ -2630,7 +2630,7 @@ msgstr "encoding sketch metadata: %s"
 msgid "error opening serial monitor"
 msgstr "error opening serial monitor"
 
-#: cli/config/set.go:71
+#: cli/config/set.go:67
 msgid "error parsing value: %v"
 msgstr "error parsing value: %v"