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

Identity: Rename "namespace" to "type" in the requester interface (#90567)

Browse Source
This commit is contained in:
Ryan McKinley
2024-07-25 12:52:14 +03:00
committed by GitHub
parent 8cdf5ee824
commit 9db3bc926e
109 changed files with 649 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/resource/grpc/authenticator.go
+4 -4
View File
@@ -76,7 +76,7 @@ func (f *Authenticator) decodeMetadata(ctx context.Context, meta metadata.MD) (i
// TODO, remove after this has been deployed to unified storage
if getter(mdUserID) == "" {
var err error
user.Namespace = identity.NamespaceUser
user.Type = identity.TypeUser
user.UserID, err = strconv.ParseInt(getter("grafana-userid"), 10, 64)
if err != nil {
return nil, fmt.Errorf("invalid user id: %w", err)
@@ -88,17 +88,17 @@ func (f *Authenticator) decodeMetadata(ctx context.Context, meta metadata.MD) (i
return user, nil
}
ns, err := identity.ParseNamespaceID(getter(mdUserID))
ns, err := identity.ParseTypedID(getter(mdUserID))
if err != nil {
return nil, fmt.Errorf("invalid user id: %w", err)
}
user.Namespace = ns.Namespace()
user.Type = ns.Type()
user.UserID, err = ns.ParseInt()
if err != nil {
return nil, fmt.Errorf("invalid user id: %w", err)
}
ns, err = identity.ParseNamespaceID(getter(mdUserUID))
ns, err = identity.ParseTypedID(getter(mdUserUID))
if err != nil {
return nil, fmt.Errorf("invalid user id: %w", err)
}