bufbuild · Dec 12, 2023 · Dec 20, 2023 · Jan 2, 2024 · Jan 17, 2024
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Install go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       - name: Test

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Install go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       - name: Test conformance

diff --git a/celext/lib.go b/celext/lib.go
@@ -29,7 +29,9 @@ import (
 	"github.com/google/cel-go/common/types/ref"
 	"github.com/google/cel-go/common/types/traits"
 	"github.com/google/cel-go/ext"
+	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
+	"google.golang.org/protobuf/types/dynamicpb"
 )
 
 // DefaultEnv produces a cel.Env with the necessary cel.EnvOption and
@@ -49,6 +51,23 @@ func DefaultEnv(useUTC bool) (*cel.Env, error) {
 	)
 }
 
+// RequiredCELEnvOptions returns the options required to have expressions which
+// rely on the provided descriptor.
+func RequiredCELEnvOptions(fieldDesc protoreflect.FieldDescriptor) []cel.EnvOption {
+	if fieldDesc.IsMap() {
+		return append(
+			RequiredCELEnvOptions(fieldDesc.MapKey()),
+			RequiredCELEnvOptions(fieldDesc.MapValue())...,
+		)
+	}
+	if fieldDesc.Kind() == protoreflect.MessageKind {
+		return []cel.EnvOption{
+			cel.Types(dynamicpb.NewMessage(fieldDesc.Message())),
+		}
+	}
+	return nil
+}
+
 // lib is the collection of functions and settings required by protovalidate
 // beyond the standard definitions of the CEL Specification:
 //

diff --git a/internal/expression/lookups.go → celext/lookups.go b/internal/expression/lookups.go → celext/lookups.go
@@ -12,51 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package expression
+package celext
 
 import (
 	"github.com/google/cel-go/cel"
 	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/dynamicpb"
 )
 
-// ProtoKindToCELType maps a protoreflect.Kind to a compatible cel.Type.
-func ProtoKindToCELType(kind protoreflect.Kind) *cel.Type {
-	switch kind {
-	case
-		protoreflect.FloatKind,
-		protoreflect.DoubleKind:
-		return cel.DoubleType
-	case
-		protoreflect.Int32Kind,
-		protoreflect.Int64Kind,
-		protoreflect.Sint32Kind,
-		protoreflect.Sint64Kind,
-		protoreflect.Sfixed32Kind,
-		protoreflect.Sfixed64Kind,
-		protoreflect.EnumKind:
-		return cel.IntType
-	case
-		protoreflect.Uint32Kind,
-		protoreflect.Uint64Kind,
-		protoreflect.Fixed32Kind,
-		protoreflect.Fixed64Kind:
-		return cel.UintType
-	case protoreflect.BoolKind:
-		return cel.BoolType
-	case protoreflect.StringKind:
-		return cel.StringType
-	case protoreflect.BytesKind:
-		return cel.BytesType
-	case
-		protoreflect.MessageKind,
-		protoreflect.GroupKind:
-		return cel.DynType
-	default:
-		return cel.DynType
-	}
-}
-
 // ProtoFieldToCELType resolves the CEL value type for the provided
 // FieldDescriptor. If generic is true, the specific subtypes of map and
 // repeated fields will be replaced with cel.DynType. If forItems is true, the
@@ -92,22 +54,42 @@ func ProtoFieldToCELType(fieldDesc protoreflect.FieldDescriptor, generic, forIte
 			return cel.ObjectType(string(fqn))
 		}
 	}
-	return ProtoKindToCELType(fieldDesc.Kind())
+	return protoKindToCELType(fieldDesc.Kind())
 }
 
