Merge pull request #164 from josephschorr/optional-resource-type

Regenerate for API change for optional resource type
authzed · Feb 6, 2024 · 781a5f5 · 781a5f5
2 parents 8d86e8f + e900503
commit 781a5f5
Showing 9 changed files with 483 additions and 509 deletions.
diff --git a/magefiles/gen.go b/magefiles/gen.go
@@ -24,7 +24,7 @@ func (g Gen) All() error {
 const (
 	ProtoPath     = "proto/authzed/api"
 	BufRepository = "buf.build/authzed/api"
-	BufTag        = "1e5349668409a419637daa6a8ca52193081c610a"
+	BufTag        = "14854970e303a3b8e2f9f53efbab9897b5c8f2b1"
 )
 
 // Proto runs proto codegen

diff --git a/magefiles/go.work.sum b/magefiles/go.work.sum
@@ -1121,6 +1121,7 @@ golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

diff --git a/proto/authzed/api/v0/zz_generated.version.go b/proto/authzed/api/v0/zz_generated.version.go
@@ -2,5 +2,5 @@ package v0
 
 const (
 	BufRepository = "buf.build/authzed/api"
-	BufTag        = "1e5349668409a419637daa6a8ca52193081c610a"
+	BufTag        = "14854970e303a3b8e2f9f53efbab9897b5c8f2b1"
 )
diff --git a/proto/authzed/api/v1/permission_service.pb.go b/proto/authzed/api/v1/permission_service.pb.go
diff --git a/proto/authzed/api/v1/permission_service.pb.validate.go b/proto/authzed/api/v1/permission_service.pb.validate.go
diff --git a/proto/authzed/api/v1/zz_generated.version.go b/proto/authzed/api/v1/zz_generated.version.go
@@ -2,5 +2,5 @@ package v1
 
 const (
 	BufRepository = "buf.build/authzed/api"
-	BufTag        = "1e5349668409a419637daa6a8ca52193081c610a"
+	BufTag        = "14854970e303a3b8e2f9f53efbab9897b5c8f2b1"
 )
diff --git a/proto/authzed/api/v1alpha1/zz_generated.version.go b/proto/authzed/api/v1alpha1/zz_generated.version.go
@@ -2,5 +2,5 @@ package v1alpha1
 
 const (
 	BufRepository = "buf.build/authzed/api"
-	BufTag        = "1e5349668409a419637daa6a8ca52193081c610a"
+	BufTag        = "14854970e303a3b8e2f9f53efbab9897b5c8f2b1"
 )
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 {