commands/http: Fixed bug with client arg querystring
Matt Bell committed
Dec 1, 2014 at 23:42 UTC
5cb39235cc4b3425bd1eb8db7dc0f78e46f700a5
1 file changed
+12
-6
commands/http/client.go
+12
-6
@@ -107,15 +107,21 @@ func getQuery(req cmds.Request) (string, error) {
107
108
args := req.Arguments()
109
argDefs := req.Command().Arguments
110
- var argDef cmds.Argument
110
112
- for i, arg := range args {
113
- if i < len(argDefs) {
114
- argDef = argDefs[i]
111
+ argDefIndex := 0
112
+
113
+ for _, arg := range args {
114
+ argDef := argDefs[argDefIndex]
115
+ // skip ArgFiles
116
+ for argDef.Type == cmds.ArgFile {
117
+ argDefIndex++
118
+ argDef = argDefs[argDefIndex]
119
}
120
117
- if argDef.Type == cmds.ArgString {
118
- query.Add("arg", arg)
121
+ query.Add("arg", arg)
122
+
123
+ if len(argDefs) > argDefIndex+1 {
124
+ argDefIndex++
125
}
126
}
127