-// RequiredCELEnvOptions returns the options required to have expressions which
-// rely on the provided descriptor.
-func RequiredCELEnvOptions(fieldDesc protoreflect.FieldDescriptor) []cel.EnvOption {
-	if fieldDesc.IsMap() {
-		return append(
-			RequiredCELEnvOptions(fieldDesc.MapKey()),
-			RequiredCELEnvOptions(fieldDesc.MapValue())...,
-		)
-	}
-	if fieldDesc.Kind() == protoreflect.MessageKind {
-		return []cel.EnvOption{
-			cel.Types(dynamicpb.NewMessage(fieldDesc.Message())),
-		}
+// protoKindToCELType maps a protoreflect.Kind to a compatible cel.Type.
+func protoKindToCELType(kind protoreflect.Kind) *cel.Type {
+	switch kind {
+	case
+		protoreflect.FloatKind,
+		protoreflect.DoubleKind:
+		return cel.DoubleType
+	case
+		protoreflect.Int32Kind,
+		protoreflect.Int64Kind,
+		protoreflect.Sint32Kind,
+		protoreflect.Sint64Kind,
+		protoreflect.Sfixed32Kind,
+		protoreflect.Sfixed64Kind,
+		protoreflect.EnumKind:
+		return cel.IntType
+	case
+		protoreflect.Uint32Kind,
+		protoreflect.Uint64Kind,
+		protoreflect.Fixed32Kind,
+		protoreflect.Fixed64Kind:
+		return cel.UintType
+	case protoreflect.BoolKind:
+		return cel.BoolType
+	case protoreflect.StringKind:
+		return cel.StringType
+	case protoreflect.BytesKind:
+		return cel.BytesType
+	case
+		protoreflect.MessageKind,
+		protoreflect.GroupKind:
+		return cel.DynType
+	default:
+		return cel.DynType
 	}
-	return nil
 }
diff --git a/internal/expression/lookups_test.go → celext/lookups_test.go b/internal/expression/lookups_test.go → celext/lookups_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package expression
+package celext
 
 import (
 	"testing"
@@ -89,6 +89,40 @@ func TestCache_GetCELType(t *testing.T) {
 	}
 }
 
+func TestProtoKindToCELType(t *testing.T) {
+	t.Parallel()
+
+	tests := map[protoreflect.Kind]*cel.Type{
+		protoreflect.FloatKind:    cel.DoubleType,
+		protoreflect.DoubleKind:   cel.DoubleType,
+		protoreflect.Int32Kind:    cel.IntType,
+		protoreflect.Int64Kind:    cel.IntType,
+		protoreflect.Uint32Kind:   cel.UintType,
+		protoreflect.Uint64Kind:   cel.UintType,
+		protoreflect.Sint32Kind:   cel.IntType,
+		protoreflect.Sint64Kind:   cel.IntType,
+		protoreflect.Fixed32Kind:  cel.UintType,
+		protoreflect.Fixed64Kind:  cel.UintType,
+		protoreflect.Sfixed32Kind: cel.IntType,
+		protoreflect.Sfixed64Kind: cel.IntType,
+		protoreflect.BoolKind:     cel.BoolType,
+		protoreflect.StringKind:   cel.StringType,
+		protoreflect.BytesKind:    cel.BytesType,
+		protoreflect.EnumKind:     cel.IntType,
+		protoreflect.MessageKind:  cel.DynType,
+		protoreflect.GroupKind:    cel.DynType,
+		protoreflect.Kind(0):      cel.DynType,
+	}
+
+	for k, ty := range tests {
+		kind, typ := k, ty
+		t.Run(kind.String(), func(t *testing.T) {
+			t.Parallel()
+			assert.Equal(t, typ, protoKindToCELType(kind))
+		})
+	}
+}
+
 func getFieldDesc(t *testing.T, msg proto.Message, fld protoreflect.Name) protoreflect.FieldDescriptor {
 	t.Helper()
 	desc := msg.ProtoReflect().Descriptor().Fields().ByName(fld)

diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/bufbuild/protovalidate-go
 go 1.19
 
 require (
-	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20231115204500-e097f827e652.2
-	github.com/envoyproxy/protoc-gen-validate v1.0.2
+	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1
+	github.com/envoyproxy/protoc-gen-validate v1.0.4
 	github.com/google/cel-go v0.18.2
 	github.com/stretchr/testify v1.8.4
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/protobuf v1.32.0
 )
 
 require (
@@ -18,7 +18,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect

diff --git a/go.sum b/go.sum
@@ -1,13 +1,13 @@
-buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20231115204500-e097f827e652.2 h1:iEPA5SBtdLJNwQis/SrcCuDWJh5E1V0mVO4Ih7/mRbg=
-buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20231115204500-e097f827e652.2/go.mod h1:xafc+XIsTxTy76GJQ1TKgvJWsSugFBqMaN27WhUblew=
+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1 h1:u0olL4yf2p7Tl5jfsAK5keaFi+JFJuv1CDHrbiXkxkk=
+buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1/go.mod h1:tiTMKD8j6Pd/D2WzREoweufjzaJKHZg35f/VGcZ2v3I=
 github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
-github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
+github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
+github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/cel-go v0.18.2 h1:L0B6sNBSVmt0OyECi8v6VOS74KOc9W/tLiWKfZABvf4=
 github.com/google/cel-go v0.18.2/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg=
@@ -33,16 +33,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI=
 google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/internal/constraints/cache.go b/internal/constraints/cache.go
@@ -17,6 +17,7 @@ package constraints
 import (
 	"buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate"
 	"buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate/priv"
+	"github.com/bufbuild/protovalidate-go/celext"
 	"github.com/bufbuild/protovalidate-go/internal/errors"
 	"github.com/bufbuild/protovalidate-go/internal/expression"
 	"github.com/google/cel-go/cel"
@@ -114,7 +115,7 @@ func (c *Cache) prepareEnvironment(
 ) (*cel.Env, error) {
 	env, err := env.Extend(
 		cel.Types(rules.Interface()),
-		cel.Variable("this", expression.ProtoFieldToCELType(fieldDesc, true, forItems)),
+		cel.Variable("this", celext.ProtoFieldToCELType(fieldDesc, true, forItems)),
 		cel.Variable("rules",
 			cel.ObjectType(string(rules.Descriptor().FullName()))),
 	)

diff --git a/internal/constraints/lookups_test.go b/internal/constraints/lookups_test.go
@@ -17,8 +17,6 @@ package constraints
 import (
 	"testing"
 
-	"github.com/bufbuild/protovalidate-go/internal/expression"
-	"github.com/google/cel-go/cel"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -54,37 +52,3 @@ func TestExpectedWrapperConstraints(t *testing.T) {
 		})
 	}
 }
-
-func TestProtoKindToCELType(t *testing.T) {
-	t.Parallel()
-
-	tests := map[protoreflect.Kind]*cel.Type{
-		protoreflect.FloatKind:    cel.DoubleType,
-		protoreflect.DoubleKind:   cel.DoubleType,
-		protoreflect.Int32Kind:    cel.IntType,
-		protoreflect.Int64Kind:    cel.IntType,
-		protoreflect.Uint32Kind:   cel.UintType,
-		protoreflect.Uint64Kind:   cel.UintType,
-		protoreflect.Sint32Kind:   cel.IntType,
-		protoreflect.Sint64Kind:   cel.IntType,
-		protoreflect.Fixed32Kind:  cel.UintType,
-		protoreflect.Fixed64Kind:  cel.UintType,
-		protoreflect.Sfixed32Kind: cel.IntType,
-		protoreflect.Sfixed64Kind: cel.IntType,
-		protoreflect.BoolKind:     cel.BoolType,
-		protoreflect.StringKind:   cel.StringType,
-		protoreflect.BytesKind:    cel.BytesType,
-		protoreflect.EnumKind:     cel.IntType,
-		protoreflect.MessageKind:  cel.DynType,
-		protoreflect.GroupKind:    cel.DynType,
-		protoreflect.Kind(0):      cel.DynType,
-	}
-
-	for k, ty := range tests {
-		kind, typ := k, ty
-		t.Run(kind.String(), func(t *testing.T) {
-			t.Parallel()
-			assert.Equal(t, typ, expression.ProtoKindToCELType(kind))
-		})
-	}
-}
diff --git a/internal/evaluator/builder.go b/internal/evaluator/builder.go
@@ -19,6 +19,7 @@ import (
 	"sync/atomic"
 
 	"buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate"
+	"github.com/bufbuild/protovalidate-go/celext"
 	"github.com/bufbuild/protovalidate-go/internal/constraints"
 	"github.com/bufbuild/protovalidate-go/internal/errors"
 	"github.com/bufbuild/protovalidate-go/internal/expression"
@@ -278,9 +279,9 @@ func (bldr *Builder) processFieldExpressions(
 		return nil
 	}
 
-	celTyp := expression.ProtoFieldToCELType(fieldDesc, false, false)
+	celTyp := celext.ProtoFieldToCELType(fieldDesc, false, false)
 	opts := append(
-		expression.RequiredCELEnvOptions(fieldDesc),
+		celext.RequiredCELEnvOptions(fieldDesc),
 		cel.Variable("this", celTyp),
 	)
 	compiledExpressions, err := expression.Compile(exprs, bldr.env, opts...)