diff --git a/proto/authzed/api/v1/00_handwritten_validation.go b/proto/authzed/api/v1/00_handwritten_validation.go index 211a53b..720e601 100644 --- a/proto/authzed/api/v1/00_handwritten_validation.go +++ b/proto/authzed/api/v1/00_handwritten_validation.go @@ -3,20 +3,25 @@ package v1 func (m *CheckPermissionRequest) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetResource() != nil && m.GetResource().GetObjectId() == "*" { return ObjectReferenceValidationError{ field: "ObjectId", reason: "alphanumeric value is required", } } - if m.GetSubject() != nil { - return m.GetSubject().HandwrittenValidate() - } - return nil + return m.GetSubject().HandwrittenValidate() } func (m *ExpandPermissionTreeRequest) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetResource() != nil && m.GetResource().GetObjectId() == "*" { return ObjectReferenceValidationError{ field: "ObjectId", @@ -28,27 +33,33 @@ func (m *ExpandPermissionTreeRequest) HandwrittenValidate() error { } func (m *Precondition) HandwrittenValidate() error { - if m.GetFilter() != nil { - return m.GetFilter().HandwrittenValidate() + if m == nil { + return nil } - return nil + return m.GetFilter().HandwrittenValidate() } func (m *RelationshipFilter) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetOptionalResourceId() == "*" { return RelationshipFilterValidationError{ field: "OptionalResourceId", reason: "alphanumeric value is required", } } - if m.GetOptionalSubjectFilter() != nil { - return m.GetOptionalSubjectFilter().HandwrittenValidate() - } - return nil + + return m.GetOptionalSubjectFilter().HandwrittenValidate() } func (m *SubjectFilter) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetOptionalSubjectId() == "*" && m.GetOptionalRelation() != nil && m.GetOptionalRelation().GetRelation() != "" { return SubjectFilterValidationError{ field: "OptionalRelation", @@ -59,10 +70,7 @@ func (m *SubjectFilter) HandwrittenValidate() error { } func (m *RelationshipUpdate) HandwrittenValidate() error { - if m.GetRelationship() != nil { - return m.GetRelationship().HandwrittenValidate() - } - return nil + return m.GetRelationship().HandwrittenValidate() } func (m *SubjectReference) HandwrittenValidate() error { @@ -76,6 +84,10 @@ func (m *SubjectReference) HandwrittenValidate() error { } func (m *Relationship) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetResource() != nil && m.GetResource().GetObjectId() == "*" { return ObjectReferenceValidationError{ field: "ObjectId", @@ -83,14 +95,14 @@ func (m *Relationship) HandwrittenValidate() error { } } - if m.GetSubject() != nil { - return m.GetSubject().HandwrittenValidate() - } - - return nil + return m.GetSubject().HandwrittenValidate() } func (m *DeleteRelationshipsRequest) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetOptionalPreconditions() != nil { for _, precondition := range m.GetOptionalPreconditions() { err := precondition.HandwrittenValidate() @@ -100,14 +112,14 @@ func (m *DeleteRelationshipsRequest) HandwrittenValidate() error { } } - if m.GetRelationshipFilter() != nil { - return m.GetRelationshipFilter().HandwrittenValidate() - } - - return nil + return m.GetRelationshipFilter().HandwrittenValidate() } func (m *WriteRelationshipsRequest) HandwrittenValidate() error { + if m == nil { + return nil + } + if m.GetOptionalPreconditions() != nil { for _, precondition := range m.GetOptionalPreconditions() { err := precondition.HandwrittenValidate()