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

ApiKeyGenPrefix: rename package (#65623)

Browse Source 
* Rename package to satokengen to make it clearer that it is for service
account tokens
This commit is contained in:
Karl Persson
2023-03-30 17:04:10 +02:00
committed by GitHub
parent 3cd3bb00ec
commit e4d998dc1a
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/grpcserver/interceptors/auth.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
apikeygenprefix "github.com/grafana/grafana/pkg/components/apikeygenprefixed"
"github.com/grafana/grafana/pkg/components/satokengen"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/apikey"
@@ -79,7 +79,7 @@ func (a *authenticator) tokenAuth(ctx context.Context) (context.Context, error)
}
func (a *authenticator) getSignedInUser(ctx context.Context, token string) (*user.SignedInUser, error) {
decoded, err := apikeygenprefix.Decode(token)
decoded, err := satokengen.Decode(token)
if err != nil {
return nil, err
}
pkg/services/grpcserver/interceptors/auth_test.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/grpc/metadata"
apikeygenprefix "github.com/grafana/grafana/pkg/components/apikeygenprefixed"
"github.com/grafana/grafana/pkg/components/satokengen"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/accesscontrol"
accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
@@ -151,7 +151,7 @@ func (f *fakeUserService) GetSignedInUserWithCacheCtx(ctx context.Context, query
func setupContext() (context.Context, error) {
ctx := context.Background()
key, err := apikeygenprefix.New("sa")
key, err := satokengen.New("sa")
if err != nil {
return ctx, err
}