Merge pull request #652 from josephschorr/cleanup-core

Cleanup the core messages now that v0 is gone
authzed · Jun 20, 2022 · c6f3b29 · c6f3b29
2 parents baa4abc + 094c1f7
commit c6f3b29
Show file tree

Hide file tree

Showing 48 changed files with 1,281 additions and 1,648 deletions.
diff --git a/internal/datastore/common/sql.go b/internal/datastore/common/sql.go
@@ -247,21 +247,16 @@ func NewPGXExecutor(txSource TxFactory) ExecuteQueryFunc {
 		var tuples []*core.RelationTuple
 		for rows.Next() {
 			nextTuple := &core.RelationTuple{
-				ObjectAndRelation: &core.ObjectAndRelation{},
-				User: &core.User{
-					UserOneof: &core.User_Userset{
-						Userset: &core.ObjectAndRelation{},
-					},
-				},
+				ResourceAndRelation: &core.ObjectAndRelation{},
+				Subject:             &core.ObjectAndRelation{},
 			}
-			userset := nextTuple.User.GetUserset()
 			err := rows.Scan(
-				&nextTuple.ObjectAndRelation.Namespace,
-				&nextTuple.ObjectAndRelation.ObjectId,
-				&nextTuple.ObjectAndRelation.Relation,
-				&userset.Namespace,
-				&userset.ObjectId,
-				&userset.Relation,
+				&nextTuple.ResourceAndRelation.Namespace,
+				&nextTuple.ResourceAndRelation.ObjectId,
+				&nextTuple.ResourceAndRelation.Relation,
+				&nextTuple.Subject.Namespace,
+				&nextTuple.Subject.ObjectId,
+				&nextTuple.Subject.Relation,
 			)
 			if err != nil {
 				return nil, fmt.Errorf(errUnableToQueryTuples, err)

diff --git a/internal/datastore/crdb/watch.go b/internal/datastore/crdb/watch.go
@@ -113,19 +113,15 @@ func (cds *crdbDatastore) Watch(ctx context.Context, afterRevision datastore.Rev
 
 			oneChange := &core.RelationTupleUpdate{
 				Tuple: &core.RelationTuple{
-					ObjectAndRelation: &core.ObjectAndRelation{
+					ResourceAndRelation: &core.ObjectAndRelation{
 						Namespace: pkValues[0],
 						ObjectId:  pkValues[1],
 						Relation:  pkValues[2],
 					},
-					User: &core.User{
-						UserOneof: &core.User_Userset{
-							Userset: &core.ObjectAndRelation{
-								Namespace: pkValues[3],
-								ObjectId:  pkValues[4],
-								Relation:  pkValues[5],
-							},
-						},
+					Subject: &core.ObjectAndRelation{
+						Namespace: pkValues[3],
+						ObjectId:  pkValues[4],
+						Relation:  pkValues[5],
 					},
 				},
 			}

diff --git a/internal/datastore/memdb/schema.go b/internal/datastore/memdb/schema.go
@@ -80,16 +80,16 @@ func (r relationship) Relationship() *v1.Relationship {
 
 func (r relationship) RelationTuple() *core.RelationTuple {
 	return &core.RelationTuple{
-		ObjectAndRelation: &core.ObjectAndRelation{
+		ResourceAndRelation: &core.ObjectAndRelation{
 			Namespace: r.namespace,
 			ObjectId:  r.resourceID,
 			Relation:  r.relation,
 		},
-		User: &core.User{UserOneof: &core.User_Userset{Userset: &core.ObjectAndRelation{
+		Subject: &core.ObjectAndRelation{
 			Namespace: r.subjectNamespace,
 			ObjectId:  r.subjectObjectID,
 			Relation:  r.subjectRelation,
-		}}},
+		},
 	}
 }
 

diff --git a/internal/datastore/mysql/datastore.go b/internal/datastore/mysql/datastore.go
@@ -337,21 +337,17 @@ func newMySQLExecutor(tx querier) common.ExecuteQueryFunc {
 		var tuples []*core.RelationTuple
 		for rows.Next() {
 			nextTuple := &core.RelationTuple{
-				ObjectAndRelation: &core.ObjectAndRelation{},
-				User: &core.User{
-					UserOneof: &core.User_Userset{
-						Userset: &core.ObjectAndRelation{},
-					},
-				},
+				ResourceAndRelation: &core.ObjectAndRelation{},
+				Subject:             &core.ObjectAndRelation{},
 			}
-			userset := nextTuple.User.GetUserset()
+
 			err := rows.Scan(
-				&nextTuple.ObjectAndRelation.Namespace,
-				&nextTuple.ObjectAndRelation.ObjectId,
-				&nextTuple.ObjectAndRelation.Relation,
-				&userset.Namespace,
-				&userset.ObjectId,
-				&userset.Relation,
+				&nextTuple.ResourceAndRelation.Namespace,
+				&nextTuple.ResourceAndRelation.ObjectId,
+				&nextTuple.ResourceAndRelation.Relation,
+				&nextTuple.Subject.Namespace,
+				&nextTuple.Subject.ObjectId,
+				&nextTuple.Subject.Relation,
 			)
 			if err != nil {
 				return nil, fmt.Errorf(errUnableToQueryTuples, err)

diff --git a/internal/datastore/mysql/datastore_test.go b/internal/datastore/mysql/datastore_test.go
@@ -173,16 +173,16 @@ func GarbageCollectionTest(t *testing.T, ds datastore.Datastore) {
 	// Write a relationship.
 
 	tpl := &corev1.RelationTuple{
-		ObjectAndRelation: &corev1.ObjectAndRelation{
+		ResourceAndRelation: &corev1.ObjectAndRelation{
 			Namespace: "resource",
 			ObjectId:  "someresource",
 			Relation:  "reader",
 		},
-		User: &corev1.User{UserOneof: &corev1.User_Userset{Userset: &corev1.ObjectAndRelation{
+		Subject: &corev1.ObjectAndRelation{
 			Namespace: "user",
 			ObjectId:  "someuser",
 			Relation:  "...",
-		}}},
+		},
 	}
 	relationship := tuple.ToRelationship(tpl)
 
@@ -321,16 +321,16 @@ func GarbageCollectionByTimeTest(t *testing.T, ds datastore.Datastore) {
 
 	// Write a relationship.
 	tpl := &corev1.RelationTuple{
-		ObjectAndRelation: &corev1.ObjectAndRelation{
+		ResourceAndRelation: &corev1.ObjectAndRelation{
 			Namespace: "resource",
 			ObjectId:  "someresource",
 			Relation:  "reader",
 		},
-		User: &corev1.User{UserOneof: &corev1.User_Userset{Userset: &corev1.ObjectAndRelation{
+		Subject: &corev1.ObjectAndRelation{
 			Namespace: "user",
 			ObjectId:  "someuser",
 			Relation:  "...",
-		}}},
+		},
 	}
 	relationship := tuple.ToRelationship(tpl)
 
@@ -406,16 +406,16 @@ func ChunkedGarbageCollectionTest(t *testing.T, ds datastore.Datastore) {
 	var tuples []*corev1.RelationTuple
 	for i := 0; i < chunkRelationshipCount; i++ {
 		tpl := &corev1.RelationTuple{
-			ObjectAndRelation: &corev1.ObjectAndRelation{
+			ResourceAndRelation: &corev1.ObjectAndRelation{
 				Namespace: "resource",
 				ObjectId:  fmt.Sprintf("resource-%d", i),
 				Relation:  "reader",
 			},
-			User: &corev1.User{UserOneof: &corev1.User_Userset{Userset: &corev1.ObjectAndRelation{
+			Subject: &corev1.ObjectAndRelation{
 				Namespace: "user",
 				ObjectId:  "someuser",
 				Relation:  "...",
-			}}},
+			},
 		}
 		tuples = append(tuples, tpl)
 	}

diff --git a/internal/datastore/mysql/watch.go b/internal/datastore/mysql/watch.go
@@ -113,25 +113,20 @@ func (mds *Datastore) loadChanges(
 	stagedChanges := common.NewChanges()
 
 	for rows.Next() {
-		userset := &core.ObjectAndRelation{}
-		tpl := &core.RelationTuple{
-			ObjectAndRelation: &core.ObjectAndRelation{},
-			User: &core.User{
-				UserOneof: &core.User_Userset{
-					Userset: userset,
-				},
-			},
+		nextTuple := &core.RelationTuple{
+			ResourceAndRelation: &core.ObjectAndRelation{},
+			Subject:             &core.ObjectAndRelation{},
 		}
 
 		var createdTxn uint64
 		var deletedTxn uint64
 		err = rows.Scan(
-			&tpl.ObjectAndRelation.Namespace,
-			&tpl.ObjectAndRelation.ObjectId,
-			&tpl.ObjectAndRelation.Relation,
-			&userset.Namespace,
-			&userset.ObjectId,
-			&userset.Relation,
+			&nextTuple.ResourceAndRelation.Namespace,
+			&nextTuple.ResourceAndRelation.ObjectId,
+			&nextTuple.ResourceAndRelation.Relation,
+			&nextTuple.Subject.Namespace,
+			&nextTuple.Subject.ObjectId,
+			&nextTuple.Subject.Relation,
 			&createdTxn,
 			&deletedTxn,
 		)
@@ -140,11 +135,11 @@ func (mds *Datastore) loadChanges(
 		}
 
 		if createdTxn > afterRevision && createdTxn <= newRevision {
-			stagedChanges.AddChange(ctx, revisionFromTransaction(createdTxn), tpl, core.RelationTupleUpdate_TOUCH)
+			stagedChanges.AddChange(ctx, revisionFromTransaction(createdTxn), nextTuple, core.RelationTupleUpdate_TOUCH)
 		}
 
 		if deletedTxn > afterRevision && deletedTxn <= newRevision {
-			stagedChanges.AddChange(ctx, revisionFromTransaction(deletedTxn), tpl, core.RelationTupleUpdate_DELETE)
+			stagedChanges.AddChange(ctx, revisionFromTransaction(deletedTxn), nextTuple, core.RelationTupleUpdate_DELETE)
 		}
 	}
 	if err = rows.Err(); err != nil {

diff --git a/internal/datastore/postgres/postgres_test.go b/internal/datastore/postgres/postgres_test.go
@@ -139,16 +139,16 @@ func GarbageCollectionTest(t *testing.T, ds datastore.Datastore) {
 
 	// Write a relationship.
 	tpl := &core.RelationTuple{
-		ObjectAndRelation: &core.ObjectAndRelation{
+		ResourceAndRelation: &core.ObjectAndRelation{
 			Namespace: "resource",
 			ObjectId:  "someresource",
 			Relation:  "reader",
 		},
-		User: &core.User{UserOneof: &core.User_Userset{Userset: &core.ObjectAndRelation{
+		Subject: &core.ObjectAndRelation{
 			Namespace: "user",
 			ObjectId:  "someuser",
 			Relation:  "...",
-		}}},
+		},
 	}
 	relationship := tuple.ToRelationship(tpl)
 
@@ -312,16 +312,16 @@ func GarbageCollectionByTimeTest(t *testing.T, ds datastore.Datastore) {
 
 	// Write a relationship.
 	tpl := &core.RelationTuple{
-		ObjectAndRelation: &core.ObjectAndRelation{
+		ResourceAndRelation: &core.ObjectAndRelation{
 			Namespace: "resource",
 			ObjectId:  "someresource",
 			Relation:  "reader",
 		},
-		User: &core.User{UserOneof: &core.User_Userset{Userset: &core.ObjectAndRelation{
+		Subject: &core.ObjectAndRelation{
 			Namespace: "user",
 			ObjectId:  "someuser",
 			Relation:  "...",
-		}}},
+		},
 	}
 	relationship := tuple.ToRelationship(tpl)
 
@@ -396,16 +396,16 @@ func ChunkedGarbageCollectionTest(t *testing.T, ds datastore.Datastore) {
 	var tpls []*core.RelationTuple
 	for i := 0; i < chunkRelationshipCount; i++ {
 		tpl := &core.RelationTuple{
-			ObjectAndRelation: &core.ObjectAndRelation{
+			ResourceAndRelation: &core.ObjectAndRelation{
 				Namespace: "resource",
 				ObjectId:  fmt.Sprintf("resource-%d", i),
 				Relation:  "reader",
 			},
-			User: &core.User{UserOneof: &core.User_Userset{Userset: &core.ObjectAndRelation{
+			Subject: &core.ObjectAndRelation{
 				Namespace: "user",
 				ObjectId:  "someuser",
 				Relation:  "...",
-			}}},
+			},
 		}
 		tpls = append(tpls, tpl)
 	}
@@ -611,7 +611,7 @@ func BenchmarkPostgresQuery(b *testing.B) {
 			defer iter.Close()
 
 			for tpl := iter.Next(); tpl != nil; tpl = iter.Next() {
-				require.Equal(testfixtures.DocumentNS.Name, tpl.ObjectAndRelation.Namespace)
+				require.Equal(testfixtures.DocumentNS.Name, tpl.ResourceAndRelation.Namespace)
 			}
 			require.NoError(iter.Err())
 		}

diff --git a/internal/datastore/postgres/watch.go b/internal/datastore/postgres/watch.go
@@ -118,25 +118,20 @@ func (pgd *pgDatastore) loadChanges(
 	stagedChanges := common.NewChanges()
 
 	for rows.Next() {
-		userset := &core.ObjectAndRelation{}
-		tpl := &core.RelationTuple{
-			ObjectAndRelation: &core.ObjectAndRelation{},
-			User: &core.User{
-				UserOneof: &core.User_Userset{
-					Userset: userset,
-				},
-			},
+		nextTuple := &core.RelationTuple{
+			ResourceAndRelation: &core.ObjectAndRelation{},
+			Subject:             &core.ObjectAndRelation{},
 		}
 
 		var createdTxn uint64
 		var deletedTxn uint64
 		err = rows.Scan(
-			&tpl.ObjectAndRelation.Namespace,
-			&tpl.ObjectAndRelation.ObjectId,
-			&tpl.ObjectAndRelation.Relation,
-			&userset.Namespace,
-			&userset.ObjectId,
-			&userset.Relation,
+			&nextTuple.ResourceAndRelation.Namespace,
+			&nextTuple.ResourceAndRelation.ObjectId,
+			&nextTuple.ResourceAndRelation.Relation,
+			&nextTuple.Subject.Namespace,
+			&nextTuple.Subject.ObjectId,
+			&nextTuple.Subject.Relation,
 			&createdTxn,
 			&deletedTxn,
 		)
@@ -145,11 +140,11 @@ func (pgd *pgDatastore) loadChanges(
 		}
 
 		if createdTxn > afterRevision && createdTxn <= newRevision {
-			stagedChanges.AddChange(ctx, revisionFromTransaction(createdTxn), tpl, core.RelationTupleUpdate_TOUCH)
+			stagedChanges.AddChange(ctx, revisionFromTransaction(createdTxn), nextTuple, core.RelationTupleUpdate_TOUCH)
 		}
 
 		if deletedTxn > afterRevision && deletedTxn <= newRevision {
-			stagedChanges.AddChange(ctx, revisionFromTransaction(deletedTxn), tpl, core.RelationTupleUpdate_DELETE)
+			stagedChanges.AddChange(ctx, revisionFromTransaction(deletedTxn), nextTuple, core.RelationTupleUpdate_DELETE)
 		}
 	}
 	if err = rows.Err(); err != nil {

diff --git a/internal/datastore/proxy/hedging_test.go b/internal/datastore/proxy/hedging_test.go
@@ -295,19 +295,15 @@ func TestDatastoreE2E(t *testing.T) {
 
 	expectedTuples := []*core.RelationTuple{
 		{
-			ObjectAndRelation: &core.ObjectAndRelation{
+			ResourceAndRelation: &core.ObjectAndRelation{
 				Namespace: "test",
 				ObjectId:  "test",
 				Relation:  "test",
 			},
-			User: &core.User{
-				UserOneof: &core.User_Userset{
-					Userset: &core.ObjectAndRelation{
-						Namespace: "test",
-						ObjectId:  "test",
-						Relation:  "test",
-					},
-				},
+			Subject: &core.ObjectAndRelation{
+				Namespace: "test",
+				ObjectId:  "test",
+				Relation:  "test",
 			},
 		},
 	}

diff --git a/internal/datastore/spanner/reader.go b/internal/datastore/spanner/reader.go
@@ -94,21 +94,16 @@ func queryExecutor(txSource txFactory) common.ExecuteQueryFunc {
 
 		if err := iter.Do(func(row *spanner.Row) error {
 			nextTuple := &core.RelationTuple{
-				ObjectAndRelation: &core.ObjectAndRelation{},
-				User: &core.User{
-					UserOneof: &core.User_Userset{
-						Userset: &core.ObjectAndRelation{},
-					},
-				},
+				ResourceAndRelation: &core.ObjectAndRelation{},
+				Subject:             &core.ObjectAndRelation{},
 			}
-			userset := nextTuple.User.GetUserset()
 			err := row.Columns(
-				&nextTuple.ObjectAndRelation.Namespace,
-				&nextTuple.ObjectAndRelation.ObjectId,
-				&nextTuple.ObjectAndRelation.Relation,
-				&userset.Namespace,
-				&userset.ObjectId,
-				&userset.Relation,
+				&nextTuple.ResourceAndRelation.Namespace,
+				&nextTuple.ResourceAndRelation.ObjectId,
+				&nextTuple.ResourceAndRelation.Relation,
+				&nextTuple.Subject.Namespace,
+				&nextTuple.Subject.ObjectId,
+				&nextTuple.Subject.Relation,
 			)
 			if err != nil {
 				return err