IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 09:26:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Move Support Bundle service to SignedInUser interface (#72723)

Browse Source 
add identity interface for support bundles service
This commit is contained in:
Jo 2023-08-03 10:09:55 +02:00 committed by GitHub
parent afb59af79b
commit ba1a8a5634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/supportbundles/supportbundlesimpl/service.go
View File

@ -13,11 +13,11 @@ import (
"github.com/grafana/grafana/pkg/infra/usagestats" "github.com/grafana/grafana/pkg/infra/usagestats"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
ac "github.com/grafana/grafana/pkg/services/accesscontrol" ac "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/auth/identity"
"github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings" "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
"github.com/grafana/grafana/pkg/services/supportbundles" "github.com/grafana/grafana/pkg/services/supportbundles"
"github.com/grafana/grafana/pkg/services/supportbundles/bundleregistry" "github.com/grafana/grafana/pkg/services/supportbundles/bundleregistry"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )
@ -109,7 +109,7 @@ func (s *Service) Run(ctx context.Context) error {
return ctx.Err() return ctx.Err()
} }
func (s *Service) create(ctx context.Context, collectors []string, usr *user.SignedInUser) (*supportbundles.Bundle, error) { func (s *Service) create(ctx context.Context, collectors []string, usr identity.Requester) (*supportbundles.Bundle, error) {
bundle, err := s.store.Create(ctx, usr) bundle, err := s.store.Create(ctx, usr)
if err != nil { if err != nil {
return nil, err return nil, err

8
pkg/services/supportbundles/supportbundlesimpl/store.go
View File

@ -15,8 +15,8 @@ import (
"github.com/grafana/grafana/pkg/infra/kvstore" "github.com/grafana/grafana/pkg/infra/kvstore"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/auth/identity"
"github.com/grafana/grafana/pkg/services/supportbundles" "github.com/grafana/grafana/pkg/services/supportbundles"
"github.com/grafana/grafana/pkg/services/user"
) )
const ( const (
@ -41,7 +41,7 @@ type store struct {
} }
type bundleStore interface { type bundleStore interface {
Create(ctx context.Context, usr *user.SignedInUser) (*supportbundles.Bundle, error) Create(ctx context.Context, usr identity.Requester) (*supportbundles.Bundle, error)
Get(ctx context.Context, uid string) (*supportbundles.Bundle, error) Get(ctx context.Context, uid string) (*supportbundles.Bundle, error)
StatsCount(ctx context.Context) (int64, error) StatsCount(ctx context.Context) (int64, error)
List() ([]supportbundles.Bundle, error) List() ([]supportbundles.Bundle, error)
@ -49,7 +49,7 @@ type bundleStore interface {
Update(ctx context.Context, uid string, state supportbundles.State, tarBytes []byte) error Update(ctx context.Context, uid string, state supportbundles.State, tarBytes []byte) error
} }
func (s *store) Create(ctx context.Context, usr *user.SignedInUser) (*supportbundles.Bundle, error) { func (s *store) Create(ctx context.Context, usr identity.Requester) (*supportbundles.Bundle, error) {
uid, err := uuid.NewRandom() uid, err := uuid.NewRandom()
if err != nil { if err != nil {
return nil, err return nil, err
@ -58,7 +58,7 @@ func (s *store) Create(ctx context.Context, usr *user.SignedInUser) (*supportbun
bundle := supportbundles.Bundle{ bundle := supportbundles.Bundle{
UID: uid.String(), UID: uid.String(),
State: supportbundles.StatePending, State: supportbundles.StatePending,
Creator: usr.Login, Creator: usr.GetLogin(),
CreatedAt: time.Now().Unix(), CreatedAt: time.Now().Unix(),
ExpiresAt: time.Now().Add(defaultBundleExpiration).Unix(), ExpiresAt: time.Now().Add(defaultBundleExpiration).Unix(),
} }