ds-querier: return 400 when no code is present (#105633)

This commit is contained in:
Adam Simpson
2025-05-19 22:23:51 +03:00
committed by GitHub
parent 04f7f2451d
commit 5faa5f87ba
2 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -31,7 +31,7 @@ type QueryDataResponse struct {
// GetResponseCode return the right status code for the response by checking the responses.
func GetResponseCode(rsp *backend.QueryDataResponse) int {
if rsp == nil {
return http.StatusTeapot // rsp is nil, so we return a teapot
return http.StatusBadRequest // rsp is nil, so we return a 400
}
for _, res := range rsp.Responses {
if res.Error != nil && res.Status != 0 {
@@ -39,7 +39,7 @@ func GetResponseCode(rsp *backend.QueryDataResponse) int {
}
if res.Error != nil {
return http.StatusTeapot // Status is nil but we have an error, so we return a teapot
return http.StatusBadRequest // Status is nil but we have an error, so we return a 400
}
}
return http.StatusOK
+4 -4
View File
@@ -93,8 +93,8 @@ func TestGetResponseCode(t *testing.T) {
},
}))
})
t.Run("return 418 if there is an error in the responses but no status code", func(t *testing.T) {
assert.Equal(t, 418, query.GetResponseCode(&backend.QueryDataResponse{
t.Run("return 400 if there is an error in the responses but no status code", func(t *testing.T) {
assert.Equal(t, 400, query.GetResponseCode(&backend.QueryDataResponse{
Responses: map[string]backend.DataResponse{
"A": {
Error: fmt.Errorf("some wild error"),
@@ -102,8 +102,8 @@ func TestGetResponseCode(t *testing.T) {
},
}))
})
t.Run("return 418 if there is a partial error but no status code", func(t *testing.T) {
assert.Equal(t, 418, query.GetResponseCode(&backend.QueryDataResponse{
t.Run("return 400 if there is a partial error but no status code", func(t *testing.T) {
assert.Equal(t, 400, query.GetResponseCode(&backend.QueryDataResponse{
Responses: map[string]backend.DataResponse{
"A": {
Error: nil,