IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Instrument tracing across accesscontrol (#91864)

Browse Source 
Instrument tracing across accesscontrol 

---------

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Jeff Levin
2024-08-16 14:08:19 -08:00
committed by GitHub
parent 68f545210d
commit 028e8ac59e
22 changed files with 301 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
pkg/api/ds_query_test.go
View File

@@ -211,49 +211,79 @@ var reqDatasourceByIdNotFound = `{
}`
func TestDataSourceQueryError(t *testing.T) {
type body struct {
Message string `json:"message"`
MessageId string `json:"messageId"`
StatusCode int `json:"statusCode"`
}
tcs := []struct {
request string
clientErr error
expectedStatus int
expectedBody string
expectedBody body
}{
{
request: reqValid,
clientErr: plugins.ErrPluginUnavailable,
expectedStatus: http.StatusInternalServerError,
expectedBody: `{"message":"Plugin unavailable","messageId":"plugin.unavailable","statusCode":500,"traceID":""}`,
expectedBody: body{
Message: "Plugin unavailable",
MessageId: "plugin.unavailable",
StatusCode: 500,
},
},
{
request: reqValid,
clientErr: plugins.ErrMethodNotImplemented,
expectedStatus: http.StatusNotFound,
expectedBody: `{"message":"Method not implemented","messageId":"plugin.notImplemented","statusCode":404,"traceID":""}`,
expectedBody: body{
Message: "Method not implemented",
MessageId: "plugin.notImplemented",
StatusCode: 404,
},
},
{
request: reqValid,
clientErr: errors.New("surprise surprise"),
expectedStatus: errutil.StatusInternal.HTTPStatus(),
expectedBody: `{"message":"An error occurred within the plugin","messageId":"plugin.downstreamError","statusCode":500,"traceID":""}`,
expectedBody: body{
Message: "An error occurred within the plugin",
MessageId: "plugin.downstreamError",
StatusCode: 500,
},
},
{
request: reqNoQueries,
expectedStatus: http.StatusBadRequest,
expectedBody: `{"message":"No queries found","messageId":"query.noQueries","statusCode":400,"traceID":""}`,
expectedBody: body{
Message: "No queries found",
MessageId: "query.noQueries",
StatusCode: 400,
},
},
{
request: reqQueryWithInvalidDatasourceID,
expectedStatus: http.StatusBadRequest,
expectedBody: `{"message":"Query does not contain a valid data source identifier","messageId":"query.invalidDatasourceId","statusCode":400,"traceID":""}`,
expectedBody: body{
Message: "Query does not contain a valid data source identifier",
MessageId: "query.invalidDatasourceId",
StatusCode: 400,
},
},
{
request: reqDatasourceByUidNotFound,
expectedStatus: http.StatusNotFound,
expectedBody: `{"message":"Data source not found","traceID":""}`,
expectedBody: body{
Message: "Data source not found",
},
},
{
request: reqDatasourceByIdNotFound,
expectedStatus: http.StatusNotFound,
expectedBody: `{"message":"Data source not found","traceID":""}`,
expectedBody: body{
Message: "Data source not found",
},
},
}
@@ -291,14 +321,24 @@ func TestDataSourceQueryError(t *testing.T) {
hs.QuotaService = quotatest.New(false, nil)
})
req := srv.NewPostRequest("/api/ds/query", strings.NewReader(tc.request))
webtest.RequestWithSignedInUser(req, &user.SignedInUser{UserID: 1, OrgID: 1, Permissions: map[int64]map[string][]string{1: {datasources.ActionQuery: []string{datasources.ScopeAll}}}})
resp, err := srv.SendJSON(req)
require.NoError(t, err)
require.Equal(t, tc.expectedStatus, resp.StatusCode)
body, err := io.ReadAll(resp.Body)
bodyBytes, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, tc.expectedBody, string(body))
var responseBody body
err = json.Unmarshal(bodyBytes, &responseBody)
require.NoError(t, err)
require.Equal(t, tc.expectedBody.Message, responseBody.Message)
require.Equal(t, tc.expectedBody.MessageId, responseBody.MessageId)
require.Equal(t, tc.expectedBody.StatusCode, responseBody.StatusCode)
require.NoError(t, resp.Body.Close())
})
}

11
pkg/api/plugin_resource_test.go
View File

@@ -199,12 +199,15 @@ func TestCallResource(t *testing.T) {
resp, err := srv.SendJSON(req)
require.NoError(t, err)
body := new(strings.Builder)
_, err = io.Copy(body, resp.Body)
bodyBytes, err := io.ReadAll(resp.Body)
require.NoError(t, err)
expectedBody := `{ "message": "Failed to call resource", "traceID": "" }`
require.JSONEq(t, expectedBody, body.String())
var responseBody struct {
Message string `json:"message"`
}
err = json.Unmarshal(bodyBytes, &responseBody)
require.NoError(t, err)
require.Equal(t, responseBody.Message, "Failed to call resource")
require.NoError(t, resp.Body.Close())
require.Equal(t, 500, resp.StatusCode)
})