Add user and client to schema, replacing subject

Makefile

@@ -28,7 +28,7 @@ build:  ## Builds permissions-api binary.
 .PHONY: test
 test:  ## Runs unit tests.
 	@echo Running unit tests...
-	@docker exec devcontainer-app-1 go test -timeout 30s -cover -short  -tags testtools ./...
+	@docker exec devcontainer-app-1 go test -v -timeout 30s -cover -short  -tags testtools ./...
 
 .PHONY: coverage
 coverage:  ## Generates a test coverage report.

internal/query/tenants.go

@@ -421,7 +421,10 @@ func GetResourceTypes() []types.ResourceType {
 			},
 		},
 		{
-			Name: "subject",
+			Name: "user",
+		},
+		{
+			Name: "client",
 		},
 	}
 }

internal/query/tenants_test.go

@@ -40,7 +40,7 @@ func testEngine(ctx context.Context, t *testing.T, namespace string) *Engine {
 }
 
 func cleanDB(ctx context.Context, t *testing.T, client *authzed.Client, namespace string) {
-	for _, dbType := range []string{"subject", "role", "tenant"} {
+	for _, dbType := range []string{"user", "client", "role", "tenant"} {
 		namespacedType := namespace + "/" + dbType
 		delRequest := &pb.DeleteRelationshipsRequest{
 			RelationshipFilter: &pb.RelationshipFilter{
@@ -119,7 +119,7 @@ func TestAssignments(t *testing.T) {
 	require.NoError(t, err)
 	tenRes, err := e.NewResourceFromURN(tenURN)
 	require.NoError(t, err)
-	subjURN, err := urnx.Build(namespace, "subject", uuid.New())
+	subjURN, err := urnx.Build(namespace, "user", uuid.New())
 	require.NoError(t, err)
 	subjRes, err := e.NewResourceFromURN(subjURN)
 	require.NoError(t, err)
@@ -250,7 +250,7 @@ func TestSubjectActions(t *testing.T) {
 	require.NoError(t, err)
 	otherRes, err := e.NewResourceFromURN(otherURN)
 	require.NoError(t, err)
-	subjURN, err := urnx.Build(namespace, "subject", uuid.New())
+	subjURN, err := urnx.Build(namespace, "user", uuid.New())
 	require.NoError(t, err)
 	subjRes, err := e.NewResourceFromURN(subjURN)
 	require.NoError(t, err)

internal/spicedbx/schema.go

@@ -10,11 +10,13 @@ import (
 var (
 	schemaTemplate = template.Must(template.New("schema").Parse(`
 {{- $namespace := .Namespace -}}
-definition {{$namespace}}/subject {}
+definition {{$namespace}}/user {}
+
+definition {{$namespace}}/client {}
 
 definition {{$namespace}}/role {
     relation tenant: {{$namespace}}/tenant
-    relation subject: {{$namespace}}/subject
+    relation subject: {{$namespace}}/user | {{$namespace}}/client
 }
 
 definition {{$namespace}}/tenant {

internal/spicedbx/schema_test.go

@@ -44,11 +44,13 @@ func TestSchema(t *testing.T) {
 		},
 	}
 
-	schemaOutput := `definition foo/subject {}
+	schemaOutput := `definition foo/user {}
+
+definition foo/client {}
 
 definition foo/role {
     relation tenant: foo/tenant
-    relation subject: foo/subject
+    relation subject: foo/user | foo/client
 }
 
 definition foo/tenant {