@@ -5,18 +5,19 @@ import (
55 "encoding/base64"
66 "errors"
77 "fmt"
8- "log"
98 "net/http"
109 "regexp"
1110 "strings"
1211
13- "github.com/alecthomas/kingpin"
12+ "github.com/alecthomas/kingpin/v2 "
1413 "github.com/vearutop/plt/fasthttp"
1514 "github.com/vearutop/plt/loadgen"
1615 "github.com/vearutop/plt/nethttp"
1716)
1817
1918// AddCommand registers curl command into CLI app.
19+ //
20+ //nolint:maintidx
2021func AddCommand (lf * loadgen.Flags , options ... func (lf * loadgen.Flags , f * nethttp.Flags , j loadgen.JobProducer )) {
2122 var (
2223 flags nethttp.Flags
@@ -25,6 +26,8 @@ func AddCommand(lf *loadgen.Flags, options ...func(lf *loadgen.Flags, f *nethttp
2526 data []string
2627 compressed bool
2728 user string
29+ output string
30+ head bool
2831 }
2932 captureStrings = map [string ]* []string {
3033 "header" : & capture .header ,
@@ -38,11 +41,13 @@ func AddCommand(lf *loadgen.Flags, options ...func(lf *loadgen.Flags, f *nethttp
3841 "url" : & flags .URL ,
3942 "request" : & flags .Method ,
4043 "user" : & capture .user ,
44+ "output" : & capture .output ,
4145 }
4246 captureBool = map [string ]* bool {
4347 "compressed" : & capture .compressed ,
4448 "no-keepalive" : & flags .NoKeepalive ,
4549 "http2" : & flags .HTTP2 ,
50+ "head" : & capture .head ,
4651 }
4752 ignoredString = map [string ]* string {}
4853 ignoredBool = map [string ]* bool {}
@@ -118,18 +123,21 @@ func AddCommand(lf *loadgen.Flags, options ...func(lf *loadgen.Flags, f *nethttp
118123
119124 curl .Action (func (kp * kingpin.ParseContext ) error {
120125 ignoredFlags := make ([]string , 0 )
126+
121127 for f , v := range ignoredString {
122128 if v != nil && * v != "" {
123129 ignoredFlags = append (ignoredFlags , f )
124130 }
125131 }
132+
126133 for f , v := range ignoredBool {
127134 if v != nil && * v {
128135 ignoredFlags = append (ignoredFlags , f )
129136 }
130137 }
138+
131139 if len (ignoredFlags ) > 0 {
132- log . Printf ( "Warning, these Flags are ignored: %v\n "ignoredFlags )
140+ return fmt . Errorf ( " these flags are ignored: %v"ignoredFlags )
133141 }
134142
135143 if len (capture .data ) == 1 {
@@ -139,13 +147,19 @@ func AddCommand(lf *loadgen.Flags, options ...func(lf *loadgen.Flags, f *nethttp
139147 }
140148
141149 flags .HeaderMap = make (map [string ]string , len (capture .header ))
150+
142151 if capture .user != "" {
143152 if ! strings .Contains (capture .user , ":" ) {
144153 return errors .New ("user parameter must be in form user:pass" )
145154 }
155+
146156 flags .HeaderMap ["Authorization" ] = "Basic " + base64 .StdEncoding .EncodeToString ([]byte (capture .user ))
147157 }
148158
159+ if capture .head {
160+ flags .Method = http .MethodHead
161+ }
162+
149163 if flags .Body != "" {
150164 flags .HeaderMap ["Content-Type" ] = "application/x-www-form-urlencoded"
151165
@@ -159,13 +173,20 @@ func AddCommand(lf *loadgen.Flags, options ...func(lf *loadgen.Flags, f *nethttp
159173 if len (parts ) != 2 {
160174 continue
161175 }
176+
162177 flags .HeaderMap [http .CanonicalHeaderKey (parts [0 ])] = strings .Trim (parts [1 ], " " )
163178 }
179+
164180 if capture .compressed {
165181 if _ , ok := flags .HeaderMap ["Accept-Encoding" ]; ! ok {
166182 flags .HeaderMap ["Accept-Encoding" ] = "gzip, deflate"
167183 }
168184 }
185+
186+ if flags .NoKeepalive && (capture .output == "/dev/null" || capture .output == "nul" ) {
187+ flags .IgnoreResponseBody = true
188+ }
189+
169190 if ! strings .HasPrefix (strings .ToLower (flags .URL ), "http://" ) &&
170191 ! strings .HasPrefix (strings .ToLower (flags .URL ), "https://" ) {
171192 flags .URL = "http://" + flags .URL
0 commit comments