Skip to content

Commit 4df1ba9

Browse files
semperossemperos
committed
Correct error msgs in http.go
1 parent 556d6e5 commit 4df1ba9

File tree

1 file changed

+46
-47
lines changed

1 file changed

+46
-47
lines changed

‎http.go

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"io"
66
"net/http"
77
"net/url"
8-
"reflect"
98
"strings"
109
"time"
1110

@@ -91,7 +90,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
9190
return nil, fmt.Errorf("%v expects \"AuthScheme\" "+
9291
"to be a string, but received a %v: %v",
9392
goalFnName,
94-
reflect.TypeOf(value),
93+
value.Type(),
9594
value)
9695
}
9796
case "BaseURL":
@@ -102,7 +101,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
102101
return nil, fmt.Errorf("%v expects \"BaseURL\" "+
103102
"to be a string, but received a %v: %v",
104103
goalFnName,
105-
reflect.TypeOf(value),
104+
value.Type(),
106105
value)
107106
}
108107
case "Debug":
@@ -115,7 +114,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
115114
return nil, fmt.Errorf("%v expects \"Debug\" to be 0 or 1, "+
116115
"but received a %v: %v",
117116
goalFnName,
118-
reflect.TypeOf(value),
117+
value.Type(),
119118
value)
120119
}
121120
case "DisableWarn":
@@ -128,7 +127,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
128127
return nil, fmt.Errorf("%v expects \"DisableWarn\" "+
129128
"to be 0 or 1 (falsey/truthy), but received a %v: %v",
130129
goalFnName,
131-
reflect.TypeOf(value),
130+
value.Type(),
132131
value)
133132
}
134133
case "FormData":
@@ -143,7 +142,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
143142
return nil, fmt.Errorf("%v expects \"FormData\" to be a dictionary, "+
144143
"but received a %v: %v",
145144
goalFnName,
146-
reflect.TypeOf(value),
145+
value.Type(),
147146
value)
148147
}
149148
case "Header":
@@ -158,7 +157,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
158157
return nil, fmt.Errorf("%v expects \"Header\" to be a dictionary, "+
159158
"but received a %v: %v",
160159
goalFnName,
161-
reflect.TypeOf(value),
160+
value.Type(),
162161
value)
163162
}
164163
case "HeaderAuthorizationKey":
@@ -169,7 +168,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
169168
return nil, fmt.Errorf("%v expects \"HeaderAuthorizationKey\" to be a string, "+
170169
"but received a %v: %v",
171170
goalFnName,
172-
reflect.TypeOf(value),
171+
value.Type(),
173172
value)
174173
}
175174
case "PathParams":
@@ -184,7 +183,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
184183
return nil, fmt.Errorf("%v expects \"PathParams\" to be a string, "+
185184
"but received a %v: %v",
186185
goalFnName,
187-
reflect.TypeOf(value),
186+
value.Type(),
188187
value)
189188
}
190189
case "QueryParam":
@@ -199,7 +198,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
199198
return nil, fmt.Errorf("%v expects \"QueryParam\" to be a dictionary, "+
200199
"but received a %v: %v",
201200
goalFnName,
202-
reflect.TypeOf(value),
201+
value.Type(),
203202
value)
204203
}
205204
case "RawPathParams":
@@ -214,7 +213,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
214213
return nil, fmt.Errorf("%v expects \"RawPathParams\" to be a string, "+
215214
"but received a %v: %v",
216215
goalFnName,
217-
reflect.TypeOf(value),
216+
value.Type(),
218217
value)
219218
}
220219
case "RetryCount":
@@ -224,7 +223,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
224223
return nil, fmt.Errorf("%v expects \"RetryCount\" to be an integer, "+
225224
"but received a %v: %v",
226225
goalFnName,
227-
reflect.TypeOf(value),
226+
value.Type(),
228227
value)
229228
}
230229
case "RetryMaxWaitTimeMilli":
@@ -234,7 +233,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
234233
return nil, fmt.Errorf("%v expects \"RetryMaxWaitTimeMilli\" to be an integer, "+
235234
"but received a %v: %v",
236235
goalFnName,
237-
reflect.TypeOf(value),
236+
value.Type(),
238237
value)
239238
}
240239
case "RetryResetReaders":
@@ -247,7 +246,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
247246
return nil, fmt.Errorf("%v expects \"RetryResetReaders\" to be 0 or 1 (falsey/truthy), "+
248247
"but received a %v: %v",
249248
goalFnName,
250-
reflect.TypeOf(value),
249+
value.Type(),
251250
value)
252251
}
253252
case "RetryWaitTimeMilli":
@@ -258,7 +257,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
258257
return nil, fmt.Errorf("%v expects \"RetryWaitTimeMilli\" to be an integer, "+
259258
"but received a %v: %v",
260259
goalFnName,
261-
reflect.TypeOf(value),
260+
value.Type(),
262261
value)
263262
}
264263
case "Token":
@@ -268,7 +267,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
268267
default:
269268
return nil, fmt.Errorf("%v expects \"Token\" to be a string, but received a %v: %v",
270269
goalFnName,
271-
reflect.TypeOf(value),
270+
value.Type(),
272271
value)
273272
}
274273
case "UserInfo":
@@ -296,21 +295,21 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
296295
return nil, fmt.Errorf("%v expects \"UserInfo\" to be a dictionary "+
297296
"with string values, but received a %v: %v",
298297
goalFnName,
299-
reflect.TypeOf(uivs),
298+
userInfoValues.Type(),
300299
uivs)
301300
}
302301
default:
303302
return nil, fmt.Errorf("%v expects \"UserInfo\" to be a dictionary "+
304303
"with string keys, but received a %v: %v",
305304
goalFnName,
306-
reflect.TypeOf(uiks),
307-
uiks)
305+
userInfoKeys.Type(),
306+
userInfoKeys)
308307
}
309308
default:
310309
return nil, fmt.Errorf("%v expects \"UserInfo\" to be a dictionary, "+
311310
"but received a %v: %v",
312311
goalFnName,
313-
reflect.TypeOf(value),
312+
value.Type(),
314313
value)
315314
}
316315
default:
@@ -321,7 +320,7 @@ func NewHTTPClient(optionsD *goal.D) (*HTTPClient, error) {
321320
return nil, fmt.Errorf("%v expects a Goal dictionary with string keys, "+
322321
"but received a %v: %v",
323322
goalFnName,
324-
reflect.TypeOf(va),
323+
va.Type(),
325324
va)
326325
}
327326
return &httpClient, nil
@@ -403,8 +402,8 @@ func httpMakerDyadic(x goal.V, args []goal.V, methodLower string, methodUpper st
403402
return goal.Panicf("client http.%s url : client must be a dict or ari.HTTPClient instance, "+
404403
"but received a %v: %v",
405404
methodLower,
406-
reflect.TypeOf(clientOpts),
407-
clientOpts)
405+
x.Type(),
406+
x)
408407
}
409408
y := args[0]
410409
urlS, ok := y.BV().(goal.S)
@@ -434,8 +433,8 @@ func httpMakerTriadic(x goal.V, args []goal.V, methodLower string, methodUpper s
434433
return goal.Panicf("client http.%s url optionsDict : client must be a dict or ari.HTTPClient instance, "+
435434
"but received a %v: %v",
436435
methodLower,
437-
reflect.TypeOf(clientOpts),
438-
clientOpts)
436+
x.Type(),
437+
x)
439438
}
440439
y := args[1]
441440
urlS, ok := y.BV().(goal.S)
@@ -510,7 +509,7 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
510509
default:
511510
return nil, fmt.Errorf("%v expects \"Debug\" to be 0 or 1, but received a %v: %v",
512511
goalFnName,
513-
reflect.TypeOf(value),
512+
value.Type(),
514513
value)
515514
}
516515
case "FormData":
@@ -525,7 +524,7 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
525524
return nil, fmt.Errorf("%v expects \"FormData\" to be a dictionary, "+
526525
"but received a %v: %v",
527526
goalFnName,
528-
reflect.TypeOf(value),
527+
value.Type(),
529528
value)
530529
}
531530
case "Header":
@@ -539,7 +538,7 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
539538
default:
540539
return nil, fmt.Errorf("%v expects \"Header\" to be a dictionary, but received a %v: %v",
541540
goalFnName,
542-
reflect.TypeOf(value),
541+
value.Type(),
543542
value)
544543
}
545544
case "PathParams":
@@ -553,7 +552,7 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
553552
default:
554553
return nil, fmt.Errorf("%v expects \"PathParams\" to be a string, but received a %v: %v",
555554
goalFnName,
556-
reflect.TypeOf(value),
555+
value.Type(),
557556
value)
558557
}
559558
case "QueryParam":
@@ -568,7 +567,7 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
568567
return nil, fmt.Errorf("%v expects \"QueryParam\" to be a dictionary, "+
569568
"but received a %v: %v",
570569
goalFnName,
571-
reflect.TypeOf(value),
570+
value.Type(),
572571
value)
573572
}
574573
case "RawPathParams":
@@ -582,7 +581,7 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
582581
default:
583582
return nil, fmt.Errorf("%v expects \"RawPathParams\" to be a string, but received a %v: %v",
584583
goalFnName,
585-
reflect.TypeOf(value),
584+
value.Type(),
586585
value)
587586
}
588587
default:
@@ -592,8 +591,8 @@ func augmentRequestWithOptions(req *resty.Request, optionsD *goal.D, methodLower
592591
default:
593592
return nil, fmt.Errorf("%v expects a Goal dictionary with string keys, but received a %v: %v",
594593
goalFnName,
595-
reflect.TypeOf(kas),
596-
kas)
594+
optionsKeys.Type(),
595+
optionsKeys)
597596
}
598597
return req, nil
599598
}
@@ -619,16 +618,16 @@ func processFormData(goalD *goal.D, goalFnName string) (url.Values, error) {
619618
"to be a dictionary with values that are strings or lists of strings, "+
620619
"but received a %v: %v",
621620
goalFnName,
622-
reflect.TypeOf(hv),
623-
hv)
621+
formDataValue.Type(),
622+
formDataValue)
624623
}
625624
}
626625
default:
627626
return nil, fmt.Errorf("%v expects \"FormData\" to be a dictionary "+
628627
"with string keys, but received a %v: %v",
629628
goalFnName,
630-
reflect.TypeOf(fdks),
631-
fdks)
629+
formDataKeys.Type(),
630+
formDataKeys)
632631
}
633632
return urlValues, nil
634633
}
@@ -654,16 +653,16 @@ func processHeader(goalD *goal.D, goalFnName string) (http.Header, error) {
654653
"a dictionary with values that are strings or lists of strings, "+
655654
"but received a %v: %v",
656655
goalFnName,
657-
reflect.TypeOf(hv),
658-
hv)
656+
headerValue.Type(),
657+
headerValue)
659658
}
660659
}
661660
default:
662661
return nil, fmt.Errorf("%v expects \"Header\" to be a dictionary "+
663662
"with string keys, but received a %v: %v",
664663
goalFnName,
665-
reflect.TypeOf(hks),
666-
hks)
664+
headerKeys.Type(),
665+
headerKeys)
667666
}
668667
return header, nil
669668
}
@@ -687,16 +686,16 @@ func processQueryParam(goalD *goal.D, goalFnName string) (url.Values, error) {
687686
return nil, fmt.Errorf("%v expects \"QueryParam\" to be a dictionary "+
688687
"with values that are strings or lists of strings, but received a %v: %v",
689688
goalFnName,
690-
reflect.TypeOf(hv),
691-
hv)
689+
queryParamValue.Type(),
690+
queryParamValue)
692691
}
693692
}
694693
default:
695694
return nil, fmt.Errorf("%v expects \"QueryParam\" to be a dictionary "+
696695
"with string keys, but received a %v: %v",
697696
goalFnName,
698-
reflect.TypeOf(qpks),
699-
qpks)
697+
queryParamKeys.Type(),
698+
queryParamKeys)
700699
}
701700
return urlValues, nil
702701
}
@@ -809,7 +808,7 @@ func serverHandleRequest(goalContext *goal.Context, goalHandler goal.V, requestD
809808
d, ok := responseD.BV().(*goal.D)
810809
if !ok {
811810
//nolint:lll // Error message is long.
812-
http.Error(w, fmt.Sprintf("Server Goal handler function must return a dictionary, but received a %q: %v", d.Type(), d), http.StatusInternalServerError)
811+
http.Error(w, fmt.Sprintf("Server Goal handler function must return a dictionary, but received a %q: %v", responseD.Type(), responseD), http.StatusInternalServerError)
813812
return
814813
}
815814
karr := d.KeyArray()
@@ -851,6 +850,6 @@ func serverHandleRequest(goalContext *goal.Context, goalHandler goal.V, requestD
851850
}
852851
default:
853852
//nolint:lll // Error message is long.
854-
http.Error(w, fmt.Sprintf(`Sever Goal handler function's return value must be a dictionary with string keys, but keys were of type %q: %v`, ks.Type(), ks), http.StatusInternalServerError)
853+
http.Error(w, fmt.Sprintf(`Sever Goal handler function's return value must be a dictionary with string keys, but keys were of type %q: %v`, karr.Type(), karr), http.StatusInternalServerError)
855854
}
856855
}

0 commit comments

Comments
 (0)