public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Contexthandler: Remove code that is no longer used (#73101)

Browse Source 
* Contexthandler: remove dead code

* Contexthandler: Add tests

* Update pkg/tests/api/alerting/api_alertmanager_test.go

Co-authored-by: Jo <joao.guerreiro@grafana.com>

---------

Co-authored-by: Jo <joao.guerreiro@grafana.com>
This commit is contained in:
Karl Persson
2023-08-09 15:17:59 +02:00
committed by GitHub
co-authored by Jo
parent 5d8e6aa162
commit e53e22ef2a
14 changed files with 205 additions and 1754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/middleware/auth_test.go
+3 -2
View File
@@ -15,15 +15,16 @@ import (
"github.com/grafana/grafana/pkg/services/authn/authntest"
"github.com/grafana/grafana/pkg/services/contexthandler"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
)
func setupAuthMiddlewareTest(t *testing.T, identity *authn.Identity, authErr error) *contexthandler.ContextHandler {
return contexthandler.ProvideService(setting.NewCfg(), nil, nil, nil, nil, nil, tracing.NewFakeTracer(), nil, nil, nil, nil, nil, nil, nil, nil, &authntest.FakeService{
return contexthandler.ProvideService(setting.NewCfg(), tracing.NewFakeTracer(), featuremgmt.WithFeatures(), &authntest.FakeService{
ExpectedErr: authErr,
ExpectedIdentity: identity,
}, nil)
})
}
func TestAuth_Middleware(t *testing.T) {
pkg/middleware/middleware_test.go
+1 -8
View File
@@ -15,8 +15,6 @@ import (
"github.com/grafana/grafana/pkg/infra/fs"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/anonymous/anontest"
"github.com/grafana/grafana/pkg/services/auth/authtest"
"github.com/grafana/grafana/pkg/services/authn"
"github.com/grafana/grafana/pkg/services/authn/authntest"
"github.com/grafana/grafana/pkg/services/contexthandler"
@@ -254,10 +252,5 @@ func getContextHandler(t *testing.T, cfg *setting.Cfg, authnService authn.Servic
t.Helper()
tracer := tracing.NewFakeTracer()
return contexthandler.ProvideService(cfg, authtest.NewFakeUserAuthTokenService(), nil,
nil, nil, nil, tracer, nil,
nil, nil, nil, nil, nil,
nil, featuremgmt.WithFeatures(featuremgmt.FlagAccessTokenExpirationCheck),
authnService, &anontest.FakeAnonymousSessionService{},
)
return contexthandler.ProvideService(cfg, tracer, featuremgmt.WithFeatures(), authnService)
}