extract k=v flag parsing to a func

Author: notnmeyer

cmd/contacts.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/loops-so/cli/internal/api"
 	"github.com/loops-so/cli/internal/cmdutil"
@@ -73,16 +72,11 @@ func contactFieldParamsFromCmd(cmd *cobra.Command) (contactFieldParams, error) {
 		params.ContactProperties = contactProps
 	}
 	propPairs, _ := cmd.Flags().GetStringArray("prop")
-	for _, pair := range propPairs {
-		idx := strings.IndexByte(pair, '=')
-		if idx < 0 {
-			return params, fmt.Errorf("--prop %q: expected KEY=value", pair)
-		}
-		if params.ContactProperties == nil {
-			params.ContactProperties = make(map[string]any)
-		}
-		params.ContactProperties[pair[:idx]] = pair[idx+1:]
+	props, err := cmdutil.ParseKeyValuePairs("prop", propPairs, params.ContactProperties)
+	if err != nil {
+		return params, err
 	}
+	params.ContactProperties = props
 
 	return params, nil
 }

cmd/transactional.go

@@ -23,17 +23,7 @@ func parseDataVars(vars []string, jsonFile string) (map[string]any, error) {
 			return nil, err
 		}
 	}
-	for _, pair := range vars {
-		idx := strings.IndexByte(pair, '=')
-		if idx < 0 {
-			return nil, fmt.Errorf("--var %q: expected KEY=value", pair)
-		}
-		if m == nil {
-			m = make(map[string]any)
-		}
-		m[pair[:idx]] = pair[idx+1:]
-	}
-	return m, nil
+	return cmdutil.ParseKeyValuePairs("var", vars, m)
 }
 
 func attachmentFromPath(path string) (api.Attachment, error) {

internal/cmdutil/parse.go

@@ -4,8 +4,23 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"strings"
 )
 
+func ParseKeyValuePairs(flag string, pairs []string, dst map[string]any) (map[string]any, error) {
+	for _, pair := range pairs {
+		idx := strings.IndexByte(pair, '=')
+		if idx < 0 {
+			return nil, fmt.Errorf("--%s %q: expected KEY=value", flag, pair)
+		}
+		if dst == nil {
+			dst = make(map[string]any)
+		}
+		dst[pair[:idx]] = pair[idx+1:]
+	}
+	return dst, nil
+}
+
 func ParseJSONFile(flag, path string) (map[string]any, error) {
 	data, err := os.ReadFile(path)
 	if err != nil {