5626461b3c
* define initial service and add to wire * update caching service interface * add skipQueryCache header handler and update metrics query function to use it * add caching service as a dependency to query service * working caching impl * propagate cache status to frontend in response * beginning of improvements suggested by Lean - separate caching logic from query logic. * more changes to simplify query function * Decided to revert renaming of function * Remove error status from cache request * add extra documentation * Move query caching duration metric to query package * add a little bit of documentation * wip: convert resource caching * Change return type of query service QueryData to a QueryDataResponse with Headers * update codeowners * change X-Cache value to const * use resource caching in endpoint handlers * write resource headers to response even if it's not a cache hit * fix panic caused by lack of nil check * update unit test * remove NONE header - shouldn't show up in OSS * Convert everything to use the plugin middleware * revert a few more things * clean up unused vars * start reverting resource caching, start to implement in plugin middleware * revert more, fix typo * Update caching interfaces - resource caching now has a separate cache method * continue wiring up new resource caching conventions - still in progress * add more safety to implementation * remove some unused objects * remove some code that I left in by accident * add some comments, fix codeowners, fix duplicate registration * fix source of panic in resource middleware * Update client decorator test to provide an empty response object * create tests for caching middleware * fix unit test * Update pkg/services/caching/service.go Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> * improve error message in error log * quick docs update * Remove use of mockery. Update return signature to return an explicit hit/miss bool * create unit test for empty request context * rename caching metrics to make it clear they pertain to caching * Update pkg/services/pluginsintegration/clientmiddleware/caching_middleware.go Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add clarifying comments to cache skip middleware func * Add comment pointing to the resource cache update call * fix unit tests (missing dependency) * try to fix mystery syntax error * fix a panic * Caching: Introduce feature toggle to caching service refactor (#66323) * introduce new feature toggle * hide calls to new service behind a feature flag * remove licensing flag from toggle (misunderstood what it was for) * fix unit tests * rerun toggle gen --------- Co-authored-by: Arati R. <33031346+suntala@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
106 lines
2.8 KiB
Go
106 lines
2.8 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"path"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/grafana/grafana/pkg/infra/db/dbtest"
|
|
"github.com/grafana/grafana/pkg/infra/log"
|
|
"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
|
|
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
|
|
"github.com/grafana/grafana/pkg/services/stats"
|
|
"github.com/grafana/grafana/pkg/services/user"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
"github.com/grafana/grafana/pkg/web"
|
|
)
|
|
|
|
func TestApi_getUsageStats(t *testing.T) {
|
|
type getUsageStatsTestCase struct {
|
|
desc string
|
|
expectedStatus int
|
|
IsGrafanaAdmin bool
|
|
enabled bool
|
|
}
|
|
tests := []getUsageStatsTestCase{
|
|
{
|
|
desc: "expect usage stats",
|
|
enabled: true,
|
|
IsGrafanaAdmin: true,
|
|
expectedStatus: 200,
|
|
},
|
|
{
|
|
desc: "expect usage stat preview still there after disabling",
|
|
enabled: false,
|
|
IsGrafanaAdmin: true,
|
|
expectedStatus: 200,
|
|
},
|
|
{
|
|
desc: "expect http status 403 when not admin",
|
|
enabled: false,
|
|
IsGrafanaAdmin: false,
|
|
expectedStatus: 403,
|
|
},
|
|
}
|
|
sqlStore := dbtest.NewFakeDB()
|
|
uss := createService(t, setting.Cfg{}, sqlStore, false)
|
|
uss.registerAPIEndpoints()
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.desc, func(t *testing.T) {
|
|
uss.Cfg.ReportingEnabled = tt.enabled
|
|
server := setupTestServer(t, &user.SignedInUser{OrgID: 1, IsGrafanaAdmin: tt.IsGrafanaAdmin}, uss)
|
|
|
|
usageStats, recorder := getUsageStats(t, server)
|
|
require.Equal(t, tt.expectedStatus, recorder.Code)
|
|
|
|
if tt.expectedStatus == http.StatusOK {
|
|
require.NotNil(t, usageStats)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func getUsageStats(t *testing.T, server *web.Mux) (*stats.SystemStats, *httptest.ResponseRecorder) {
|
|
req, err := http.NewRequest(http.MethodGet, "/api/admin/usage-report-preview", http.NoBody)
|
|
require.NoError(t, err)
|
|
recorder := httptest.NewRecorder()
|
|
server.ServeHTTP(recorder, req)
|
|
|
|
var usageStats stats.SystemStats
|
|
if recorder.Code == http.StatusOK {
|
|
require.NoError(t, json.NewDecoder(recorder.Body).Decode(&usageStats))
|
|
}
|
|
return &usageStats, recorder
|
|
}
|
|
|
|
func setupTestServer(t *testing.T, user *user.SignedInUser, service *UsageStats) *web.Mux {
|
|
server := web.New()
|
|
server.UseMiddleware(web.Renderer(path.Join(setting.StaticRootPath, "views"), "[[", "]]"))
|
|
server.Use(contextProvider(&testContext{user}))
|
|
service.RouteRegister.Register(server)
|
|
return server
|
|
}
|
|
|
|
type testContext struct {
|
|
user *user.SignedInUser
|
|
}
|
|
|
|
func contextProvider(tc *testContext) web.Handler {
|
|
return func(c *web.Context) {
|
|
signedIn := tc.user != nil
|
|
reqCtx := &contextmodel.ReqContext{
|
|
Context: c,
|
|
SignedInUser: tc.user,
|
|
IsSignedIn: signedIn,
|
|
SkipDSCache: true,
|
|
Logger: log.New("test"),
|
|
}
|
|
c.Req = c.Req.WithContext(ctxkey.Set(c.Req.Context(), reqCtx))
|
|
}
|
|
}
|