move back

bufbuild · Dec 20, 2023 · 852ae23 · 852ae23
1 parent c37d354
commit 852ae23
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/internal/constraints/cache.go b/internal/constraints/cache.go
@@ -17,7 +17,6 @@ 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"
@@ -115,7 +114,7 @@ func (c *Cache) prepareEnvironment(
 ) (*cel.Env, error) {
 	env, err := env.Extend(
 		cel.Types(rules.Interface()),
-		cel.Variable("this", celext.ProtoFieldToCELType(fieldDesc, true, forItems)),
+		cel.Variable("this", expression.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,7 +17,7 @@ package constraints
 import (
 	"testing"
 
-	"github.com/bufbuild/protovalidate-go/celext"
+	"github.com/bufbuild/protovalidate-go/internal/expression"
 	"github.com/google/cel-go/cel"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
@@ -84,7 +84,7 @@ func TestProtoKindToCELType(t *testing.T) {
 		kind, typ := k, ty
 		t.Run(kind.String(), func(t *testing.T) {
 			t.Parallel()
-			assert.Equal(t, typ, celext.ProtoKindToCELType(kind))
+			assert.Equal(t, typ, expression.ProtoKindToCELType(kind))
 		})
 	}
 }
diff --git a/internal/evaluator/builder.go b/internal/evaluator/builder.go
@@ -19,7 +19,6 @@ 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"
@@ -279,9 +278,9 @@ func (bldr *Builder) processFieldExpressions(
 		return nil
 	}
 
-	celTyp := celext.ProtoFieldToCELType(fieldDesc, false, false)
+	celTyp := expression.ProtoFieldToCELType(fieldDesc, false, false)
 	opts := append(
-		celext.RequiredCELEnvOptions(fieldDesc),
+		expression.RequiredCELEnvOptions(fieldDesc),
 		cel.Variable("this", celTyp),
 	)
 	compiledExpressions, err := expression.Compile(exprs, bldr.env, opts...)

diff --git a/celext/lookups.go → internal/expression/lookups.go b/celext/lookups.go → internal/expression/lookups.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package celext
+package expression
 
 import (
 	"github.com/google/cel-go/cel"

diff --git a/celext/lookups_test.go → internal/expression/lookups_test.go b/celext/lookups_test.go → internal/expression/lookups_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package celext
+package expression
 
 import (
 	"testing"