feat: support strings option over HTTP API

Author: aschmahmann

http/client.go

@@ -230,6 +230,15 @@ func getQuery(req *cmds.Request) (string, error) {
 		if OptionSkipMap[k] {
 			continue
 		}
+
+		optArr, ok := v.([]string)
+		if ok {
+			for _, o := range optArr {
+				query.Add(k, o)
+			}
+			continue
+		}
+
 		str := fmt.Sprintf("%v", v)
 		query.Set(k, str)
 	}

http/parse.go

@@ -61,22 +61,28 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) {
 	}
 
 	opts, stringArgs2 := parseOptions(r)
+	iopts := make(map[string]interface{}, len(opts))
 	optDefs, err := root.GetOptions(pth)
 	if err != nil {
 		return nil, err
 	}
 	for k, v := range opts {
+		iopts[k] = v
 		if optDef, ok := optDefs[k]; ok {
 			name := optDef.Names()[0]
 			if k != name {
-				opts[name] = v
-				delete(opts, k)
+				iopts[name] = v
+				delete(iopts, k)
+			}
+
+			if optDef.Type() != cmds.Strings && len(v) > 0 {
+				iopts[name] = v[0]
 			}
 		}
 	}
 	// default to setting encoding to JSON
-	if _, ok := opts[cmds.EncLong]; !ok {
-		opts[cmds.EncLong] = cmds.JSON
+	if _, ok := iopts[cmds.EncLong]; !ok {
+		iopts[cmds.EncLong] = cmds.JSON
 	}
 
 	stringArgs = append(stringArgs, stringArgs2...)
@@ -148,7 +154,7 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) {
 	}
 
 	ctx := logging.ContextWithLoggable(r.Context(), uuidLoggable())
-	req, err := cmds.NewRequest(ctx, pth, opts, args, f, root)
+	req, err := cmds.NewRequest(ctx, pth, iopts, args, f, root)
 	if err != nil {
 		return nil, err
 	}
@@ -162,17 +168,16 @@ func parseRequest(r *http.Request, root *cmds.Command) (*cmds.Request, error) {
 	return req, err
 }
 
-func parseOptions(r *http.Request) (map[string]interface{}, []string) {
-	opts := make(map[string]interface{})
+func parseOptions(r *http.Request) (map[string][]string, []string) {
+	opts := make(map[string][]string)
 	var args []string
 
 	query := r.URL.Query()
 	for k, v := range query {
 		if k == "arg" {
 			args = v
 		} else {
-
-			opts[k] = v[0]
+			opts[k] = v
 		}
 	}
 

request.go

@@ -118,21 +118,28 @@ func checkAndConvertOptions(root *Command, opts OptMap, path []string) (OptMap,
 
 		kind := reflect.TypeOf(v).Kind()
 		if kind != opt.Type() {
-			if str, ok := v.(string); ok {
-				val, err := opt.Parse(str)
-				if err != nil {
-					value := fmt.Sprintf("value %q", v)
-					if len(str) == 0 {
-						value = "empty value"
-					}
-					return options, fmt.Errorf("could not convert %s to type %q (for option %q)",
-						value, opt.Type().String(), "-"+k)
+			if opt.Type() == Strings {
+				if _, ok := v.([]string); !ok {
+					return options, fmt.Errorf("option %q should be type %q, but got type %q",
+						k, opt.Type().String(), kind.String())
 				}
-				options[k] = val
-
 			} else {
-				return options, fmt.Errorf("option %q should be type %q, but got type %q",
-					k, opt.Type().String(), kind.String())
+				if str, ok := v.(string); ok {
+					val, err := opt.Parse(str)
+					if err != nil {
+						value := fmt.Sprintf("value %q", v)
+						if len(str) == 0 {
+							value = "empty value"
+						}
+						return options, fmt.Errorf("could not convert %s to type %q (for option %q)",
+							value, opt.Type().String(), "-"+k)
+					}
+					options[k] = val
+
+				} else {
+					return options, fmt.Errorf("option %q should be type %q, but got type %q",
+						k, opt.Type().String(), kind.String())
+				}
 			}
 		}