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

pkg/services/anonymous/anonimpl/client_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/anonymous/anontest"
 	"github.com/grafana/grafana/pkg/services/authn"
@@ -52,17 +53,17 @@ func TestAnonymous_Authenticate(t *testing.T) {
 				anonDeviceService: anontest.NewFakeService(),
 			}
 
-			identity, err := c.Authenticate(context.Background(), &authn.Request{})
+			user, err := c.Authenticate(context.Background(), &authn.Request{})
 			if err != nil {
 				require.Error(t, err)
-				require.Nil(t, identity)
+				require.Nil(t, user)
 			} else {
 				require.Nil(t, err)
 
-				assert.Equal(t, authn.AnonymousNamespaceID, identity.ID)
-				assert.Equal(t, tt.org.ID, identity.OrgID)
-				assert.Equal(t, tt.org.Name, identity.OrgName)
-				assert.Equal(t, tt.cfg.AnonymousOrgRole, string(identity.GetOrgRole()))
+				assert.Equal(t, identity.AnonymousTypedID, user.ID)
+				assert.Equal(t, tt.org.ID, user.OrgID)
+				assert.Equal(t, tt.org.Name, user.OrgName)
+				assert.Equal(t, tt.cfg.AnonymousOrgRole, string(user.GetOrgRole()))
 			}
 		})
 	}
@@ -73,7 +74,7 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
 		desc        string
 		cfg         *setting.Cfg
 		orgID       int64
-		namespaceID authn.NamespaceID
+		namespaceID identity.TypedID
 		org         *org.Org
 		orgErr      error
 		expectedErr error
@@ -87,7 +88,7 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
 				AnonymousOrgName: "some org",
 			},
 			orgID:       1,
-			namespaceID: authn.AnonymousNamespaceID,
+			namespaceID: identity.AnonymousTypedID,
 			expectedErr: errInvalidOrg,
 		},
 		{
@@ -97,7 +98,7 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
 				AnonymousOrgName: "some org",
 			},
 			orgID:       1,
-			namespaceID: authn.MustParseNamespaceID("anonymous:1"),
+			namespaceID: identity.MustParseTypedID("anonymous:1"),
 			expectedErr: errInvalidID,
 		},
 		{
@@ -107,7 +108,7 @@ func TestAnonymous_ResolveIdentity(t *testing.T) {
 				AnonymousOrgName: "some org",
 			},
 			orgID:       1,
-			namespaceID: authn.AnonymousNamespaceID,
+			namespaceID: identity.AnonymousTypedID,
 		},
 	}