Upgrade to Protovalidate v0.11.0 (#227)

This upgrades to the latest v0.11.0 release of Protovalidate. As a
result, it conforms to the convention of using `rule` everywhere instead
of `constraint`. All usages of `constraint` have been removed.

In addition, this adds a few additional tests to the expected_failures
list as a result of v0.11.0.

Also, there are two failing unit tests as a result of the upgrade, which
will be fixed in a follow-up as they seem to be related to the failing
conformance tests. These failing unit tests are marked with a `TODO`.

---------

Co-authored-by: Nick Snyder <[email protected]>

Author: smaye81

Makefile

@@ -14,9 +14,9 @@ GO ?= go
 ARGS ?= --strict_message --strict_error
 GOLANGCI_LINT_VERSION ?= v1.64.8
 # Set to use a different version of protovalidate-conformance.
-# Should be kept in sync with the version referenced in proto/buf.lock and
+# Should be kept in sync with the version referenced in buf.yaml and
 # 'buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go' in go.mod.
-CONFORMANCE_VERSION ?= v0.10.4
+CONFORMANCE_VERSION ?= v0.11.0
 
 .PHONY: help
 help: ## Describe useful make targets

README.md

@@ -8,7 +8,7 @@
 [![GoDoc](https://pkg.go.dev/badge/github.com/bufbuild/protovalidate-go.svg)](https://pkg.go.dev/github.com/bufbuild/protovalidate-go)
 [![BSR](https://img.shields.io/badge/BSR-Module-0C65EC)][buf-mod]
 
-[Protovalidate][protovalidate] provides standard annotations to validate common constraints on messages and fields, as well as the ability to use [CEL][cel] to write custom constraints. It's the next generation of [protoc-gen-validate][protoc-gen-validate], the only widely used validation library for Protobuf.
+[Protovalidate][protovalidate] provides standard annotations to validate common rules on messages and fields, as well as the ability to use [CEL][cel] to write custom rules. It's the next generation of [protoc-gen-validate][protoc-gen-validate], the only widely used validation library for Protobuf.
 
 With Protovalidate, you can annotate your Protobuf messages with both standard and custom validation rules:
 

any.go

@@ -22,7 +22,7 @@ import (
 
 //nolint:gochecknoglobals
 var (
-	anyRuleDescriptor   = (&validate.FieldConstraints{}).ProtoReflect().Descriptor().Fields().ByName("any")
+	anyRuleDescriptor   = (&validate.FieldRules{}).ProtoReflect().Descriptor().Fields().ByName("any")
 	anyInRuleDescriptor = (&validate.AnyRules{}).ProtoReflect().Descriptor().Fields().ByName("in")
 	anyInRulePath       = &validate.FieldPath{
 		Elements: []*validate.FieldPathElement{
@@ -66,10 +66,10 @@ func (a anyPB) Evaluate(_ protoreflect.Message, val protoreflect.Value, cfg *val
 		if _, ok := a.In[typeURL]; !ok {
 			err.Violations = append(err.Violations, &Violation{
 				Proto: &validate.Violation{
-					Field:        a.base.fieldPath(),
-					Rule:         a.base.rulePath(anyInRulePath),
-					ConstraintId: proto.String("any.in"),
-					Message:      proto.String("type URL must be in the allow list"),
+					Field:   a.base.fieldPath(),
+					Rule:    a.base.rulePath(anyInRulePath),
+					RuleId:  proto.String("any.in"),
+					Message: proto.String("type URL must be in the allow list"),
 				},
 				FieldValue:      val,
 				FieldDescriptor: a.base.Descriptor,
@@ -86,10 +86,10 @@ func (a anyPB) Evaluate(_ protoreflect.Message, val protoreflect.Value, cfg *val
 		if _, ok := a.NotIn[typeURL]; ok {
 			err.Violations = append(err.Violations, &Violation{
 				Proto: &validate.Violation{
-					Field:        a.base.fieldPath(),
-					Rule:         a.base.rulePath(anyNotInRulePath),
-					ConstraintId: proto.String("any.not_in"),
-					Message:      proto.String("type URL must not be in the block list"),
+					Field:   a.base.fieldPath(),
+					Rule:    a.base.rulePath(anyNotInRulePath),
+					RuleId:  proto.String("any.not_in"),
+					Message: proto.String("type URL must not be in the block list"),
 				},
 				FieldValue:      val,
 				FieldDescriptor: a.base.Descriptor,

ast.go

@@ -134,7 +134,7 @@ func (set astSet) WithRuleValue(
 type compiledAST struct {
 	AST        *cel.Ast
 	Env        *cel.Env
-	Source     *validate.Constraint
+	Source     *validate.Rule
 	Path       []*validate.FieldPathElement
 	Value      protoreflect.Value
 	Descriptor protoreflect.FieldDescriptor

ast_test.go

@@ -54,7 +54,7 @@ func TestASTSet_ToProgramSet(t *testing.T) {
 
 	asts, err := compileASTs(
 		expressions{
-			Constraints: []*validate.Constraint{
+			Rules: []*validate.Rule{
 				{Expression: proto.String("foo")},
 			},
 		},
@@ -82,7 +82,7 @@ func TestASTSet_ReduceResiduals(t *testing.T) {
 
 	asts, err := compileASTs(
 		expressions{
-			Constraints: []*validate.Constraint{
+			Rules: []*validate.Rule{
 				{Expression: proto.String("foo")},
 			},
 		},

buf.yaml

@@ -2,8 +2,8 @@ version: v2
 modules:
   - path: proto
 deps:
-  - buf.build/bufbuild/protovalidate
-  - buf.build/bufbuild/protovalidate-testing
+  - buf.build/bufbuild/protovalidate:v0.11.0
+  - buf.build/bufbuild/protovalidate-testing:v0.11.0
   - buf.build/envoyproxy/protoc-gen-validate
 lint:
   use: