Skip to content

Commit

Permalink
Fix panic for batch requests, return error code
Browse files Browse the repository at this point in the history 
Resolves #2045 (comment)
  • Loading branch information
Ivan Mirić committed Jun 8, 2021
1 parent 316d04f commit af755c4
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 25 deletions.
37 changes: 28 additions & 9 deletions js/modules/k6/http/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ package http
import (
"bytes"
"context"
"errors"
"fmt"
"mime/multipart"
"net/http"
Expand Down Expand Up @@ -110,7 +111,13 @@ func (h *HTTP) Request(ctx context.Context, method string, url goja.Value, args
return nil, err
}
state.Logger.WithField("error", err).Warn("Request Failed")
return &Response{Response: httpext.NewResponse(ctx)}, nil
r := httpext.NewResponse(ctx)
r.Error = err.Error()
var k6e httpext.K6Error
if errors.As(err, &k6e) {
r.ErrorCode = int(k6e.Code)
}
return &Response{Response: r}, nil
}

resp, err := httpext.MakeRequest(ctx, req)
Expand Down Expand Up @@ -392,16 +399,22 @@ func (h *HTTP) prepareBatchArray(
results := make([]*Response, reqCount)

for i, req := range requests {
resp := httpext.NewResponse(ctx)
parsedReq, err := h.parseBatchRequest(ctx, i, req)
if err != nil {
return nil, nil, err
resp.Error = err.Error()
var k6e httpext.K6Error
if errors.As(err, &k6e) {
resp.ErrorCode = int(k6e.Code)
}
results[i] = h.responseFromHttpext(resp)
return batchReqs, results, err
}
response := new(httpext.Response)
batchReqs[i] = httpext.BatchParsedHTTPRequest{
ParsedHTTPRequest: parsedReq,
Response: response,
Response: resp,
}
results[i] = h.responseFromHttpext(response)
results[i] = h.responseFromHttpext(resp)
}

return batchReqs, results, nil
Expand All @@ -416,16 +429,22 @@ func (h *HTTP) prepareBatchObject(

i := 0
for key, req := range requests {
resp := httpext.NewResponse(ctx)
parsedReq, err := h.parseBatchRequest(ctx, key, req)
if err != nil {
return nil, nil, err
resp.Error = err.Error()
var k6e httpext.K6Error
if errors.As(err, &k6e) {
resp.ErrorCode = int(k6e.Code)
}
results[key] = h.responseFromHttpext(resp)
return batchReqs, results, err
}
response := new(httpext.Response)
batchReqs[i] = httpext.BatchParsedHTTPRequest{
ParsedHTTPRequest: parsedReq,
Response: response,
Response: resp,
}
results[key] = h.responseFromHttpext(response)
results[key] = h.responseFromHttpext(resp)
i++
}

Expand Down
100 changes: 84 additions & 16 deletions js/modules/k6/http/request_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,19 +575,18 @@ func TestRequestAndBatch(t *testing.T) {
t.Run("InvalidURL", func(t *testing.T) {
t.Parallel()

expErr := `invalid URL: parse "https:// test.k6.io": invalid character " " in host name`
t.Run("throw=true", func(t *testing.T) {
js := `
http.request("GET", "https:// test.k6.io");
throw new Error("whoops!"); // shouldn't be reached
`
_, err := rt.RunString(js)
require.Error(t, err)
assert.Contains(t, err.Error(),
`invalid URL: parse "https:// test.k6.io": invalid character " " in host name`)
assert.Contains(t, err.Error(), expErr)
})

t.Run("throw=false", func(t *testing.T) {
// Disable throw only on this sub-test
state.Options.Throw.Bool = false
defer func() { state.Options.Throw.Bool = true }()

Expand All @@ -597,18 +596,24 @@ func TestRequestAndBatch(t *testing.T) {
js := `
(function(){
var r = http.request("GET", "https:// test.k6.io");
return r.error_code;
return {error: r.error, error_code: r.error_code};
})()
`
v, err := rt.RunString(js)
ret, err := rt.RunString(js)
require.NoError(t, err)
require.Equal(t, int64(0), v.Export())
require.NotNil(t, ret)
var retobj map[string]interface{}
var ok bool
if retobj, ok = ret.Export().(map[string]interface{}); !ok {
require.Fail(t, "got wrong return object: %#+v", retobj)
}
require.Equal(t, int64(1020), retobj["error_code"])
require.Equal(t, expErr, retobj["error"])

logEntry := hook.LastEntry()
require.NotNil(t, logEntry)
assert.Equal(t, logrus.WarnLevel, logEntry.Level)
assert.Contains(t, logEntry.Data["error"].(error).Error(),
`invalid URL: parse "https:// test.k6.io": invalid character " " in host name`)
assert.Contains(t, logEntry.Data["error"].(error).Error(), expErr)
assert.Equal(t, "Request Failed", logEntry.Message)
})

Expand All @@ -622,21 +627,20 @@ func TestRequestAndBatch(t *testing.T) {
js := `
(function(){
var r = http.request("GET", "https:// test.k6.io");
r.html()
r.json()
return r.error_code;
r.html();
r.json();
return r.error_code; // not reached because of json()
})()
`
v, err := rt.RunString(js)
ret, err := rt.RunString(js)
require.Error(t, err)
assert.Nil(t, v)
assert.Nil(t, ret)
assert.Contains(t, err.Error(), "unexpected end of JSON input")

logEntry := hook.LastEntry()
require.NotNil(t, logEntry)
assert.Equal(t, logrus.WarnLevel, logEntry.Level)
assert.Contains(t, logEntry.Data["error"].(error).Error(),
`invalid URL: parse "https:// test.k6.io": invalid character " " in host name`)
assert.Contains(t, logEntry.Data["error"].(error).Error(), expErr)
assert.Equal(t, "Request Failed", logEntry.Message)
})
})
Expand Down Expand Up @@ -1296,11 +1300,27 @@ func TestRequestAndBatch(t *testing.T) {
hook := logtest.NewLocal(state.Logger)
defer hook.Reset()

_, err := rt.RunString(fmt.Sprintf(`http.batch(%s);`, tc.code))
ret, err := rt.RunString(fmt.Sprintf(`
(function(){
var r = http.batch(%s);
if (r.length !== 1) throw new Error('unexpected responses length: '+r.length);
return {error: r[0].error, error_code: r[0].error_code};
})()`, tc.code))
if tc.throw {
require.Error(t, err)
assert.Contains(t, err.Error(), tc.expErr)
require.Nil(t, ret)
} else {
require.NoError(t, err)
require.NotNil(t, ret)
var retobj map[string]interface{}
var ok bool
if retobj, ok = ret.Export().(map[string]interface{}); !ok {
require.Fail(t, "got wrong return object: %#+v", retobj)
}
require.Equal(t, int64(1020), retobj["error_code"])
require.Equal(t, invalidURLerr, retobj["error"])

logEntry := hook.LastEntry()
require.NotNil(t, logEntry)
assert.Equal(t, logrus.WarnLevel, logEntry.Level)
Expand All @@ -1310,6 +1330,54 @@ func TestRequestAndBatch(t *testing.T) {
})
}
})
t.Run("error,nopanic", func(t *testing.T) { //nolint:paralleltest
invalidURLerr := `invalid URL: parse "https:// invalidurl.com": invalid character " " in host name`
testCases := []struct{ name, code string }{
{
name: "array", code: `[
["GET", "https:// invalidurl.com"],
["GET", "https://somevalidurl.com"],
]`,
},
{
name: "object", code: `[
{method: "GET", url: "https:// invalidurl.com"},
{method: "GET", url: "https://somevalidurl.com"},
]`,
},
}

for _, tc := range testCases {
tc := tc
t.Run(tc.name, func(t *testing.T) { //nolint:paralleltest
oldThrow := state.Options.Throw.Bool
state.Options.Throw.Bool = false
defer func() { state.Options.Throw.Bool = oldThrow }()

hook := logtest.NewLocal(state.Logger)
defer hook.Reset()

ret, err := rt.RunString(fmt.Sprintf(`
(function(){
var r = http.batch(%s);
if (r.length !== 2) throw new Error('unexpected responses length: '+r.length);
if (r[1] !== null) throw new Error('expected response at index 1 to be null');
r[0].html();
r[0].json();
return r[0].error_code; // not reached because of json()
})()
`, tc.code))
require.Error(t, err)
assert.Nil(t, ret)
assert.Contains(t, err.Error(), "unexpected end of JSON input")
logEntry := hook.LastEntry()
require.NotNil(t, logEntry)
assert.Equal(t, logrus.WarnLevel, logEntry.Level)
assert.Contains(t, logEntry.Data["error"].(error).Error(), invalidURLerr)
assert.Equal(t, "A batch request failed", logEntry.Message)
})
}
})
t.Run("GET", func(t *testing.T) {
_, err := rt.RunString(sr(`
{
Expand Down

0 comments on commit af755c4

Please sign in to comment.