mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
fix: improve codersdk error messages when not JSON (#4495)
This commit is contained in:
@@ -0,0 +1,200 @@
|
||||
package codersdk
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"golang.org/x/xerrors"
|
||||
)
|
||||
|
||||
const (
|
||||
jsonCT = "application/json"
|
||||
)
|
||||
|
||||
func Test_readBodyAsError(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
exampleURL := "http://example.com"
|
||||
simpleResponse := Response{
|
||||
Message: "test",
|
||||
Detail: "hi",
|
||||
}
|
||||
|
||||
longResponse := ""
|
||||
for i := 0; i < 2000; i++ {
|
||||
longResponse += "a"
|
||||
}
|
||||
|
||||
unexpectedJSON := marshalJSON(map[string]any{
|
||||
"hello": "world",
|
||||
"foo": "bar",
|
||||
})
|
||||
|
||||
//nolint:bodyclose
|
||||
tests := []struct {
|
||||
name string
|
||||
req *http.Request
|
||||
res *http.Response
|
||||
assert func(t *testing.T, err error)
|
||||
}{
|
||||
{
|
||||
name: "JSONWithRequest",
|
||||
req: httptest.NewRequest(http.MethodGet, exampleURL, nil),
|
||||
res: newResponse(http.StatusNotFound, jsonCT, marshalJSON(simpleResponse)),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Equal(t, simpleResponse, sdkErr.Response)
|
||||
assert.ErrorContains(t, err, sdkErr.Response.Message)
|
||||
assert.ErrorContains(t, err, sdkErr.Response.Detail)
|
||||
|
||||
assert.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
|
||||
assert.ErrorContains(t, err, strconv.Itoa(sdkErr.StatusCode()))
|
||||
|
||||
assert.Equal(t, http.MethodGet, sdkErr.method)
|
||||
assert.ErrorContains(t, err, sdkErr.method)
|
||||
|
||||
assert.Equal(t, exampleURL, sdkErr.url)
|
||||
assert.ErrorContains(t, err, sdkErr.url)
|
||||
|
||||
assert.Empty(t, sdkErr.Helper)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "JSONWithoutRequest",
|
||||
req: nil,
|
||||
res: newResponse(http.StatusNotFound, jsonCT, marshalJSON(simpleResponse)),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Equal(t, simpleResponse, sdkErr.Response)
|
||||
assert.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
|
||||
assert.Empty(t, sdkErr.method)
|
||||
assert.Empty(t, sdkErr.url)
|
||||
assert.Empty(t, sdkErr.Helper)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "UnauthorizedHelper",
|
||||
req: nil,
|
||||
res: newResponse(http.StatusUnauthorized, jsonCT, marshalJSON(simpleResponse)),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Contains(t, sdkErr.Helper, "Try logging in")
|
||||
assert.ErrorContains(t, err, sdkErr.Helper)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "NonJSON",
|
||||
req: nil,
|
||||
res: newResponse(http.StatusNotFound, "text/plain; charset=utf-8", "hello world"),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Contains(t, sdkErr.Response.Message, "unexpected non-JSON response")
|
||||
assert.Equal(t, "hello world", sdkErr.Response.Detail)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "NonJSONLong",
|
||||
req: nil,
|
||||
res: newResponse(http.StatusNotFound, "text/plain; charset=utf-8", longResponse),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Contains(t, sdkErr.Response.Message, "unexpected non-JSON response")
|
||||
|
||||
expected := longResponse[0:1024] + "..."
|
||||
assert.Equal(t, expected, sdkErr.Response.Detail)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "JSONNoBody",
|
||||
req: nil,
|
||||
res: newResponse(http.StatusNotFound, jsonCT, ""),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Contains(t, sdkErr.Response.Message, "empty response body")
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "JSONNoMessage",
|
||||
req: nil,
|
||||
res: newResponse(http.StatusNotFound, jsonCT, unexpectedJSON),
|
||||
assert: func(t *testing.T, err error) {
|
||||
sdkErr := assertSDKError(t, err)
|
||||
|
||||
assert.Contains(t, sdkErr.Response.Message, "unexpected status code")
|
||||
assert.Contains(t, sdkErr.Response.Message, "has no message")
|
||||
assert.Equal(t, unexpectedJSON, sdkErr.Response.Detail)
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, c := range tests {
|
||||
c := c
|
||||
t.Run(c.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
c.res.Request = c.req
|
||||
|
||||
err := readBodyAsError(c.res)
|
||||
c.assert(t, err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func assertSDKError(t *testing.T, err error) *Error {
|
||||
t.Helper()
|
||||
|
||||
var sdkErr *Error
|
||||
require.Error(t, err)
|
||||
require.True(t, xerrors.As(err, &sdkErr))
|
||||
|
||||
return sdkErr
|
||||
}
|
||||
|
||||
func newResponse(status int, contentType string, body interface{}) *http.Response {
|
||||
var r io.ReadCloser
|
||||
switch v := body.(type) {
|
||||
case string:
|
||||
r = io.NopCloser(strings.NewReader(v))
|
||||
case []byte:
|
||||
r = io.NopCloser(bytes.NewReader(v))
|
||||
case io.ReadCloser:
|
||||
r = v
|
||||
case io.Reader:
|
||||
r = io.NopCloser(v)
|
||||
default:
|
||||
panic(fmt.Sprintf("unknown body type: %T", body))
|
||||
}
|
||||
|
||||
return &http.Response{
|
||||
Status: http.StatusText(status),
|
||||
StatusCode: status,
|
||||
Header: http.Header{
|
||||
"Content-Type": []string{contentType},
|
||||
},
|
||||
Body: r,
|
||||
}
|
||||
}
|
||||
|
||||
func marshalJSON(res any) string {
|
||||
b, err := json.Marshal(res)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return string(b)
|
||||
}
|
||||
Reference in New Issue
Block a user