Fix validation tests to allow for empty resource type on filters

authzed · Feb 6, 2024 · e900503 · e900503
1 parent 3734079
commit e900503
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git a/proto/authzed/api/validation_test/relationships_test.go b/proto/authzed/api/validation_test/relationships_test.go
@@ -224,23 +224,23 @@ func TestV1CoreObjectValidity(t *testing.T) {
 						justNS := &v1.RelationshipFilter{
 							ResourceType: ns.name,
 						}
-						filterValid := ns.valid
+						filterValid := (ns.valid || ns.name == "")
 						err = justNS.Validate()
 						require.Equal(filterValid, err == nil, "should be valid: %v %s", filterValid, err)
 
 						objectIDFilter := &v1.RelationshipFilter{
 							ResourceType:       ns.name,
 							OptionalResourceId: objectID.name,
 						}
-						filterValid = ns.valid && (objectID.valid || objectID.name == "")
+						filterValid = (ns.valid || ns.name == "") && (objectID.valid || objectID.name == "")
 						err = objectIDFilter.Validate()
 						require.Equal(filterValid, err == nil, "should be valid: %v %s", filterValid, err)
 
 						objectRelationFilter := &v1.RelationshipFilter{
 							ResourceType:     ns.name,
 							OptionalRelation: relation.name,
 						}
-						filterValid = ns.valid && (relation.validity == alwaysValid || relation.name == "")
+						filterValid = (ns.valid || ns.name == "") && (relation.validity == alwaysValid || relation.name == "")
 						err = objectRelationFilter.Validate()
 						require.Equal(filterValid, err == nil, "should be valid: %v %s", filterValid, err)
 
@@ -249,7 +249,7 @@ func TestV1CoreObjectValidity(t *testing.T) {
 							OptionalResourceId: objectID.name,
 							OptionalRelation:   relation.name,
 						}
-						filterValid = ns.valid && (objectID.valid || objectID.name == "") &&
+						filterValid = (ns.valid || ns.name == "") && (objectID.valid || objectID.name == "") &&
 							(relation.validity == alwaysValid || relation.name == "")
 						err = fullObjectFilter.Validate()
 						require.Equal(filterValid, err == nil, "should be valid: %v %s", filterValid, err)

diff --git a/proto/authzed/api/validation_test/updates_test.go b/proto/authzed/api/validation_test/updates_test.go
@@ -192,22 +192,6 @@ func TestV1PreconditionValidity(t *testing.T) {
 			},
 			true,
 		},
-		{
-			"invalid must match",
-			v1.Precondition_OPERATION_MUST_MATCH,
-			&v1.RelationshipFilter{
-				ResourceType: "",
-			},
-			false,
-		},
-		{
-			"invalid must not match",
-			v1.Precondition_OPERATION_MUST_NOT_MATCH,
-			&v1.RelationshipFilter{
-				ResourceType: "",
-			},
-			false,
-		},
 		{
 			"invalid operation",
 			v1.Precondition_OPERATION_UNSPECIFIED,
@@ -216,18 +200,6 @@ func TestV1PreconditionValidity(t *testing.T) {
 			},
 			false,
 		},
-		{
-			"empty must not match",
-			v1.Precondition_OPERATION_MUST_NOT_MATCH,
-			&v1.RelationshipFilter{},
-			false,
-		},
-		{
-			"empty must match",
-			v1.Precondition_OPERATION_MUST_MATCH,
-			&v1.RelationshipFilter{},
-			false,
-		},
 	}
 
 	for _, tc := range tcs {