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

pkg/storage/unified/apistore/store_test.go

@@ -32,7 +32,7 @@ func init() {
 	// Make sure there is a user in every context
 	storagetesting.NewContext = func() context.Context {
 		testUserA := &identity.StaticRequester{
-			Namespace:      identity.NamespaceUser,
+			Type:           identity.TypeUser,
 			Login:          "testuser",
 			UserID:         123,
 			UserUID:        "u123",

pkg/storage/unified/resource/grpc/authenticator.go

@@ -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)
 	}

pkg/storage/unified/resource/grpc/authenticator_test.go

@@ -11,13 +11,13 @@ import (
 
 func TestBasicEncodeDecode(t *testing.T) {
 	before := &identity.StaticRequester{
-		UserID:    123,
-		UserUID:   "abc",
-		Login:     "test",
-		Namespace: identity.NamespaceUser,
-		OrgID:     456,
-		OrgName:   "org",
-		OrgRole:   identity.RoleAdmin,
+		UserID:  123,
+		UserUID: "abc",
+		Login:   "test",
+		Type:    identity.TypeUser,
+		OrgID:   456,
+		OrgName: "org",
+		OrgRole: identity.RoleAdmin,
 	}
 
 	auth := &Authenticator{}

pkg/storage/unified/resource/server.go

@@ -108,7 +108,7 @@ func NewResourceServer(opts ResourceServerOptions) (ResourceServer, error) {
 	// Make this cancelable
 	ctx, cancel := context.WithCancel(identity.WithRequester(context.Background(),
 		&identity.StaticRequester{
-			Namespace:      identity.NamespaceServiceAccount,
+			Type:           identity.TypeServiceAccount,
 			Login:          "watcher", // admin user for watch
 			UserID:         1,
 			IsGrafanaAdmin: true,

pkg/storage/unified/resource/server_test.go

@@ -19,7 +19,7 @@ import (
 
 func TestSimpleServer(t *testing.T) {
 	testUserA := &identity.StaticRequester{
-		Namespace:      identity.NamespaceUser,
+		Type:           identity.TypeUser,
 		Login:          "testuser",
 		UserID:         123,
 		UserUID:        "u123",