From fc1b523bbeefbbb970dd9d98aec7f59914b4788b Mon Sep 17 00:00:00 2001 From: dplotnikov Date: Thu, 13 Aug 2026 17:47:36 -0700 Subject: [PATCH 1/2] Switch module and import paths to cel.dev/cel-go Following the repository relocation and adoption of the cel.dev domain, update the module path in go.mod files from github.com/google/cel-go to cel.dev/cel-go. Update all internal package imports and Bazel BUILD definitions accordingly. --- README.md | 12 +++---- cel/BUILD.bazel | 2 +- cel/async/BUILD.bazel | 2 +- cel/async/async.go | 10 +++--- cel/async/async_test.go | 10 +++--- cel/cel_example_test.go | 6 ++-- cel/cel_test.go | 26 +++++++------- cel/decls.go | 10 +++--- cel/decls_test.go | 18 +++++----- cel/env.go | 26 +++++++------- cel/env_test.go | 16 ++++----- cel/fieldpaths.go | 4 +-- cel/folding.go | 12 +++---- cel/folding_test.go | 12 +++---- cel/inlining.go | 12 +++---- cel/inlining_test.go | 4 +-- cel/io.go | 12 +++---- cel/io_test.go | 12 +++---- cel/library.go | 24 ++++++------- cel/macro.go | 8 ++--- cel/macro_test.go | 4 +-- cel/optimizer.go | 8 ++--- cel/optimizer_test.go | 8 ++--- cel/options.go | 22 ++++++------ cel/program.go | 14 ++++---- cel/program_async_test.go | 14 ++++---- cel/prompt.go | 8 ++--- cel/prompt_test.go | 4 +-- cel/validator.go | 8 ++--- cel/validator_test.go | 14 ++++---- checker/BUILD.bazel | 2 +- checker/checker.go | 14 ++++---- checker/checker_test.go | 22 ++++++------ checker/cost.go | 10 +++--- checker/cost_test.go | 16 ++++----- checker/decls/BUILD.bazel | 2 +- checker/env.go | 10 +++--- checker/env_test.go | 12 +++---- checker/errors.go | 6 ++-- checker/format.go | 4 +-- checker/format_test.go | 4 +-- checker/mapping.go | 2 +- checker/printer.go | 4 +-- checker/scopes.go | 2 +- checker/types.go | 2 +- codelab/README.md | 4 +-- codelab/codelab.go | 24 ++++++------- codelab/go.mod | 20 +++++------ codelab/go.sum | 36 +++++++------------ codelab/solution/codelab.go | 24 ++++++------- common/BUILD.bazel | 2 +- common/ast/BUILD.bazel | 2 +- common/ast/ast.go | 6 ++-- common/ast/ast_test.go | 10 +++--- common/ast/conversion.go | 4 +-- common/ast/conversion_test.go | 16 ++++----- common/ast/expr.go | 2 +- common/ast/expr_test.go | 6 ++-- common/ast/factory.go | 2 +- common/ast/navigable.go | 4 +-- common/ast/navigable_test.go | 20 +++++------ common/containers/BUILD.bazel | 2 +- common/containers/container.go | 2 +- common/containers/container_test.go | 2 +- common/debug/BUILD.bazel | 2 +- common/debug/debug.go | 6 ++-- common/decls/BUILD.bazel | 2 +- common/decls/decls.go | 12 +++---- common/decls/decls_test.go | 14 ++++---- common/env/BUILD.bazel | 2 +- common/env/env.go | 4 +-- common/env/env_test.go | 10 +++--- common/functions/BUILD.bazel | 2 +- common/functions/functions.go | 2 +- common/operators/BUILD.bazel | 2 +- common/overloads/BUILD.bazel | 2 +- common/runes/BUILD.bazel | 2 +- common/source.go | 2 +- common/stdlib/BUILD.bazel | 2 +- common/stdlib/standard.go | 16 ++++----- common/types/BUILD.bazel | 2 +- common/types/bool.go | 2 +- common/types/bytes.go | 2 +- common/types/compare.go | 2 +- common/types/double.go | 2 +- common/types/double_test.go | 4 +-- common/types/duration.go | 4 +-- common/types/duration_test.go | 4 +-- common/types/err.go | 2 +- common/types/format.go | 4 +-- common/types/int.go | 2 +- common/types/int_test.go | 4 +-- common/types/iterator.go | 4 +-- common/types/json_list_test.go | 2 +- common/types/list.go | 4 +-- common/types/list_test.go | 4 +-- common/types/map.go | 6 ++-- common/types/map_test.go | 8 ++--- common/types/native.go | 4 +-- common/types/native_test.go | 16 ++++----- common/types/null.go | 2 +- common/types/null_test.go | 2 +- common/types/object.go | 4 +-- common/types/object_test.go | 4 +-- common/types/optional.go | 2 +- common/types/optional_test.go | 2 +- common/types/pb/BUILD.bazel | 2 +- common/types/pb/equal_test.go | 2 +- common/types/pb/file_test.go | 6 ++-- common/types/pb/pb_test.go | 4 +-- common/types/pb/type_test.go | 6 ++-- common/types/provider.go | 6 ++-- common/types/provider_test.go | 6 ++-- common/types/ref/BUILD.bazel | 2 +- common/types/string.go | 4 +-- common/types/string_test.go | 4 +-- common/types/struct.go | 2 +- common/types/timestamp.go | 4 +-- common/types/timestamp_test.go | 4 +-- common/types/traits/BUILD.bazel | 2 +- common/types/traits/comparer.go | 2 +- common/types/traits/container.go | 2 +- common/types/traits/field_tester.go | 2 +- common/types/traits/indexer.go | 2 +- common/types/traits/iterator.go | 2 +- common/types/traits/lister.go | 2 +- common/types/traits/mapper.go | 2 +- common/types/traits/matcher.go | 2 +- common/types/traits/math.go | 2 +- common/types/traits/receiver.go | 2 +- common/types/traits/sizer.go | 2 +- common/types/type_test.go | 2 +- common/types/types.go | 6 ++-- common/types/types_test.go | 4 +-- common/types/uint.go | 2 +- common/types/uint_test.go | 4 +-- common/types/unknown.go | 2 +- common/types/unknown_test.go | 2 +- common/types/util.go | 2 +- conformance/conformance_test.go | 12 +++---- conformance/go.mod | 18 ++++++---- conformance/go.sum | 26 +++----------- conformance/policy/policy_conformance_test.go | 12 +++---- examples/README.md | 2 +- examples/example_cel_advanced_test.go | 2 +- examples/example_cel_collections_test.go | 2 +- examples/example_cel_compile_test.go | 4 +-- examples/example_cel_context_eval_test.go | 2 +- examples/example_cel_custom_functions_test.go | 6 ++-- examples/example_cel_custom_macros_test.go | 12 +++---- examples/example_cel_execution_cost_test.go | 6 ++-- .../example_cel_logic_and_conditions_test.go | 2 +- examples/example_cel_native_structs_test.go | 4 +-- examples/example_cel_operators_test.go | 2 +- examples/example_cel_protocol_buffers_test.go | 4 +-- .../example_cel_strings_and_numbers_test.go | 4 +-- examples/example_cel_time_test.go | 2 +- .../example_cel_transforming_data_test.go | 2 +- examples/example_cel_type_conversions_test.go | 2 +- ext/BUILD.bazel | 2 +- ext/bindings.go | 12 +++---- ext/bindings_test.go | 16 ++++----- ext/comprehensions.go | 14 ++++---- ext/comprehensions_test.go | 8 ++--- ext/costs.go | 12 +++---- ext/encoders.go | 10 +++--- ext/encoders_test.go | 4 +-- ext/extension_option_factory.go | 4 +-- ext/extension_option_factory_test.go | 4 +-- ext/formatting.go | 12 +++---- ext/formatting_test.go | 10 +++--- ext/formatting_v2.go | 10 +++--- ext/formatting_v2_test.go | 10 +++--- ext/guards.go | 6 ++-- ext/lists.go | 20 +++++------ ext/lists_test.go | 8 ++--- ext/math.go | 14 ++++---- ext/math_test.go | 6 ++-- ext/native.go | 4 +-- ext/native_test.go | 14 ++++---- ext/network.go | 12 +++---- ext/network_test.go | 6 ++-- ext/protos.go | 4 +-- ext/protos_test.go | 12 +++---- ext/regex.go | 12 +++---- ext/regex_test.go | 4 +-- ext/sets.go | 16 ++++----- ext/sets_test.go | 10 +++--- ext/strings.go | 14 ++++---- ext/strings_test.go | 8 ++--- go.mod | 2 +- interpreter/BUILD.bazel | 2 +- interpreter/activation.go | 2 +- interpreter/activation_test.go | 4 +-- interpreter/async.go | 6 ++-- interpreter/async_test.go | 18 +++++----- interpreter/attribute_patterns.go | 6 ++-- interpreter/attribute_patterns_test.go | 4 +-- interpreter/attributes.go | 8 ++--- interpreter/attributes_test.go | 18 +++++----- interpreter/decorators.go | 8 ++--- interpreter/dispatcher.go | 2 +- interpreter/evalstate.go | 2 +- interpreter/frame.go | 6 ++-- interpreter/frame_test.go | 4 +-- interpreter/functions/BUILD.bazel | 2 +- interpreter/functions/functions.go | 2 +- interpreter/interpretable.go | 12 +++---- interpreter/interpreter.go | 8 ++--- interpreter/interpreter_test.go | 28 +++++++-------- interpreter/optimizations.go | 4 +-- interpreter/planner.go | 10 +++--- interpreter/prune.go | 12 +++---- interpreter/prune_test.go | 20 +++++------ interpreter/runtimecost.go | 10 +++--- interpreter/runtimecost_test.go | 18 +++++----- parser/BUILD.bazel | 2 +- parser/errors.go | 2 +- parser/gen/BUILD.bazel | 2 +- parser/helper.go | 8 ++--- parser/helper_test.go | 4 +-- parser/input.go | 2 +- parser/macro.go | 10 +++--- parser/macro_test.go | 4 +-- parser/parser.go | 12 +++---- parser/parser_test.go | 10 +++--- parser/unparser.go | 8 ++--- parser/unparser_test.go | 6 ++-- policy/BUILD.bazel | 2 +- policy/compiler.go | 14 ++++---- policy/compiler_test.go | 10 +++--- policy/composer.go | 10 +++--- policy/composer_test.go | 8 ++--- policy/config.go | 6 ++-- policy/config_test.go | 6 ++-- policy/go.mod | 10 +++--- policy/helper_test.go | 10 +++--- policy/parser.go | 6 ++-- policy/parser_test.go | 6 ++-- policy/source.go | 2 +- policy/test/cel_test_runner.go | 8 ++--- policy/test/k8s_cel_test_runner.go | 4 +-- repl/BUILD.bazel | 2 +- repl/commands.go | 4 +-- repl/evaluator.go | 16 ++++----- repl/evaluator_test.go | 6 ++-- repl/go.mod | 8 ++--- repl/go.sum | 2 ++ repl/main/BUILD.bazel | 4 +-- repl/main/main.go | 2 +- repl/parser/BUILD.bazel | 2 +- repl/typefmt.go | 8 ++--- repl/typefmt_test.go | 2 +- test/BUILD.bazel | 2 +- test/async.go | 4 +-- test/bench/BUILD.bazel | 2 +- test/bench/bench.go | 8 ++--- test/bench/bench_test.go | 2 +- test/expr.go | 2 +- test/proto2pb/BUILD.bazel | 4 +-- test/proto2pb/test_all_types.proto | 2 +- test/proto2pb/test_extensions.proto | 2 +- test/proto3pb/BUILD.bazel | 4 +-- test/proto3pb/test_all_types.proto | 2 +- test/proto3pb/test_import.proto | 2 +- tools/celtest/BUILD.bazel | 2 +- tools/celtest/test_coverage_reporter.go | 6 ++-- tools/celtest/test_coverage_reporter_test.go | 6 ++-- tools/celtest/test_runner.go | 20 +++++------ tools/celtest/test_runner_test.go | 14 ++++---- tools/compiler/BUILD.bazel | 2 +- tools/compiler/compiler.go | 12 +++---- tools/compiler/compiler_test.go | 8 ++--- tools/go.mod | 12 +++---- tools/go.sum | 19 ---------- 275 files changed, 944 insertions(+), 985 deletions(-) diff --git a/README.md b/README.md index 6b71ff776..d07aa3ca4 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # Common Expression Language -[![Go Report Card](https://goreportcard.com/badge/github.com/google/cel-go)](https://goreportcard.com/report/github.com/google/cel-go) -[![GoDoc](https://godoc.org/github.com/google/cel-go?status.svg)][6] +[![Go Report Card](https://goreportcard.com/badge/cel.dev/cel-go)](https://goreportcard.com/report/cel.dev/cel-go) +[![GoDoc](https://godoc.org/cel.dev/cel-go?status.svg)][6] > [!WARNING] > **On June 16, 2026, this repository will move to > github.com/cel-expr/cel-go!** > > Please update your links and dependencies. See the [pinned -> issue](https://github.com/google/cel-go/issues/1329) for details. +> issue](https://cel.dev/cel-go/issues/1329) for details. The Common Expression Language (CEL) is a non-Turing complete language designed for simplicity, speed, safety, and portability. CEL's C-like [syntax][1] looks @@ -64,7 +64,7 @@ Let's expose `name` and `group` variables to CEL using the `cel.Variable` environment option: ```go -import "github.com/google/cel-go/cel" +import "cel.dev/cel-go/cel" env, err := cel.NewEnv( cel.Variable("name", cel.StringType), @@ -288,6 +288,6 @@ Released under the [Apache License](LICENSE). [1]: https://github.com/google/cel-spec [2]: https://groups.google.com/forum/#!forum/cel-go-discuss [3]: https://github.com/google/cel-cpp -[4]: https://github.com/google/cel-go/issues +[4]: https://cel.dev/cel-go/issues [5]: https://bazel.build -[6]: https://godoc.org/github.com/google/cel-go +[6]: https://godoc.org/cel.dev/cel-go diff --git a/cel/BUILD.bazel b/cel/BUILD.bazel index 62a56036a..c42612e19 100644 --- a/cel/BUILD.bazel +++ b/cel/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "validator.go", ], embedsrcs = ["templates/authoring.tmpl"], - importpath = "github.com/google/cel-go/cel", + importpath = "cel.dev/cel-go/cel", visibility = ["//visibility:public"], deps = [ "//cel/async:go_default_library", diff --git a/cel/async/BUILD.bazel b/cel/async/BUILD.bazel index 85b28bcdb..e77dfaec5 100644 --- a/cel/async/BUILD.bazel +++ b/cel/async/BUILD.bazel @@ -9,7 +9,7 @@ go_library( srcs = [ "async.go", ], - importpath = "github.com/google/cel-go/cel/async", + importpath = "cel.dev/cel-go/cel/async", visibility = ["//visibility:public"], deps = [ "//common/decls:go_default_library", diff --git a/cel/async/async.go b/cel/async/async.go index a011114bd..b8621a784 100644 --- a/cel/async/async.go +++ b/cel/async/async.go @@ -21,11 +21,11 @@ import ( "errors" "time" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" ) // Call describes a pending or completed asynchronous function call. diff --git a/cel/async/async_test.go b/cel/async/async_test.go index 71fe50de6..9c5ba9962 100644 --- a/cel/async/async_test.go +++ b/cel/async/async_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/google/cel-go/cel/async" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel/async" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) type retryableTestErr struct{} diff --git a/cel/cel_example_test.go b/cel/cel_example_test.go index f4c11b598..5c6b7603a 100644 --- a/cel/cel_example_test.go +++ b/cel/cel_example_test.go @@ -19,9 +19,9 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) func Example() { diff --git a/cel/cel_test.go b/cel/cel_test.go index 7cb32afb0..7a04e65f3 100644 --- a/cel/cel_test.go +++ b/cel/cel_test.go @@ -32,17 +32,17 @@ import ( "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/checker" - celast "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/parser" - "github.com/google/cel-go/test" + "cel.dev/cel-go/checker" + celast "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/parser" + "cel.dev/cel-go/test" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" descpb "google.golang.org/protobuf/types/descriptorpb" @@ -51,8 +51,8 @@ import ( timestamppb "google.golang.org/protobuf/types/known/timestamppb" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - proto2pb "github.com/google/cel-go/test/proto2pb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto2pb "cel.dev/cel-go/test/proto2pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func Test_ExampleWithBuiltins(t *testing.T) { diff --git a/cel/decls.go b/cel/decls.go index 53941146d..1cc3f7b50 100644 --- a/cel/decls.go +++ b/cel/decls.go @@ -17,11 +17,11 @@ package cel import ( "fmt" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" celpb "cel.dev/expr" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" diff --git a/cel/decls_test.go b/cel/decls_test.go index 9024d74db..bade15c7b 100644 --- a/cel/decls_test.go +++ b/cel/decls_test.go @@ -21,15 +21,15 @@ import ( "strings" "testing" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/cel/env.go b/cel/env.go index 794c62f78..772b0da48 100644 --- a/cel/env.go +++ b/cel/env.go @@ -23,19 +23,19 @@ import ( "strings" "sync" - "github.com/google/cel-go/checker" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common" - celast "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/checker" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common" + celast "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/cel/env_test.go b/cel/env_test.go index 004ab9f0a..95124c15b 100644 --- a/cel/env_test.go +++ b/cel/env_test.go @@ -23,17 +23,17 @@ import ( "sync" "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" "google.golang.org/protobuf/proto" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/cel/fieldpaths.go b/cel/fieldpaths.go index 570fce3a4..b63c2ba2a 100644 --- a/cel/fieldpaths.go +++ b/cel/fieldpaths.go @@ -4,8 +4,8 @@ import ( "slices" "strings" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/types" ) // fieldPath represents a selection path to a field from a variable in a CEL environment. diff --git a/cel/folding.go b/cel/folding.go index e3459034c..e45dc6093 100644 --- a/cel/folding.go +++ b/cel/folding.go @@ -19,12 +19,12 @@ import ( "errors" "fmt" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) // ConstantFoldingOption defines a functional option for configuring constant folding. diff --git a/cel/folding_test.go b/cel/folding_test.go index 8a292cb73..b894681e2 100644 --- a/cel/folding_test.go +++ b/cel/folding_test.go @@ -25,13 +25,13 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/cel/inlining.go b/cel/inlining.go index d9a5e89a5..3ade2204d 100644 --- a/cel/inlining.go +++ b/cel/inlining.go @@ -15,12 +15,12 @@ package cel import ( - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/traits" ) // InlineVariable holds a variable name to be matched and an AST representing diff --git a/cel/inlining_test.go b/cel/inlining_test.go index d9ad88b7a..ed1b9270d 100644 --- a/cel/inlining_test.go +++ b/cel/inlining_test.go @@ -17,9 +17,9 @@ package cel_test import ( "testing" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestInliningOptimizerNoopShadow(t *testing.T) { diff --git a/cel/io.go b/cel/io.go index c991c95c3..31aa304fe 100644 --- a/cel/io.go +++ b/cel/io.go @@ -21,12 +21,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/parser" celpb "cel.dev/expr" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" diff --git a/cel/io_test.go b/cel/io_test.go index f0ef20a81..41da494aa 100644 --- a/cel/io_test.go +++ b/cel/io_test.go @@ -22,13 +22,13 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/checker/decls" - celast "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/checker/decls" + celast "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/cel/library.go b/cel/library.go index 43912eaae..eb0c9562b 100644 --- a/cel/library.go +++ b/cel/library.go @@ -18,18 +18,18 @@ import ( "fmt" "math" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/parser" ) const ( diff --git a/cel/macro.go b/cel/macro.go index 3d3c5be1b..aed4a8da1 100644 --- a/cel/macro.go +++ b/cel/macro.go @@ -17,10 +17,10 @@ package cel import ( "fmt" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/cel/macro_test.go b/cel/macro_test.go index f6400b020..85c7ab694 100644 --- a/cel/macro_test.go +++ b/cel/macro_test.go @@ -17,8 +17,8 @@ package cel import ( "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" ) func TestGlobalVarArgMacro(t *testing.T) { diff --git a/cel/optimizer.go b/cel/optimizer.go index 6e260a93c..5c2846558 100644 --- a/cel/optimizer.go +++ b/cel/optimizer.go @@ -18,10 +18,10 @@ import ( "fmt" "sort" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // StaticOptimizer contains a sequence of ASTOptimizer instances which will be applied in order. diff --git a/cel/optimizer_test.go b/cel/optimizer_test.go index 04212d537..b1776a7ae 100644 --- a/cel/optimizer_test.go +++ b/cel/optimizer_test.go @@ -19,14 +19,14 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/ext" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/cel/options.go b/cel/options.go index 709ce007a..21cdb3615 100644 --- a/cel/options.go +++ b/cel/options.go @@ -24,17 +24,17 @@ import ( "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/dynamicpb" - "github.com/google/cel-go/cel/async" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/cel/async" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" descpb "google.golang.org/protobuf/types/descriptorpb" diff --git a/cel/program.go b/cel/program.go index 07849974a..b6df752ee 100644 --- a/cel/program.go +++ b/cel/program.go @@ -20,13 +20,13 @@ import ( "fmt" "time" - "github.com/google/cel-go/cel/async" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel/async" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" ) // Program is an evaluable view of an Ast. diff --git a/cel/program_async_test.go b/cel/program_async_test.go index e3d1746dd..3a7a3ec4a 100644 --- a/cel/program_async_test.go +++ b/cel/program_async_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/cel/async" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/ext" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/test" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/cel/async" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/ext" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/test" ) func TestConcurrentEval(t *testing.T) { diff --git a/cel/prompt.go b/cel/prompt.go index f59934827..e5e2acde7 100644 --- a/cel/prompt.go +++ b/cel/prompt.go @@ -20,10 +20,10 @@ import ( "strings" "text/template" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" ) //go:embed templates/authoring.tmpl diff --git a/cel/prompt_test.go b/cel/prompt_test.go index 068211cb7..b206e056d 100644 --- a/cel/prompt_test.go +++ b/cel/prompt_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/env" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/env" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/proto" diff --git a/cel/validator.go b/cel/validator.go index 229defe79..17a999f92 100644 --- a/cel/validator.go +++ b/cel/validator.go @@ -20,10 +20,10 @@ import ( "reflect" "regexp" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" ) const ( diff --git a/cel/validator_test.go b/cel/validator_test.go index 99795da0d..fb31c94c0 100644 --- a/cel/validator_test.go +++ b/cel/validator_test.go @@ -18,13 +18,13 @@ import ( "reflect" "testing" - celenv "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/test" + celenv "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/test" ) func TestValidateDurationLiterals(t *testing.T) { diff --git a/checker/BUILD.bazel b/checker/BUILD.bazel index 678b412a9..18698e679 100644 --- a/checker/BUILD.bazel +++ b/checker/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "scopes.go", "types.go", ], - importpath = "github.com/google/cel-go/checker", + importpath = "cel.dev/cel-go/checker", visibility = ["//visibility:public"], deps = [ "//checker/decls:go_default_library", diff --git a/checker/checker.go b/checker/checker.go index 42d27a428..1cffd3e5f 100644 --- a/checker/checker.go +++ b/checker/checker.go @@ -22,13 +22,13 @@ import ( "slices" "strings" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) type checker struct { diff --git a/checker/checker_test.go b/checker/checker_test.go index b61a226cb..47da296d3 100644 --- a/checker/checker_test.go +++ b/checker/checker_test.go @@ -20,18 +20,18 @@ import ( "testing" "time" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/debug" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" - "github.com/google/cel-go/test" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/debug" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" + "cel.dev/cel-go/test" - proto2pb "github.com/google/cel-go/test/proto2pb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto2pb "cel.dev/cel-go/test/proto2pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func testCases(t testing.TB) []testInfo { diff --git a/checker/cost.go b/checker/cost.go index 3d7dd7ec4..3233fa11b 100644 --- a/checker/cost.go +++ b/checker/cost.go @@ -17,11 +17,11 @@ package checker import ( "math" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" ) // WARNING: Any changes to cost calculations in this file require a corresponding change in interpreter/runtimecost.go diff --git a/checker/cost_test.go b/checker/cost_test.go index ab83559a1..3a7ef835b 100644 --- a/checker/cost_test.go +++ b/checker/cost_test.go @@ -19,15 +19,15 @@ import ( "strings" "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestCost(t *testing.T) { diff --git a/checker/decls/BUILD.bazel b/checker/decls/BUILD.bazel index a6b0be292..fe5380166 100644 --- a/checker/decls/BUILD.bazel +++ b/checker/decls/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "decls.go", ], - importpath = "github.com/google/cel-go/checker/decls", + importpath = "cel.dev/cel-go/checker/decls", deps = [ "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//types/known/emptypb:go_default_library", diff --git a/checker/env.go b/checker/env.go index 9c3de9517..1dd2f0ff7 100644 --- a/checker/env.go +++ b/checker/env.go @@ -18,11 +18,11 @@ import ( "fmt" "strings" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" ) type aggregateLiteralElementType int diff --git a/checker/env_test.go b/checker/env_test.go index c3a6aa353..f8a10f29b 100644 --- a/checker/env_test.go +++ b/checker/env_test.go @@ -18,12 +18,12 @@ import ( "strings" "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" ) func TestOverlappingMacro(t *testing.T) { diff --git a/checker/errors.go b/checker/errors.go index 3535440ba..dce384a80 100644 --- a/checker/errors.go +++ b/checker/errors.go @@ -15,9 +15,9 @@ package checker import ( - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" ) // typeErrors is a specialization of Errors. diff --git a/checker/format.go b/checker/format.go index 95842905e..17b1a4d24 100644 --- a/checker/format.go +++ b/checker/format.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common/types" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common/types" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/checker/format_test.go b/checker/format_test.go index c68b01c2f..68afc51fc 100644 --- a/checker/format_test.go +++ b/checker/format_test.go @@ -17,8 +17,8 @@ package checker import ( "testing" - "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common/types" ) func TestFormatType(t *testing.T) { diff --git a/checker/mapping.go b/checker/mapping.go index 8163a908a..7018d8199 100644 --- a/checker/mapping.go +++ b/checker/mapping.go @@ -15,7 +15,7 @@ package checker import ( - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/types" ) type mapping struct { diff --git a/checker/printer.go b/checker/printer.go index 7a3984f02..c90711e4c 100644 --- a/checker/printer.go +++ b/checker/printer.go @@ -17,8 +17,8 @@ package checker import ( "sort" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/debug" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/debug" ) type semanticAdorner struct { diff --git a/checker/scopes.go b/checker/scopes.go index 2fcfdf29e..88b664af6 100644 --- a/checker/scopes.go +++ b/checker/scopes.go @@ -17,7 +17,7 @@ package checker import ( "strings" - "github.com/google/cel-go/common/decls" + "cel.dev/cel-go/common/decls" ) // Scopes represents nested Decl sets where the Scopes value contains a Groups containing all diff --git a/checker/types.go b/checker/types.go index 4c65b2737..b716f4e9b 100644 --- a/checker/types.go +++ b/checker/types.go @@ -15,7 +15,7 @@ package checker import ( - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/types" ) // isDyn returns true if the input t is either type DYN or a well-known ANY message. diff --git a/codelab/README.md b/codelab/README.md index bf985c71b..27772532e 100644 --- a/codelab/README.md +++ b/codelab/README.md @@ -3,6 +3,6 @@ Find the codelab instructions [here](https://codelabs.developers.google.com/codelabs/cel-go/#0). It requires some knowledge of GoLang and Protobuf. -If you get stuck, check out the [solutions](https://github.com/google/cel-go/blob/master/codelab/solution/codelab.go). +If you get stuck, check out the [solutions](https://cel.dev/cel-go/blob/master/codelab/solution/codelab.go). -If you find a bug or want to make an improvement, PRs and issues are welcome. Please follow the [contributing guidelines](https://github.com/google/cel-go/blob/master/CONTRIBUTING.md). +If you find a bug or want to make an improvement, PRs and issues are welcome. Please follow the [contributing guidelines](https://cel.dev/cel-go/blob/master/CONTRIBUTING.md). diff --git a/codelab/codelab.go b/codelab/codelab.go index f533e7003..77e7eeb3d 100644 --- a/codelab/codelab.go +++ b/codelab/codelab.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" "github.com/golang/glog" "google.golang.org/protobuf/encoding/protojson" @@ -54,7 +54,7 @@ func main() { // // Compile, eval, profit! func exercise1() { - fmt.Println("=== Exercise 1: Hello World ===\n") + fmt.Println("=== Exercise 1: Hello World ===") fmt.Println() } @@ -64,7 +64,7 @@ func exercise1() { // Given a `request` of type `google.rpc.context.AttributeContext.Request` // determine whether a specific auth claim is set. func exercise2() { - fmt.Println("=== Exercise 2: Variables ===\n") + fmt.Println("=== Exercise 2: Variables ===") fmt.Println() } @@ -79,7 +79,7 @@ func exercise2() { // sets the appropriate principal and occurs at 12:00 hours. Then evaluate the // request a second time at midnight. Observe the difference in output. func exercise3() { - fmt.Println("=== Exercise 3: Logical AND/OR ===\n") + fmt.Println("=== Exercise 3: Logical AND/OR ===") fmt.Println() } @@ -89,7 +89,7 @@ func exercise3() { // Declare a `contains` member function on map types that returns a boolean // indicating whether the map contains the key-value pair. func exercise4() { - fmt.Println("=== Exercise 4: Customization ===\n") + fmt.Println("=== Exercise 4: Customization ===") fmt.Println() } @@ -98,7 +98,7 @@ func exercise4() { // // Given the input `now`, construct a JWT with an expiry of 5 minutes. func exercise5() { - fmt.Println("=== Exercise 5: Building JSON ===\n") + fmt.Println("=== Exercise 5: Building JSON ===") fmt.Println() } @@ -109,7 +109,7 @@ func exercise5() { // `google.rpc.context.AttributeContext.Request` with the `time` and `auth` // fields populated according to the go/api-attributes specification. func exercise6() { - fmt.Println("=== Exercise 6: Building Protos ===\n") + fmt.Println("=== Exercise 6: Building Protos ===") fmt.Println() } @@ -120,7 +120,7 @@ func exercise6() { // with the `group` prefix, and ensure that all group-like keys have list // values containing only strings that end with '@acme.co`. func exercise7() { - fmt.Println("=== Exercise 7: Macros ===\n") + fmt.Println("=== Exercise 7: Macros ===") fmt.Println() } @@ -134,7 +134,7 @@ func exercise7() { // Also, turn on the homogeneous aggregate literals flag to disable // heterogeneous list and map literals. func exercise8() { - fmt.Println("=== Exercise 8: Tuning ===\n") + fmt.Println("=== Exercise 8: Tuning ===") fmt.Println() } diff --git a/codelab/go.mod b/codelab/go.mod index 58d84bb8b..40128a408 100644 --- a/codelab/go.mod +++ b/codelab/go.mod @@ -1,22 +1,20 @@ -module github.com/google/cel-go/codelab +module cel.dev/cel-go/codelab -go 1.22.0 - -toolchain go1.22.5 +go 1.23.0 require ( + cel.dev/cel-go v0.21.0 github.com/golang/glog v1.2.4 - github.com/google/cel-go v0.21.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 - google.golang.org/protobuf v1.34.2 + google.golang.org/protobuf v1.36.10 ) require ( - cel.dev/expr v0.22.1 // indirect - github.com/antlr4-go/antlr/v4 v4.13.0 // indirect - github.com/stoewer/go-strcase v1.2.0 // indirect - golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect + cel.dev/expr v0.25.1 // indirect + github.com/antlr4-go/antlr/v4 v4.13.1 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect ) -replace github.com/google/cel-go => ../. +replace cel.dev/cel-go => ../. diff --git a/codelab/go.sum b/codelab/go.sum index 8dbce6c33..596a97228 100644 --- a/codelab/go.sum +++ b/codelab/go.sum @@ -1,32 +1,22 @@ -cel.dev/expr v0.22.1 h1:xoFEsNh972Yzey8N9TCPx2nDvMN7TMhQEzxLuj/iRrI= -cel.dev/expr v0.22.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= -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/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= +cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= +github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= +github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc= github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/codelab/solution/codelab.go b/codelab/solution/codelab.go index b1bfb95d9..f7ef829d2 100644 --- a/codelab/solution/codelab.go +++ b/codelab/solution/codelab.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" "github.com/golang/glog" "google.golang.org/protobuf/encoding/protojson" @@ -54,7 +54,7 @@ func main() { // // Compile, eval, profit! func exercise1() { - fmt.Println("=== Exercise 1: Hello World ===\n") + fmt.Println("=== Exercise 1: Hello World ===") // Create the standard environment. env, err := cel.NewEnv() if err != nil { @@ -93,7 +93,7 @@ func exercise1() { // Given a `request` of type `google.rpc.context.AttributeContext.Request` // determine whether a specific auth claim is set. func exercise2() { - fmt.Println("=== Exercise 2: Variables ===\n") + fmt.Println("=== Exercise 2: Variables ===") // Construct a standard environment that accepts 'request' as input and uses // the google.rpc.context.AttributeContext.Request type. env, err := cel.NewEnv( @@ -125,7 +125,7 @@ func exercise2() { // sets the appropriate principal and occurs at 12:00 hours. Then evaluate the // request a second time at midnight. Observe the difference in output. func exercise3() { - fmt.Println("=== Exercise 3: Logical AND/OR ===\n") + fmt.Println("=== Exercise 3: Logical AND/OR ===") env, _ := cel.NewEnv( cel.Types(&rpcpb.AttributeContext_Request{}), cel.Variable("request", @@ -154,7 +154,7 @@ func exercise3() { // Declare a `contains` member function on map types that returns a boolean // indicating whether the map contains the key-value pair. func exercise4() { - fmt.Println("=== Exercise 4: Customization ===\n") + fmt.Println("=== Exercise 4: Customization ===") // Determine whether an optional claim is set to the proper value. The custom // map.contains(key, value) function is used as an alternative to: // key in map && map[key] == value @@ -200,7 +200,7 @@ func exercise4() { // // Given the input `now`, construct a JWT with an expiry of 5 minutes. func exercise5() { - fmt.Println("=== Exercise 5: Building JSON ===\n") + fmt.Println("=== Exercise 5: Building JSON ===") // Note the quoted keys in the CEL map literal. For proto messages the // field names are unquoted as they represent well-defined identifiers. env, _ := cel.NewEnv( @@ -238,7 +238,7 @@ func exercise5() { // `google.rpc.context.AttributeContext.Request` with the `time` and `auth` // fields populated according to the go/api-attributes specification. func exercise6() { - fmt.Println("=== Exercise 6: Building Protos ===\n") + fmt.Println("=== Exercise 6: Building Protos ===") // Construct an environment and indicate that the container for all references // within the expression is `google.rpc.context.AttributeContext`. @@ -305,7 +305,7 @@ func exercise6() { // with the `group` prefix, and ensure that all group-like keys have list // values containing only strings that end with '@acme.co`. func exercise7() { - fmt.Println("=== Exercise 7: Macros ===\n") + fmt.Println("=== Exercise 7: Macros ===") env, _ := cel.NewEnv(cel.Variable("jwt", cel.DynType)) ast := compile(env, `jwt.extra_claims.exists(c, c.startsWith('group')) @@ -341,7 +341,7 @@ func exercise7() { // Turn on the optimization, exhaustive eval, and state tracking // `cel.ProgramOption` flags to see the impact on evaluation behavior. func exercise8() { - fmt.Println("=== Exercise 8: Tuning ===\n") + fmt.Println("=== Exercise 8: Tuning ===") // Declare the `x` and 'y' variables as input into the expression. env, _ := cel.NewEnv( cel.Variable("x", cel.IntType), diff --git a/common/BUILD.bazel b/common/BUILD.bazel index 1b1b7914d..408888472 100644 --- a/common/BUILD.bazel +++ b/common/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "location.go", "source.go", ], - importpath = "github.com/google/cel-go/common", + importpath = "cel.dev/cel-go/common", deps = [ "//common/runes:go_default_library", "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", diff --git a/common/ast/BUILD.bazel b/common/ast/BUILD.bazel index 9824f57a9..d62a4cb6e 100644 --- a/common/ast/BUILD.bazel +++ b/common/ast/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "factory.go", "navigable.go", ], - importpath = "github.com/google/cel-go/common/ast", + importpath = "cel.dev/cel-go/common/ast", deps = [ "//common:go_default_library", "//common/types:go_default_library", diff --git a/common/ast/ast.go b/common/ast/ast.go index c8f8f8a02..d65d10b59 100644 --- a/common/ast/ast.go +++ b/common/ast/ast.go @@ -18,9 +18,9 @@ package ast import ( "slices" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // AST contains a protobuf expression and source info along with CEL-native type and reference information. diff --git a/common/ast/ast_test.go b/common/ast/ast_test.go index ee63171a6..20e9181e1 100644 --- a/common/ast/ast_test.go +++ b/common/ast/ast_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" ) diff --git a/common/ast/conversion.go b/common/ast/conversion.go index 380f8c118..5d032cc1d 100644 --- a/common/ast/conversion.go +++ b/common/ast/conversion.go @@ -19,8 +19,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" celpb "cel.dev/expr" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" diff --git a/common/ast/conversion_test.go b/common/ast/conversion_test.go index ecd50830b..a7e799a4f 100644 --- a/common/ast/conversion_test.go +++ b/common/ast/conversion_test.go @@ -23,14 +23,14 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/parser" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/common/ast/expr.go b/common/ast/expr.go index 9f55cb3b9..459311f0d 100644 --- a/common/ast/expr.go +++ b/common/ast/expr.go @@ -15,7 +15,7 @@ package ast import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // ExprKind represents the expression node kind. diff --git a/common/ast/expr_test.go b/common/ast/expr_test.go index d32bf3fee..339d5c5cb 100644 --- a/common/ast/expr_test.go +++ b/common/ast/expr_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" ) func TestSetKindCase(t *testing.T) { diff --git a/common/ast/factory.go b/common/ast/factory.go index d4dcde4d9..b83e5555a 100644 --- a/common/ast/factory.go +++ b/common/ast/factory.go @@ -14,7 +14,7 @@ package ast -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // ExprFactory interfaces defines a set of methods necessary for building native expression values. type ExprFactory interface { diff --git a/common/ast/navigable.go b/common/ast/navigable.go index 364edfa3a..3a71f865f 100644 --- a/common/ast/navigable.go +++ b/common/ast/navigable.go @@ -15,8 +15,8 @@ package ast import ( - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // NavigableExpr represents the base navigable expression value with methods to inspect the diff --git a/common/ast/navigable_test.go b/common/ast/navigable_test.go index a9e55eaea..1784e5f71 100644 --- a/common/ast/navigable_test.go +++ b/common/ast/navigable_test.go @@ -18,17 +18,17 @@ import ( "reflect" "testing" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestNavigateAST(t *testing.T) { diff --git a/common/containers/BUILD.bazel b/common/containers/BUILD.bazel index 81197f064..7def2f256 100644 --- a/common/containers/BUILD.bazel +++ b/common/containers/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "container.go", ], - importpath = "github.com/google/cel-go/common/containers", + importpath = "cel.dev/cel-go/common/containers", deps = [ "//common/ast:go_default_library", ], diff --git a/common/containers/container.go b/common/containers/container.go index fcfcdfc3f..2330e0764 100644 --- a/common/containers/container.go +++ b/common/containers/container.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/common/ast" ) var ( diff --git a/common/containers/container_test.go b/common/containers/container_test.go index 2ccdfd6ee..efab6391f 100644 --- a/common/containers/container_test.go +++ b/common/containers/container_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/common/ast" ) func TestContainers_ResolveCandidateNames(t *testing.T) { diff --git a/common/debug/BUILD.bazel b/common/debug/BUILD.bazel index 724ed3404..07fed4271 100644 --- a/common/debug/BUILD.bazel +++ b/common/debug/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "debug.go", ], - importpath = "github.com/google/cel-go/common/debug", + importpath = "cel.dev/cel-go/common/debug", deps = [ "//common:go_default_library", "//common/ast:go_default_library", diff --git a/common/debug/debug.go b/common/debug/debug.go index fbc847f0c..67593c996 100644 --- a/common/debug/debug.go +++ b/common/debug/debug.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // Adorner returns debug metadata that will be tacked on to the string diff --git a/common/decls/BUILD.bazel b/common/decls/BUILD.bazel index bd3f9ae70..85c7d5c41 100644 --- a/common/decls/BUILD.bazel +++ b/common/decls/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "decls.go", ], - importpath = "github.com/google/cel-go/common/decls", + importpath = "cel.dev/cel-go/common/decls", deps = [ "//checker/decls:go_default_library", "//common:go_default_library", diff --git a/common/decls/decls.go b/common/decls/decls.go index 5c50b8e99..d63a202d6 100644 --- a/common/decls/decls.go +++ b/common/decls/decls.go @@ -20,12 +20,12 @@ import ( "fmt" "strings" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/common/decls/decls_test.go b/common/decls/decls_test.go index ca26eb690..50ce48e41 100644 --- a/common/decls/decls_test.go +++ b/common/decls/decls_test.go @@ -23,13 +23,13 @@ import ( "google.golang.org/protobuf/proto" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/common/env/BUILD.bazel b/common/env/BUILD.bazel index 261da924d..1cd6f9ee7 100644 --- a/common/env/BUILD.bazel +++ b/common/env/BUILD.bazel @@ -25,7 +25,7 @@ go_library( "env.go", "io.go", ], - importpath = "github.com/google/cel-go/common/env", + importpath = "cel.dev/cel-go/common/env", deps = [ "//common:go_default_library", "//common/decls:go_default_library", diff --git a/common/env/env.go b/common/env/env.go index 936036ed2..19e17c5da 100644 --- a/common/env/env.go +++ b/common/env/env.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/types" ) // NewConfig creates an instance of a YAML serializable CEL environment configuration. diff --git a/common/env/env_test.go b/common/env/env_test.go index 866807ef1..b2bf70412 100644 --- a/common/env/env_test.go +++ b/common/env/env_test.go @@ -25,11 +25,11 @@ import ( "go.yaml.in/yaml/v3" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" ) func TestConfig(t *testing.T) { diff --git a/common/functions/BUILD.bazel b/common/functions/BUILD.bazel index 3cc27d60c..4511d06f7 100644 --- a/common/functions/BUILD.bazel +++ b/common/functions/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "functions.go", ], - importpath = "github.com/google/cel-go/common/functions", + importpath = "cel.dev/cel-go/common/functions", deps = [ "//common/types/ref:go_default_library", ], diff --git a/common/functions/functions.go b/common/functions/functions.go index 0c00781d9..c5e68571e 100644 --- a/common/functions/functions.go +++ b/common/functions/functions.go @@ -18,7 +18,7 @@ package functions import ( "context" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Overload defines a named overload of a function, indicating an operand trait diff --git a/common/operators/BUILD.bazel b/common/operators/BUILD.bazel index b5b67f062..21776cecc 100644 --- a/common/operators/BUILD.bazel +++ b/common/operators/BUILD.bazel @@ -10,5 +10,5 @@ go_library( srcs = [ "operators.go", ], - importpath = "github.com/google/cel-go/common/operators", + importpath = "cel.dev/cel-go/common/operators", ) diff --git a/common/overloads/BUILD.bazel b/common/overloads/BUILD.bazel index e46e2f483..1f1eaa094 100644 --- a/common/overloads/BUILD.bazel +++ b/common/overloads/BUILD.bazel @@ -10,5 +10,5 @@ go_library( srcs = [ "overloads.go", ], - importpath = "github.com/google/cel-go/common/overloads", + importpath = "cel.dev/cel-go/common/overloads", ) diff --git a/common/runes/BUILD.bazel b/common/runes/BUILD.bazel index bb30242cf..0674eaed1 100644 --- a/common/runes/BUILD.bazel +++ b/common/runes/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "buffer.go", ], - importpath = "github.com/google/cel-go/common/runes", + importpath = "cel.dev/cel-go/common/runes", ) go_test( diff --git a/common/source.go b/common/source.go index 9187e9b5c..73237edf9 100644 --- a/common/source.go +++ b/common/source.go @@ -15,7 +15,7 @@ package common import ( - "github.com/google/cel-go/common/runes" + "cel.dev/cel-go/common/runes" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/common/stdlib/BUILD.bazel b/common/stdlib/BUILD.bazel index 124dbea81..dd34ac1e5 100644 --- a/common/stdlib/BUILD.bazel +++ b/common/stdlib/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "standard.go", ], - importpath = "github.com/google/cel-go/common/stdlib", + importpath = "cel.dev/cel-go/common/stdlib", deps = [ "//common:go_default_library", "//common/decls:go_default_library", diff --git a/common/stdlib/standard.go b/common/stdlib/standard.go index 3a151462e..1c2a54585 100644 --- a/common/stdlib/standard.go +++ b/common/stdlib/standard.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) var ( diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel index 4ecc40031..5de867d8d 100644 --- a/common/types/BUILD.bazel +++ b/common/types/BUILD.bazel @@ -36,7 +36,7 @@ go_library( "unknown.go", "util.go", ], - importpath = "github.com/google/cel-go/common/types", + importpath = "cel.dev/cel-go/common/types", deps = [ "//checker/decls:go_default_library", "//common/overloads:go_default_library", diff --git a/common/types/bool.go b/common/types/bool.go index 5f1e4573e..d16964cdb 100644 --- a/common/types/bool.go +++ b/common/types/bool.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/bytes.go b/common/types/bytes.go index 2eefb5d7f..206dd3bc5 100644 --- a/common/types/bytes.go +++ b/common/types/bytes.go @@ -22,7 +22,7 @@ import ( "strings" "unicode/utf8" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/compare.go b/common/types/compare.go index e19682618..caad97b94 100644 --- a/common/types/compare.go +++ b/common/types/compare.go @@ -17,7 +17,7 @@ package types import ( "math" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) func compareDoubleInt(d Double, i Int) Int { diff --git a/common/types/double.go b/common/types/double.go index 02abfee2d..729fc1ec4 100644 --- a/common/types/double.go +++ b/common/types/double.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/double_test.go b/common/types/double_test.go index 47e875f29..96f871655 100644 --- a/common/types/double_test.go +++ b/common/types/double_test.go @@ -23,8 +23,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/duration.go b/common/types/duration.go index 220714773..cd3efa1ce 100644 --- a/common/types/duration.go +++ b/common/types/duration.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" dpb "google.golang.org/protobuf/types/known/durationpb" diff --git a/common/types/duration_test.go b/common/types/duration_test.go index f0e4509e8..76362d366 100644 --- a/common/types/duration_test.go +++ b/common/types/duration_test.go @@ -22,8 +22,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" dpb "google.golang.org/protobuf/types/known/durationpb" diff --git a/common/types/err.go b/common/types/err.go index 3216ff1c4..22749de6c 100644 --- a/common/types/err.go +++ b/common/types/err.go @@ -19,7 +19,7 @@ import ( "fmt" "reflect" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Error interface which allows types types.Err values to be treated as error values. diff --git a/common/types/format.go b/common/types/format.go index 174a2bd04..3b2c06f0a 100644 --- a/common/types/format.go +++ b/common/types/format.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) type formattable interface { diff --git a/common/types/int.go b/common/types/int.go index 60d5a7160..82dbb1738 100644 --- a/common/types/int.go +++ b/common/types/int.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/int_test.go b/common/types/int_test.go index 560c3dfb2..0d573eb29 100644 --- a/common/types/int_test.go +++ b/common/types/int_test.go @@ -24,8 +24,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/iterator.go b/common/types/iterator.go index 98e9147b6..77fc90f42 100644 --- a/common/types/iterator.go +++ b/common/types/iterator.go @@ -18,8 +18,8 @@ import ( "fmt" "reflect" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) var ( diff --git a/common/types/json_list_test.go b/common/types/json_list_test.go index 0d8cff093..867b7bbe8 100644 --- a/common/types/json_list_test.go +++ b/common/types/json_list_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/traits" "google.golang.org/protobuf/proto" anypb "google.golang.org/protobuf/types/known/anypb" diff --git a/common/types/list.go b/common/types/list.go index 028770ed6..2d3a20a15 100644 --- a/common/types/list.go +++ b/common/types/list.go @@ -22,8 +22,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/list_test.go b/common/types/list_test.go index ca134b716..acfcc5cde 100644 --- a/common/types/list_test.go +++ b/common/types/list_test.go @@ -24,8 +24,8 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" anypb "google.golang.org/protobuf/types/known/anypb" dpb "google.golang.org/protobuf/types/known/durationpb" diff --git a/common/types/map.go b/common/types/map.go index e4d6f7657..bc643b3d0 100644 --- a/common/types/map.go +++ b/common/types/map.go @@ -24,9 +24,9 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/map_test.go b/common/types/map_test.go index 81989120d..9e7107b23 100644 --- a/common/types/map_test.go +++ b/common/types/map_test.go @@ -26,11 +26,11 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" tpb "google.golang.org/protobuf/types/known/timestamppb" diff --git a/common/types/native.go b/common/types/native.go index 33c897b43..5efed25ce 100644 --- a/common/types/native.go +++ b/common/types/native.go @@ -23,8 +23,8 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" structpb "google.golang.org/protobuf/types/known/structpb" ) diff --git a/common/types/native_test.go b/common/types/native_test.go index 161337538..4989be906 100644 --- a/common/types/native_test.go +++ b/common/types/native_test.go @@ -26,17 +26,17 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/ext" - "github.com/google/cel-go/test" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/ext" + "cel.dev/cel-go/test" structpb "google.golang.org/protobuf/types/known/structpb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestNativeTypes(t *testing.T) { diff --git a/common/types/null.go b/common/types/null.go index 671e1ee5c..990609c69 100644 --- a/common/types/null.go +++ b/common/types/null.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/null_test.go b/common/types/null_test.go index 97ec24c10..df6e31c8c 100644 --- a/common/types/null_test.go +++ b/common/types/null_test.go @@ -22,7 +22,7 @@ import ( "google.golang.org/protobuf/proto" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" dynamicpb "google.golang.org/protobuf/types/dynamicpb" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/object.go b/common/types/object.go index bb2a09e87..579b84e11 100644 --- a/common/types/object.go +++ b/common/types/object.go @@ -24,8 +24,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/object_test.go b/common/types/object_test.go index b2e2207ea..816c1de80 100644 --- a/common/types/object_test.go +++ b/common/types/object_test.go @@ -22,8 +22,8 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" anypb "google.golang.org/protobuf/types/known/anypb" diff --git a/common/types/optional.go b/common/types/optional.go index 0d861823d..1efccd36d 100644 --- a/common/types/optional.go +++ b/common/types/optional.go @@ -20,7 +20,7 @@ import ( "reflect" "strings" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) var ( diff --git a/common/types/optional_test.go b/common/types/optional_test.go index 89f28d7e7..d874e9a7b 100644 --- a/common/types/optional_test.go +++ b/common/types/optional_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) func TestOptionalOptionalOf(t *testing.T) { diff --git a/common/types/pb/BUILD.bazel b/common/types/pb/BUILD.bazel index e2b9d37b5..66d333c36 100644 --- a/common/types/pb/BUILD.bazel +++ b/common/types/pb/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "pb.go", "type.go", ], - importpath = "github.com/google/cel-go/common/types/pb", + importpath = "cel.dev/cel-go/common/types/pb", deps = [ "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//encoding/protowire:go_default_library", diff --git a/common/types/pb/equal_test.go b/common/types/pb/equal_test.go index 83254e4f6..341dfec0a 100644 --- a/common/types/pb/equal_test.go +++ b/common/types/pb/equal_test.go @@ -20,7 +20,7 @@ import ( "google.golang.org/protobuf/proto" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" anypb "google.golang.org/protobuf/types/known/anypb" ) diff --git a/common/types/pb/file_test.go b/common/types/pb/file_test.go index d0c4da607..fa0db187e 100644 --- a/common/types/pb/file_test.go +++ b/common/types/pb/file_test.go @@ -21,10 +21,10 @@ import ( "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/checker/decls" + "cel.dev/cel-go/checker/decls" - proto2pb "github.com/google/cel-go/test/proto2pb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto2pb "cel.dev/cel-go/test/proto2pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" descpb "google.golang.org/protobuf/types/descriptorpb" ) diff --git a/common/types/pb/pb_test.go b/common/types/pb/pb_test.go index aef1c02b4..e709ad9f7 100644 --- a/common/types/pb/pb_test.go +++ b/common/types/pb/pb_test.go @@ -21,8 +21,8 @@ import ( "google.golang.org/protobuf/reflect/protodesc" "google.golang.org/protobuf/reflect/protoreflect" - proto2pb "github.com/google/cel-go/test/proto2pb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto2pb "cel.dev/cel-go/test/proto2pb" + proto3pb "cel.dev/cel-go/test/proto3pb" descpb "google.golang.org/protobuf/types/descriptorpb" dynamicpb "google.golang.org/protobuf/types/dynamicpb" durationpb "google.golang.org/protobuf/types/known/durationpb" diff --git a/common/types/pb/type_test.go b/common/types/pb/type_test.go index fed1a3d0d..e859a1a66 100644 --- a/common/types/pb/type_test.go +++ b/common/types/pb/type_test.go @@ -19,11 +19,11 @@ import ( "testing" "time" - "github.com/google/cel-go/checker/decls" + "cel.dev/cel-go/checker/decls" "google.golang.org/protobuf/proto" - proto2pb "github.com/google/cel-go/test/proto2pb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto2pb "cel.dev/cel-go/test/proto2pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" dynamicpb "google.golang.org/protobuf/types/dynamicpb" anypb "google.golang.org/protobuf/types/known/anypb" diff --git a/common/types/provider.go b/common/types/provider.go index 2321828d8..84c8c9e97 100644 --- a/common/types/provider.go +++ b/common/types/provider.go @@ -24,9 +24,9 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" anypb "google.golang.org/protobuf/types/known/anypb" diff --git a/common/types/provider_test.go b/common/types/provider_test.go index 65f695b11..9033829e4 100644 --- a/common/types/provider_test.go +++ b/common/types/provider_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" "google.golang.org/protobuf/proto" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" anypb "google.golang.org/protobuf/types/known/anypb" dpb "google.golang.org/protobuf/types/known/durationpb" diff --git a/common/types/ref/BUILD.bazel b/common/types/ref/BUILD.bazel index 79330c332..9df5779d8 100644 --- a/common/types/ref/BUILD.bazel +++ b/common/types/ref/BUILD.bazel @@ -11,7 +11,7 @@ go_library( "provider.go", "reference.go", ], - importpath = "github.com/google/cel-go/common/types/ref", + importpath = "cel.dev/cel-go/common/types/ref", deps = [ "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", diff --git a/common/types/string.go b/common/types/string.go index 1335903a7..238b85487 100644 --- a/common/types/string.go +++ b/common/types/string.go @@ -22,8 +22,8 @@ import ( "strings" "time" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/string_test.go b/common/types/string_test.go index daf8fdc54..dc0cf40b2 100644 --- a/common/types/string_test.go +++ b/common/types/string_test.go @@ -22,8 +22,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/struct.go b/common/types/struct.go index 61740a70e..0b50895a5 100644 --- a/common/types/struct.go +++ b/common/types/struct.go @@ -17,7 +17,7 @@ package types import ( "reflect" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // StructTypeDescriptor describes a CEL struct type, providing field metadata and value instantiation. diff --git a/common/types/timestamp.go b/common/types/timestamp.go index aee47f053..a57c6591e 100644 --- a/common/types/timestamp.go +++ b/common/types/timestamp.go @@ -23,8 +23,8 @@ import ( "time" "unicode" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/timestamp_test.go b/common/types/timestamp_test.go index c13b21fef..d88773385 100644 --- a/common/types/timestamp_test.go +++ b/common/types/timestamp_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types/ref" "google.golang.org/protobuf/proto" diff --git a/common/types/traits/BUILD.bazel b/common/types/traits/BUILD.bazel index b19eb8301..e2f7d6fdb 100644 --- a/common/types/traits/BUILD.bazel +++ b/common/types/traits/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "traits.go", "zeroer.go", ], - importpath = "github.com/google/cel-go/common/types/traits", + importpath = "cel.dev/cel-go/common/types/traits", deps = [ "//common/types/ref:go_default_library", ], diff --git a/common/types/traits/comparer.go b/common/types/traits/comparer.go index b531d9ae2..83b139535 100644 --- a/common/types/traits/comparer.go +++ b/common/types/traits/comparer.go @@ -15,7 +15,7 @@ package traits import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Comparer interface for ordering comparisons between values in order to diff --git a/common/types/traits/container.go b/common/types/traits/container.go index cf5c621ae..357ccd31d 100644 --- a/common/types/traits/container.go +++ b/common/types/traits/container.go @@ -14,7 +14,7 @@ package traits -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // Container interface which permits containment tests such as 'a in b'. type Container interface { diff --git a/common/types/traits/field_tester.go b/common/types/traits/field_tester.go index 816a95652..d80351b40 100644 --- a/common/types/traits/field_tester.go +++ b/common/types/traits/field_tester.go @@ -15,7 +15,7 @@ package traits import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // FieldTester indicates if a defined field on an object type is set to a diff --git a/common/types/traits/indexer.go b/common/types/traits/indexer.go index 662c6836c..2d1f72ae2 100644 --- a/common/types/traits/indexer.go +++ b/common/types/traits/indexer.go @@ -15,7 +15,7 @@ package traits import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Indexer permits random access of elements by index 'a[b()]'. diff --git a/common/types/traits/iterator.go b/common/types/traits/iterator.go index 91c10f08f..f0a0b4cb9 100644 --- a/common/types/traits/iterator.go +++ b/common/types/traits/iterator.go @@ -15,7 +15,7 @@ package traits import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Iterable aggregate types permit traversal over their elements. diff --git a/common/types/traits/lister.go b/common/types/traits/lister.go index e54781a60..67f32391b 100644 --- a/common/types/traits/lister.go +++ b/common/types/traits/lister.go @@ -14,7 +14,7 @@ package traits -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // Lister interface which aggregates the traits of a list. type Lister interface { diff --git a/common/types/traits/mapper.go b/common/types/traits/mapper.go index d13333f3f..7a4acedc5 100644 --- a/common/types/traits/mapper.go +++ b/common/types/traits/mapper.go @@ -14,7 +14,7 @@ package traits -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // Mapper interface which aggregates the traits of a maps. type Mapper interface { diff --git a/common/types/traits/matcher.go b/common/types/traits/matcher.go index 085dc94ff..4ea283e90 100644 --- a/common/types/traits/matcher.go +++ b/common/types/traits/matcher.go @@ -14,7 +14,7 @@ package traits -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // Matcher interface for supporting 'matches()' overloads. type Matcher interface { diff --git a/common/types/traits/math.go b/common/types/traits/math.go index 86d5b9137..cb6354f7e 100644 --- a/common/types/traits/math.go +++ b/common/types/traits/math.go @@ -14,7 +14,7 @@ package traits -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // Adder interface to support '+' operator overloads. type Adder interface { diff --git a/common/types/traits/receiver.go b/common/types/traits/receiver.go index 8f41db45e..4760192c6 100644 --- a/common/types/traits/receiver.go +++ b/common/types/traits/receiver.go @@ -14,7 +14,7 @@ package traits -import "github.com/google/cel-go/common/types/ref" +import "cel.dev/cel-go/common/types/ref" // Receiver interface for routing instance method calls within a value. type Receiver interface { diff --git a/common/types/traits/sizer.go b/common/types/traits/sizer.go index b80d25137..8e2e3cf92 100644 --- a/common/types/traits/sizer.go +++ b/common/types/traits/sizer.go @@ -15,7 +15,7 @@ package traits import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Sizer interface for supporting 'size()' overloads. diff --git a/common/types/type_test.go b/common/types/type_test.go index a63d17057..fbebeeeb3 100644 --- a/common/types/type_test.go +++ b/common/types/type_test.go @@ -17,7 +17,7 @@ package types import ( "testing" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) func TestType_ConvertToType(t *testing.T) { diff --git a/common/types/types.go b/common/types/types.go index 78c77a9b5..fc35bddb4 100644 --- a/common/types/types.go +++ b/common/types/types.go @@ -21,9 +21,9 @@ import ( "google.golang.org/protobuf/proto" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" celpb "cel.dev/expr" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" diff --git a/common/types/types_test.go b/common/types/types_test.go index c91d7148a..9ea7b8f6c 100644 --- a/common/types/types_test.go +++ b/common/types/types_test.go @@ -22,8 +22,8 @@ import ( "google.golang.org/protobuf/proto" - chkdecls "github.com/google/cel-go/checker/decls" - "github.com/google/cel-go/common/types/traits" + chkdecls "cel.dev/cel-go/checker/decls" + "cel.dev/cel-go/common/types/traits" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/common/types/uint.go b/common/types/uint.go index 91d5369da..6c2bef729 100644 --- a/common/types/uint.go +++ b/common/types/uint.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/uint_test.go b/common/types/uint_test.go index 2484fbf36..e31fda8a3 100644 --- a/common/types/uint_test.go +++ b/common/types/uint_test.go @@ -23,8 +23,8 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" diff --git a/common/types/unknown.go b/common/types/unknown.go index f43aff18e..96150fc3f 100644 --- a/common/types/unknown.go +++ b/common/types/unknown.go @@ -23,7 +23,7 @@ import ( "strings" "unicode" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) var ( diff --git a/common/types/unknown_test.go b/common/types/unknown_test.go index 593708950..6957e5846 100644 --- a/common/types/unknown_test.go +++ b/common/types/unknown_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) func TestIsUnknown(t *testing.T) { diff --git a/common/types/util.go b/common/types/util.go index 71662eee3..cb37389f9 100644 --- a/common/types/util.go +++ b/common/types/util.go @@ -15,7 +15,7 @@ package types import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // IsUnknownOrError returns whether the input element ref.Val is an ErrType or UnknownType. diff --git a/conformance/conformance_test.go b/conformance/conformance_test.go index 417310287..800294019 100644 --- a/conformance/conformance_test.go +++ b/conformance/conformance_test.go @@ -11,12 +11,12 @@ import ( "github.com/bazelbuild/rules_go/go/runfiles" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/ext" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/encoding/prototext" diff --git a/conformance/go.mod b/conformance/go.mod index f5e6a2cc6..e543dea61 100644 --- a/conformance/go.mod +++ b/conformance/go.mod @@ -1,22 +1,28 @@ -module github.com/google/cel-go/conformance +module cel.dev/cel-go/conformance go 1.23.0 require ( + cel.dev/cel-go v0.26.1 + cel.dev/cel-go/policy v0.0.0-20250311174852-f5ea07b389a1 + cel.dev/cel-go/tools v0.0.0-20251023215754-a36d461be521 cel.dev/expr v0.25.1 github.com/bazelbuild/rules_go v0.49.0 - github.com/google/cel-go v0.26.1 github.com/google/go-cmp v0.7.0 google.golang.org/protobuf v1.36.10 ) require ( github.com/antlr4-go/antlr/v4 v4.13.1 // indirect - github.com/stoewer/go-strcase v1.3.1 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect golang.org/x/text v0.22.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250311190419-81fb87f6b8bf // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf // indirect ) -replace github.com/google/cel-go => ./.. +replace cel.dev/cel-go => ./.. + +replace cel.dev/cel-go/policy => ../policy + +replace cel.dev/cel-go/tools => ../tools diff --git a/conformance/go.sum b/conformance/go.sum index 3c87f38d3..a73997939 100644 --- a/conformance/go.sum +++ b/conformance/go.sum @@ -4,35 +4,19 @@ github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYW github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/bazelbuild/rules_go v0.49.0 h1:5vCbuvy8Q11g41lseGJDc5vxhDjJtfxr6nM/IC4VmqM= github.com/bazelbuild/rules_go v0.49.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= -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/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs= -github.com/stoewer/go-strcase v1.3.1/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= -google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= -google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/api v0.0.0-20250311190419-81fb87f6b8bf h1:BdIVRm+fyDUn8lrZLPSlBCfM/YKDwUBYgDoLv9+DYo0= +google.golang.org/genproto/googleapis/api v0.0.0-20250311190419-81fb87f6b8bf/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf h1:dHDlF3CWxQkefK9IJx+O8ldY0gLygvrlYRBNbPqDWuY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/conformance/policy/policy_conformance_test.go b/conformance/policy/policy_conformance_test.go index d718f1778..21966df04 100644 --- a/conformance/policy/policy_conformance_test.go +++ b/conformance/policy/policy_conformance_test.go @@ -24,12 +24,12 @@ import ( "testing" "github.com/bazelbuild/rules_go/go/runfiles" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/policy" - "github.com/google/cel-go/tools/celtest" - "github.com/google/cel-go/tools/compiler" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/policy" + "cel.dev/cel-go/tools/celtest" + "cel.dev/cel-go/tools/compiler" _ "cel.dev/expr/conformance/proto3" ) diff --git a/examples/README.md b/examples/README.md index 4e739f660..ecb6b33c3 100644 --- a/examples/README.md +++ b/examples/README.md @@ -15,7 +15,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) func main() { diff --git a/examples/example_cel_advanced_test.go b/examples/example_cel_advanced_test.go index a04a9ded5..f0ee5e736 100644 --- a/examples/example_cel_advanced_test.go +++ b/examples/example_cel_advanced_test.go @@ -17,7 +17,7 @@ package examples import ( "fmt" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_CommonErrors showcases handling common runtime errors (division by zero, index out of bounds, missing key) diff --git a/examples/example_cel_collections_test.go b/examples/example_cel_collections_test.go index 93c2110b6..c2e6cfa88 100644 --- a/examples/example_cel_collections_test.go +++ b/examples/example_cel_collections_test.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_Collections showcases membership, indexing, search (exists), all, and filter diff --git a/examples/example_cel_compile_test.go b/examples/example_cel_compile_test.go index 7a7f3a42c..f5217c420 100644 --- a/examples/example_cel_compile_test.go +++ b/examples/example_cel_compile_test.go @@ -18,8 +18,8 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/ext" ) // Example_cel_Compile showcases compiling a CEL expression with variable declarations diff --git a/examples/example_cel_context_eval_test.go b/examples/example_cel_context_eval_test.go index 18f51d712..3d5c0fb4b 100644 --- a/examples/example_cel_context_eval_test.go +++ b/examples/example_cel_context_eval_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_ContextEval showcases evaluation cancellation and timeout using ContextEval diff --git a/examples/example_cel_custom_functions_test.go b/examples/example_cel_custom_functions_test.go index 0664ff0d3..11fcf5394 100644 --- a/examples/example_cel_custom_functions_test.go +++ b/examples/example_cel_custom_functions_test.go @@ -18,9 +18,9 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // Example_cel_Overload showcases defining custom global functions with cel.Overload diff --git a/examples/example_cel_custom_macros_test.go b/examples/example_cel_custom_macros_test.go index b970415f4..387c9a849 100644 --- a/examples/example_cel_custom_macros_test.go +++ b/examples/example_cel_custom_macros_test.go @@ -18,12 +18,12 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" ) // Example_cel_CustomMacros showcases defining custom AST transformation macros diff --git a/examples/example_cel_execution_cost_test.go b/examples/example_cel_execution_cost_test.go index 69e6411b5..123c8b747 100644 --- a/examples/example_cel_execution_cost_test.go +++ b/examples/example_cel_execution_cost_test.go @@ -19,9 +19,9 @@ import ( "log" "strings" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types/ref" ) type exampleCostEstimator struct { diff --git a/examples/example_cel_logic_and_conditions_test.go b/examples/example_cel_logic_and_conditions_test.go index ed3d9792c..2456e06c1 100644 --- a/examples/example_cel_logic_and_conditions_test.go +++ b/examples/example_cel_logic_and_conditions_test.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_LogicAndConditions showcases logical operators, conditional (ternary) operator, and evaluation diff --git a/examples/example_cel_native_structs_test.go b/examples/example_cel_native_structs_test.go index 076a254db..b2b164eac 100644 --- a/examples/example_cel_native_structs_test.go +++ b/examples/example_cel_native_structs_test.go @@ -19,8 +19,8 @@ import ( "log" "reflect" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/ext" ) type User struct { diff --git a/examples/example_cel_operators_test.go b/examples/example_cel_operators_test.go index 895079af3..2d66a2c5d 100644 --- a/examples/example_cel_operators_test.go +++ b/examples/example_cel_operators_test.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_Arithmetic showcases negation, basic operations, modulo, and precedence diff --git a/examples/example_cel_protocol_buffers_test.go b/examples/example_cel_protocol_buffers_test.go index 26a46bc6c..30b32d7fa 100644 --- a/examples/example_cel_protocol_buffers_test.go +++ b/examples/example_cel_protocol_buffers_test.go @@ -18,8 +18,8 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/test/proto3pb" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/test/proto3pb" "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/examples/example_cel_strings_and_numbers_test.go b/examples/example_cel_strings_and_numbers_test.go index 8be7cc820..b61a244b0 100644 --- a/examples/example_cel_strings_and_numbers_test.go +++ b/examples/example_cel_strings_and_numbers_test.go @@ -18,8 +18,8 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/ext" ) // Example_cel_StringsAndNumbers showcases string functions, concatenation, and numeric comparisons diff --git a/examples/example_cel_time_test.go b/examples/example_cel_time_test.go index 448e6a977..cfe34b96b 100644 --- a/examples/example_cel_time_test.go +++ b/examples/example_cel_time_test.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_TimestampsAndDurations showcases timestamps, durations, arithmetic, and field access diff --git a/examples/example_cel_transforming_data_test.go b/examples/example_cel_transforming_data_test.go index 594582cf8..d27a4b4dc 100644 --- a/examples/example_cel_transforming_data_test.go +++ b/examples/example_cel_transforming_data_test.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_TransformingData showcases building maps, transforming lists with map(), diff --git a/examples/example_cel_type_conversions_test.go b/examples/example_cel_type_conversions_test.go index 1681e6c0a..3a816dec1 100644 --- a/examples/example_cel_type_conversions_test.go +++ b/examples/example_cel_type_conversions_test.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) // Example_cel_TypeConversions showcases type casting functions (int, uint, double, string, bytes, dyn) diff --git a/ext/BUILD.bazel b/ext/BUILD.bazel index f362fd97b..4e63a832f 100644 --- a/ext/BUILD.bazel +++ b/ext/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "sets.go", "strings.go", ], - importpath = "github.com/google/cel-go/ext", + importpath = "cel.dev/cel-go/ext", visibility = ["//visibility:public"], deps = [ "//cel:go_default_library", diff --git a/ext/bindings.go b/ext/bindings.go index 89766d60a..1bf97c59c 100644 --- a/ext/bindings.go +++ b/ext/bindings.go @@ -22,12 +22,12 @@ import ( "strings" "sync" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" ) // Bindings returns a cel.EnvOption to configure support for local variable diff --git a/ext/bindings_test.go b/ext/bindings_test.go index 4999cc416..ced229716 100644 --- a/ext/bindings_test.go +++ b/ext/bindings_test.go @@ -20,14 +20,14 @@ import ( "sync" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/test" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/test" ) var bindingTests = []struct { diff --git a/ext/comprehensions.go b/ext/comprehensions.go index adb22912b..d01524bb1 100644 --- a/ext/comprehensions.go +++ b/ext/comprehensions.go @@ -18,13 +18,13 @@ import ( "fmt" "math" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/parser" ) const ( diff --git a/ext/comprehensions_test.go b/ext/comprehensions_test.go index 986547d97..075c2af38 100644 --- a/ext/comprehensions_test.go +++ b/ext/comprehensions_test.go @@ -19,10 +19,10 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/interpreter" ) func TestTwoVarComprehensions(t *testing.T) { diff --git a/ext/costs.go b/ext/costs.go index d2cf7c757..5a2c6c085 100644 --- a/ext/costs.go +++ b/ext/costs.go @@ -17,12 +17,12 @@ package ext import ( "math" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) var ( diff --git a/ext/encoders.go b/ext/encoders.go index 97fc932a5..eca542666 100644 --- a/ext/encoders.go +++ b/ext/encoders.go @@ -20,11 +20,11 @@ import ( "fmt" "math" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/ext/encoders_test.go b/ext/encoders_test.go index dde2200da..1d526a15d 100644 --- a/ext/encoders_test.go +++ b/ext/encoders_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" ) func TestEncoders(t *testing.T) { diff --git a/ext/extension_option_factory.go b/ext/extension_option_factory.go index e68cf5bc7..6aeb157bc 100644 --- a/ext/extension_option_factory.go +++ b/ext/extension_option_factory.go @@ -17,8 +17,8 @@ package ext import ( "fmt" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" ) // ExtensionOptionFactory converts an ExtensionConfig value to a CEL environment option. diff --git a/ext/extension_option_factory_test.go b/ext/extension_option_factory_test.go index 603aedf53..260bf795b 100644 --- a/ext/extension_option_factory_test.go +++ b/ext/extension_option_factory_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" ) func TestExtensionOptionFactoryInvalidExtension(t *testing.T) { diff --git a/ext/formatting.go b/ext/formatting.go index 35fb17048..f8633dbc0 100644 --- a/ext/formatting.go +++ b/ext/formatting.go @@ -26,12 +26,12 @@ import ( "golang.org/x/text/language" "golang.org/x/text/message" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) type clauseImpl func(ref.Val, string) (string, error) diff --git a/ext/formatting_test.go b/ext/formatting_test.go index e77e3a936..c72316588 100644 --- a/ext/formatting_test.go +++ b/ext/formatting_test.go @@ -24,12 +24,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestStringFormat(t *testing.T) { diff --git a/ext/formatting_v2.go b/ext/formatting_v2.go index f923cc7e1..969a779e1 100644 --- a/ext/formatting_v2.go +++ b/ext/formatting_v2.go @@ -24,11 +24,11 @@ import ( "time" "unicode" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) type clauseImplV2 func(ref.Val) (string, error) diff --git a/ext/formatting_v2_test.go b/ext/formatting_v2_test.go index a183dba38..71c96576a 100644 --- a/ext/formatting_v2_test.go +++ b/ext/formatting_v2_test.go @@ -24,12 +24,12 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestStringsWithExtensionV2(t *testing.T) { diff --git a/ext/guards.go b/ext/guards.go index 1461c0416..83e64e89a 100644 --- a/ext/guards.go +++ b/ext/guards.go @@ -15,9 +15,9 @@ package ext import ( - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // function invocation guards for common call signatures within extension functions. diff --git a/ext/lists.go b/ext/lists.go index 2196d218c..873428837 100644 --- a/ext/lists.go +++ b/ext/lists.go @@ -19,16 +19,16 @@ import ( "math" "sort" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/parser" ) var comparableTypes = []*cel.Type{ diff --git a/ext/lists_test.go b/ext/lists_test.go index bf01801cb..8b68cf4bd 100644 --- a/ext/lists_test.go +++ b/ext/lists_test.go @@ -19,11 +19,11 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" - proto2pb "github.com/google/cel-go/test/proto2pb" + proto2pb "cel.dev/cel-go/test/proto2pb" ) func TestLists(t *testing.T) { diff --git a/ext/math.go b/ext/math.go index e67b205de..a706dc199 100644 --- a/ext/math.go +++ b/ext/math.go @@ -19,13 +19,13 @@ import ( "math" "strings" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" ) // Math returns a cel.EnvOption to configure namespaced math helper macros and diff --git a/ext/math_test.go b/ext/math_test.go index 8b47cae64..815d113fc 100644 --- a/ext/math_test.go +++ b/ext/math_test.go @@ -19,9 +19,9 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" ) func TestMath(t *testing.T) { diff --git a/ext/native.go b/ext/native.go index 2598b38d6..213a2443e 100644 --- a/ext/native.go +++ b/ext/native.go @@ -15,8 +15,8 @@ package ext import ( - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" ) // NativeTypesOption is a functional interface for configuring handling of native types. diff --git a/ext/native_test.go b/ext/native_test.go index c6af35c9a..a5c870044 100644 --- a/ext/native_test.go +++ b/ext/native_test.go @@ -26,16 +26,16 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/pb" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/test" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/pb" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/test" structpb "google.golang.org/protobuf/types/known/structpb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestNativeTypes(t *testing.T) { diff --git a/ext/network.go b/ext/network.go index bca065707..d542dda9c 100644 --- a/ext/network.go +++ b/ext/network.go @@ -20,12 +20,12 @@ import ( "net/netip" "reflect" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" ) const ( diff --git a/ext/network_test.go b/ext/network_test.go index 592c07494..993c6ef08 100644 --- a/ext/network_test.go +++ b/ext/network_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" ) func TestNetwork_Success(t *testing.T) { diff --git a/ext/protos.go b/ext/protos.go index b09db25b0..0dc2f6a0d 100644 --- a/ext/protos.go +++ b/ext/protos.go @@ -17,8 +17,8 @@ package ext import ( "math" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" ) // Protos returns a cel.EnvOption to configure extended macros and functions for diff --git a/ext/protos_test.go b/ext/protos_test.go index 739dddf3d..6c2fce992 100644 --- a/ext/protos_test.go +++ b/ext/protos_test.go @@ -20,13 +20,13 @@ import ( "google.golang.org/protobuf/proto" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/test" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/test" - proto2pb "github.com/google/cel-go/test/proto2pb" + proto2pb "cel.dev/cel-go/test/proto2pb" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/ext/regex.go b/ext/regex.go index bd222f170..a8fedc72f 100644 --- a/ext/regex.go +++ b/ext/regex.go @@ -22,12 +22,12 @@ import ( "strconv" "strings" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" ) const ( diff --git a/ext/regex_test.go b/ext/regex_test.go index 9a61b7946..6c7b401e0 100644 --- a/ext/regex_test.go +++ b/ext/regex_test.go @@ -19,8 +19,8 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" ) func TestRegex(t *testing.T) { diff --git a/ext/sets.go b/ext/sets.go index 63c019ad9..f087ae67f 100644 --- a/ext/sets.go +++ b/ext/sets.go @@ -15,14 +15,14 @@ package ext import ( - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" ) // Sets returns a cel.EnvOption to configure namespaced set relationship diff --git a/ext/sets_test.go b/ext/sets_test.go index 4ea409b67..161c2ae9a 100644 --- a/ext/sets_test.go +++ b/ext/sets_test.go @@ -20,12 +20,12 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestSets(t *testing.T) { diff --git a/ext/strings.go b/ext/strings.go index 1f7732f2f..a77e527d2 100644 --- a/ext/strings.go +++ b/ext/strings.go @@ -27,13 +27,13 @@ import ( "golang.org/x/text/language" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/interpreter" ) const ( diff --git a/ext/strings_test.go b/ext/strings_test.go index 276a3efd5..8e9e01b11 100644 --- a/ext/strings_test.go +++ b/ext/strings_test.go @@ -21,10 +21,10 @@ import ( "time" "unicode/utf8" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // TODO: move these tests to a conformance test. diff --git a/go.mod b/go.mod index ad223de71..188cf7bca 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/google/cel-go +module cel.dev/cel-go go 1.23.0 diff --git a/interpreter/BUILD.bazel b/interpreter/BUILD.bazel index 40ac2ba69..3ec8f4c02 100644 --- a/interpreter/BUILD.bazel +++ b/interpreter/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "prune.go", "runtimecost.go", ], - importpath = "github.com/google/cel-go/interpreter", + importpath = "cel.dev/cel-go/interpreter", deps = [ "//common:go_default_library", "//common/ast:go_default_library", diff --git a/interpreter/activation.go b/interpreter/activation.go index bc9296ed4..15cbd3002 100644 --- a/interpreter/activation.go +++ b/interpreter/activation.go @@ -18,7 +18,7 @@ import ( "errors" "fmt" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // Activation used to resolve identifiers by name and references by id. diff --git a/interpreter/activation_test.go b/interpreter/activation_test.go index b0fed2102..21cf93636 100644 --- a/interpreter/activation_test.go +++ b/interpreter/activation_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) func TestActivation(t *testing.T) { diff --git a/interpreter/async.go b/interpreter/async.go index 4e391196b..a678705a7 100644 --- a/interpreter/async.go +++ b/interpreter/async.go @@ -23,9 +23,9 @@ import ( "sync" "sync/atomic" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // Async extension function support. diff --git a/interpreter/async_test.go b/interpreter/async_test.go index 242a93310..228eddb14 100644 --- a/interpreter/async_test.go +++ b/interpreter/async_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/parser" ) // asyncReturning returns an AsyncOp that immediately produces the given value, while counting the diff --git a/interpreter/attribute_patterns.go b/interpreter/attribute_patterns.go index bbaca5226..8e33ddd23 100644 --- a/interpreter/attribute_patterns.go +++ b/interpreter/attribute_patterns.go @@ -18,9 +18,9 @@ import ( "fmt" "strings" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // AttributePattern represents a top-level variable with an optional set of qualifier patterns. diff --git a/interpreter/attribute_patterns_test.go b/interpreter/attribute_patterns_test.go index 9fbbc7d9d..99be5604c 100644 --- a/interpreter/attribute_patterns_test.go +++ b/interpreter/attribute_patterns_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/types" ) // attr describes a simplified format for specifying common Attribute and Qualifier values for diff --git a/interpreter/attributes.go b/interpreter/attributes.go index 26d8eb0f3..ce344eb62 100644 --- a/interpreter/attributes.go +++ b/interpreter/attributes.go @@ -18,10 +18,10 @@ import ( "fmt" "strings" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) // AttributeFactory provides methods creating Attribute and Qualifier values. diff --git a/interpreter/attributes_test.go b/interpreter/attributes_test.go index 1dea98d9a..35582f676 100644 --- a/interpreter/attributes_test.go +++ b/interpreter/attributes_test.go @@ -20,19 +20,19 @@ import ( "reflect" "testing" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" anypb "google.golang.org/protobuf/types/known/anypb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestAttributesAbsoluteAttr(t *testing.T) { diff --git a/interpreter/decorators.go b/interpreter/decorators.go index 6c48e5c1b..7402d18fa 100644 --- a/interpreter/decorators.go +++ b/interpreter/decorators.go @@ -17,10 +17,10 @@ package interpreter import ( "fmt" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) // InterpretableDecorator is a functional interface for decorating or replacing diff --git a/interpreter/dispatcher.go b/interpreter/dispatcher.go index 8f0bdb7b8..40efe3009 100644 --- a/interpreter/dispatcher.go +++ b/interpreter/dispatcher.go @@ -17,7 +17,7 @@ package interpreter import ( "fmt" - "github.com/google/cel-go/common/functions" + "cel.dev/cel-go/common/functions" ) // Dispatcher resolves function calls to their appropriate overload. diff --git a/interpreter/evalstate.go b/interpreter/evalstate.go index 4bdd1fdc7..c1ee6ea1c 100644 --- a/interpreter/evalstate.go +++ b/interpreter/evalstate.go @@ -15,7 +15,7 @@ package interpreter import ( - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/ref" ) // EvalState tracks the values associated with expression ids during execution. diff --git a/interpreter/frame.go b/interpreter/frame.go index 20ab313c8..2fd93052d 100644 --- a/interpreter/frame.go +++ b/interpreter/frame.go @@ -21,9 +21,9 @@ import ( "sync" "sync/atomic" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // evalContext contains the stateful information needed for a single evaluation. diff --git a/interpreter/frame_test.go b/interpreter/frame_test.go index fb9d629cc..a1bb7bbf6 100644 --- a/interpreter/frame_test.go +++ b/interpreter/frame_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) func TestFrameCheckInterrupt(t *testing.T) { diff --git a/interpreter/functions/BUILD.bazel b/interpreter/functions/BUILD.bazel index 4a80c3ea0..e438b126b 100644 --- a/interpreter/functions/BUILD.bazel +++ b/interpreter/functions/BUILD.bazel @@ -10,7 +10,7 @@ go_library( srcs = [ "functions.go", ], - importpath = "github.com/google/cel-go/interpreter/functions", + importpath = "cel.dev/cel-go/interpreter/functions", deps = [ "//common/functions:go_default_library", ], diff --git a/interpreter/functions/functions.go b/interpreter/functions/functions.go index 21ffb6924..02123f1ab 100644 --- a/interpreter/functions/functions.go +++ b/interpreter/functions/functions.go @@ -16,7 +16,7 @@ // interpreter and as declared within the checker#StandardDeclarations. package functions -import fn "github.com/google/cel-go/common/functions" +import fn "cel.dev/cel-go/common/functions" // Overload defines a named overload of a function, indicating an operand trait // which must be present on the first argument to the overload as well as one diff --git a/interpreter/interpretable.go b/interpreter/interpretable.go index 906c4f805..d17e51d10 100644 --- a/interpreter/interpretable.go +++ b/interpreter/interpretable.go @@ -18,12 +18,12 @@ import ( "fmt" "sync" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) // Interpretable evaluates an Activation and produces a value. diff --git a/interpreter/interpreter.go b/interpreter/interpreter.go index 29df9d41e..f2ece5088 100644 --- a/interpreter/interpreter.go +++ b/interpreter/interpreter.go @@ -20,10 +20,10 @@ package interpreter import ( "errors" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // PlannerOption configures the program plan options during interpretable setup. diff --git a/interpreter/interpreter_test.go b/interpreter/interpreter_test.go index 2c3880251..76e9e1b41 100644 --- a/interpreter/interpreter_test.go +++ b/interpreter/interpreter_test.go @@ -25,26 +25,26 @@ import ( "testing" "time" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/stdlib" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/stdlib" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" structpb "google.golang.org/protobuf/types/known/structpb" tpb "google.golang.org/protobuf/types/known/timestamppb" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - proto2pb "github.com/google/cel-go/test/proto2pb" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto2pb "cel.dev/cel-go/test/proto2pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) type testCase struct { diff --git a/interpreter/optimizations.go b/interpreter/optimizations.go index 2fc87e693..c6478fa72 100644 --- a/interpreter/optimizations.go +++ b/interpreter/optimizations.go @@ -17,8 +17,8 @@ package interpreter import ( "regexp" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // MatchesRegexOptimization optimizes the 'matches' standard library function by compiling the regex pattern and diff --git a/interpreter/planner.go b/interpreter/planner.go index 396a9803f..5b39c2af2 100644 --- a/interpreter/planner.go +++ b/interpreter/planner.go @@ -18,11 +18,11 @@ import ( "fmt" "strings" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" ) // newPlanner creates an interpretablePlanner which references a Dispatcher, TypeProvider, diff --git a/interpreter/prune.go b/interpreter/prune.go index 1662c1c1b..9f55f1a81 100644 --- a/interpreter/prune.go +++ b/interpreter/prune.go @@ -15,12 +15,12 @@ package interpreter import ( - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) type astPruner struct { diff --git a/interpreter/prune_test.go b/interpreter/prune_test.go index 3d12abc5a..631d8195d 100644 --- a/interpreter/prune_test.go +++ b/interpreter/prune_test.go @@ -17,17 +17,17 @@ package interpreter import ( "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" - "github.com/google/cel-go/parser" - "github.com/google/cel-go/test" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" + "cel.dev/cel-go/parser" + "cel.dev/cel-go/test" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) type testInfo struct { diff --git a/interpreter/runtimecost.go b/interpreter/runtimecost.go index 81e4ef63c..723eaf686 100644 --- a/interpreter/runtimecost.go +++ b/interpreter/runtimecost.go @@ -18,11 +18,11 @@ import ( "errors" "math" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/common/types/traits" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/common/types/traits" ) // WARNING: Any changes to cost calculations in this file require a corresponding change in checker/cost.go diff --git a/interpreter/runtimecost_test.go b/interpreter/runtimecost_test.go index 597d73ef9..b160318b7 100644 --- a/interpreter/runtimecost_test.go +++ b/interpreter/runtimecost_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "github.com/google/cel-go/checker" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/checker" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/parser" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestTrackCostAdvanced(t *testing.T) { diff --git a/parser/BUILD.bazel b/parser/BUILD.bazel index 97bc9bd43..3c46add7b 100644 --- a/parser/BUILD.bazel +++ b/parser/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "unescape.go", "unparser.go", ], - importpath = "github.com/google/cel-go/parser", + importpath = "cel.dev/cel-go/parser", visibility = ["//visibility:public"], deps = [ "//common:go_default_library", diff --git a/parser/errors.go b/parser/errors.go index c3cec01a8..968dbe82b 100644 --- a/parser/errors.go +++ b/parser/errors.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/cel-go/common" + "cel.dev/cel-go/common" ) // parseErrors is a specialization of Errors. diff --git a/parser/gen/BUILD.bazel b/parser/gen/BUILD.bazel index 3efed87b7..6c0187d58 100644 --- a/parser/gen/BUILD.bazel +++ b/parser/gen/BUILD.bazel @@ -19,7 +19,7 @@ go_library( "CEL.tokens", "CELLexer.tokens", ], - importpath = "github.com/google/cel-go/parser/gen", + importpath = "cel.dev/cel-go/parser/gen", deps = [ "@com_github_antlr4_go_antlr_v4//:go_default_library", ], diff --git a/parser/helper.go b/parser/helper.go index 84bef80d5..b043ef54b 100644 --- a/parser/helper.go +++ b/parser/helper.go @@ -19,10 +19,10 @@ import ( antlr "github.com/antlr4-go/antlr/v4" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) type parserHelper struct { diff --git a/parser/helper_test.go b/parser/helper_test.go index d6602bc7b..22b2216fb 100644 --- a/parser/helper_test.go +++ b/parser/helper_test.go @@ -17,8 +17,8 @@ package parser import ( "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" "google.golang.org/protobuf/proto" ) diff --git a/parser/input.go b/parser/input.go index 44792455d..9ccccd0fc 100644 --- a/parser/input.go +++ b/parser/input.go @@ -17,7 +17,7 @@ package parser import ( antlr "github.com/antlr4-go/antlr/v4" - "github.com/google/cel-go/common/runes" + "cel.dev/cel-go/common/runes" ) type charStream struct { diff --git a/parser/macro.go b/parser/macro.go index 1ef43c4b5..b9f53d7ba 100644 --- a/parser/macro.go +++ b/parser/macro.go @@ -17,11 +17,11 @@ package parser import ( "fmt" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // MacroOpt defines a functional option for configuring macro behavior. diff --git a/parser/macro_test.go b/parser/macro_test.go index 1d056f644..988138d1e 100644 --- a/parser/macro_test.go +++ b/parser/macro_test.go @@ -17,8 +17,8 @@ package parser import ( "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" ) func TestReceiverVarArgMacro(t *testing.T) { diff --git a/parser/parser.go b/parser/parser.go index 338233543..2df20a704 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -25,12 +25,12 @@ import ( antlr "github.com/antlr4-go/antlr/v4" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/runes" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser/gen" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/runes" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser/gen" ) // Parser encapsulates the context necessary to perform parsing for different expressions. diff --git a/parser/parser_test.go b/parser/parser_test.go index 88527d813..fd08f1666 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/debug" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/test" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/debug" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/test" ) var testCases = []testInfo{ diff --git a/parser/unparser.go b/parser/unparser.go index d503a450e..8b5fdbdcc 100644 --- a/parser/unparser.go +++ b/parser/unparser.go @@ -21,10 +21,10 @@ import ( "strconv" "strings" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // Unparse takes an input expression and source position information and generates a human-readable diff --git a/parser/unparser_test.go b/parser/unparser_test.go index 7862e5ca0..6d0accfe9 100644 --- a/parser/unparser_test.go +++ b/parser/unparser_test.go @@ -19,9 +19,9 @@ import ( "strings" "testing" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" "google.golang.org/protobuf/proto" diff --git a/policy/BUILD.bazel b/policy/BUILD.bazel index d443c6d7c..de3775aad 100644 --- a/policy/BUILD.bazel +++ b/policy/BUILD.bazel @@ -37,7 +37,7 @@ go_library( "test_tag_handler_k8s.go", "yaml.go", ], - importpath = "github.com/google/cel-go/policy", + importpath = "cel.dev/cel-go/policy", deps = [ "//cel:go_default_library", "//common:go_default_library", diff --git a/policy/compiler.go b/policy/compiler.go index 2ca84e0a2..0faea4498 100644 --- a/policy/compiler.go +++ b/policy/compiler.go @@ -19,13 +19,13 @@ package policy import ( "fmt" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/containers" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/containers" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // CompiledRule represents the variables and match blocks associated with a rule block. diff --git a/policy/compiler_test.go b/policy/compiler_test.go index 6f9bc4f3b..44adbdfc0 100644 --- a/policy/compiler_test.go +++ b/policy/compiler_test.go @@ -23,11 +23,11 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/ext" - "github.com/google/cel-go/interpreter" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/ext" + "cel.dev/cel-go/interpreter" "github.com/google/go-cmp/cmp" ) diff --git a/policy/composer.go b/policy/composer.go index ef392184f..79d411ace 100644 --- a/policy/composer.go +++ b/policy/composer.go @@ -20,11 +20,11 @@ import ( "slices" "strings" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" ) // ComposerOption is a functional option used to configure a RuleComposer diff --git a/policy/composer_test.go b/policy/composer_test.go index 5cd601c2c..237dd98e0 100644 --- a/policy/composer_test.go +++ b/policy/composer_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/debug" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/debug" + "cel.dev/cel-go/ext" ) func TestCompose_SourceInfo(t *testing.T) { diff --git a/policy/config.go b/policy/config.go index 02243922b..33ccd998b 100644 --- a/policy/config.go +++ b/policy/config.go @@ -15,9 +15,9 @@ package policy import ( - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/ext" ) // FromConfig configures a CEL policy environment from a config file. diff --git a/policy/config_test.go b/policy/config_test.go index 77fcce274..a8fb741d7 100644 --- a/policy/config_test.go +++ b/policy/config_test.go @@ -17,12 +17,12 @@ package policy import ( "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" "go.yaml.in/yaml/v3" - proto3pb "github.com/google/cel-go/test/proto3pb" + proto3pb "cel.dev/cel-go/test/proto3pb" ) func TestConfig(t *testing.T) { diff --git a/policy/go.mod b/policy/go.mod index 6fe07141a..ce093cae2 100644 --- a/policy/go.mod +++ b/policy/go.mod @@ -1,10 +1,10 @@ -module github.com/google/cel-go/policy +module cel.dev/cel-go/policy go 1.23.0 require ( - github.com/google/cel-go v0.26.1 - github.com/google/cel-go/tools v0.0.0-20251023215754-a36d461be521 + cel.dev/cel-go v0.26.1 + cel.dev/cel-go/tools v0.0.0-20251023215754-a36d461be521 github.com/google/go-cmp v0.7.0 go.yaml.in/yaml/v3 v3.0.4 google.golang.org/protobuf v1.36.10 @@ -19,6 +19,6 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf // indirect ) -replace github.com/google/cel-go => ../. +replace cel.dev/cel-go => ../. -replace github.com/google/cel-go/tools => ../tools/. +replace cel.dev/cel-go/tools => ../tools/. diff --git a/policy/helper_test.go b/policy/helper_test.go index fbb62b55a..225f25a70 100644 --- a/policy/helper_test.go +++ b/policy/helper_test.go @@ -19,11 +19,11 @@ import ( "os" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/test" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/test" "go.yaml.in/yaml/v3" diff --git a/policy/parser.go b/policy/parser.go index a42c7a3b9..11e7eb7c1 100644 --- a/policy/parser.go +++ b/policy/parser.go @@ -20,9 +20,9 @@ import ( "go.yaml.in/yaml/v3" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" ) type semanticType int diff --git a/policy/parser_test.go b/policy/parser_test.go index f407a8600..47bf0b348 100644 --- a/policy/parser_test.go +++ b/policy/parser_test.go @@ -18,9 +18,9 @@ import ( "fmt" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/ext" "github.com/google/go-cmp/cmp" "go.yaml.in/yaml/v3" ) diff --git a/policy/source.go b/policy/source.go index 41abd19bd..d07f91f1f 100644 --- a/policy/source.go +++ b/policy/source.go @@ -15,7 +15,7 @@ package policy import ( - "github.com/google/cel-go/common" + "cel.dev/cel-go/common" ) // ByteSource converts a byte sequence and location description to a model.Source. diff --git a/policy/test/cel_test_runner.go b/policy/test/cel_test_runner.go index 95269e13c..be5850b4a 100644 --- a/policy/test/cel_test_runner.go +++ b/policy/test/cel_test_runner.go @@ -18,10 +18,10 @@ import ( "os" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/tools/celtest" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/tools/celtest" ) // TestCEL triggers the celtest test runner with a list of custom options which are used to set up diff --git a/policy/test/k8s_cel_test_runner.go b/policy/test/k8s_cel_test_runner.go index 26e6ad114..6380ecafb 100644 --- a/policy/test/k8s_cel_test_runner.go +++ b/policy/test/k8s_cel_test_runner.go @@ -18,8 +18,8 @@ import ( "os" "testing" - "github.com/google/cel-go/policy" - "github.com/google/cel-go/tools/celtest" + "cel.dev/cel-go/policy" + "cel.dev/cel-go/tools/celtest" ) // TestK8sCEL triggers compilation and test execution of a k8s policy which diff --git a/repl/BUILD.bazel b/repl/BUILD.bazel index 2f6e627ea..2550ab1c1 100644 --- a/repl/BUILD.bazel +++ b/repl/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "evaluator.go", "typefmt.go", ], - importpath = "github.com/google/cel-go/repl", + importpath = "cel.dev/cel-go/repl", deps = [ "//cel:go_default_library", "//checker:go_default_library", diff --git a/repl/commands.go b/repl/commands.go index bad89eb7c..6e0ac7bd7 100644 --- a/repl/commands.go +++ b/repl/commands.go @@ -21,8 +21,8 @@ import ( antlr "github.com/antlr4-go/antlr/v4" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/repl/parser" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/repl/parser" ) var ( diff --git a/repl/evaluator.go b/repl/evaluator.go index ecfd72264..4c4b70bc7 100644 --- a/repl/evaluator.go +++ b/repl/evaluator.go @@ -23,14 +23,14 @@ import ( "sort" "strings" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/env" - envlib "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/functions" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/env" + envlib "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/functions" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/ext" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" diff --git a/repl/evaluator_test.go b/repl/evaluator_test.go index d18f015e2..8bb383630 100644 --- a/repl/evaluator_test.go +++ b/repl/evaluator_test.go @@ -18,11 +18,11 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" "github.com/google/go-cmp/cmp" - proto2pb "github.com/google/cel-go/test/proto2pb" + proto2pb "cel.dev/cel-go/test/proto2pb" ) var testTextDescriptorFile string = "testdata/attribute_context_fds.textproto" diff --git a/repl/go.mod b/repl/go.mod index 400aa810d..7118b13c8 100644 --- a/repl/go.mod +++ b/repl/go.mod @@ -1,12 +1,12 @@ -module github.com/google/cel-go/repl +module cel.dev/cel-go/repl go 1.23.0 require ( + cel.dev/cel-go v0.26.1 cel.dev/expr v0.25.1 github.com/antlr4-go/antlr/v4 v4.13.1 github.com/chzyer/readline v1.5.1 - github.com/google/cel-go v0.26.1 github.com/google/go-cmp v0.7.0 go.yaml.in/yaml/v3 v3.0.4 google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 @@ -20,6 +20,4 @@ require ( golang.org/x/text v0.22.0 // indirect ) -replace github.com/google/cel-go => ../. - -replace cel.dev/expr => ../../cel-spec +replace cel.dev/cel-go => ../. diff --git a/repl/go.sum b/repl/go.sum index 944635123..7cf762b5d 100644 --- a/repl/go.sum +++ b/repl/go.sum @@ -1,3 +1,5 @@ +cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= +cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= diff --git a/repl/main/BUILD.bazel b/repl/main/BUILD.bazel index 8b935c48c..0fa269833 100644 --- a/repl/main/BUILD.bazel +++ b/repl/main/BUILD.bazel @@ -21,14 +21,14 @@ package( go_binary( name = "main", embed = [":go_default_library"], - importpath = "github.com/google/cel-go/repl/main", + importpath = "cel.dev/cel-go/repl/main", visibility = ["//visibility:public"], ) go_library( name = "go_default_library", srcs = ["main.go"], - importpath = "github.com/google/cel-go/repl/main", + importpath = "cel.dev/cel-go/repl/main", visibility = ["//visibility:private"], deps = [ "//repl:go_default_library", diff --git a/repl/main/main.go b/repl/main/main.go index bfc00242f..4d6f5cd00 100644 --- a/repl/main/main.go +++ b/repl/main/main.go @@ -45,7 +45,7 @@ import ( "os" "path/filepath" - "github.com/google/cel-go/repl" + "cel.dev/cel-go/repl" "github.com/chzyer/readline" ) diff --git a/repl/parser/BUILD.bazel b/repl/parser/BUILD.bazel index 4d6f12cb2..821ac1391 100644 --- a/repl/parser/BUILD.bazel +++ b/repl/parser/BUILD.bazel @@ -23,7 +23,7 @@ go_library( name = "go_default_library", srcs = glob(["*.go"], exclude=["*_test.go"]), data = glob(["*.tokens"]), - importpath = "github.com/google/cel-go/repl/parser", + importpath = "cel.dev/cel-go/repl/parser", deps = [ "@com_github_antlr4_go_antlr_v4//:go_default_library", ], diff --git a/repl/typefmt.go b/repl/typefmt.go index a877f57d0..3f559e286 100644 --- a/repl/typefmt.go +++ b/repl/typefmt.go @@ -20,10 +20,10 @@ import ( antlr "github.com/antlr4-go/antlr/v4" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/repl/parser" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/repl/parser" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/repl/typefmt_test.go b/repl/typefmt_test.go index a9c9df9ec..662247876 100644 --- a/repl/typefmt_test.go +++ b/repl/typefmt_test.go @@ -17,7 +17,7 @@ package repl import ( "testing" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" ) diff --git a/test/BUILD.bazel b/test/BUILD.bazel index 597010414..3a6884590 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "expr.go", "suite.go", ], - importpath = "github.com/google/cel-go/test", + importpath = "cel.dev/cel-go/test", deps = [ "//common/operators:go_default_library", "//common/types:go_default_library", diff --git a/test/async.go b/test/async.go index c550e940c..a4ab6ebbb 100644 --- a/test/async.go +++ b/test/async.go @@ -18,8 +18,8 @@ import ( "context" "time" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" ) // FakeRPC returns a blocking async function which simulates an RPC that succeeds after a short diff --git a/test/bench/BUILD.bazel b/test/bench/BUILD.bazel index 5f856dc74..e4ccee5e9 100644 --- a/test/bench/BUILD.bazel +++ b/test/bench/BUILD.bazel @@ -9,7 +9,7 @@ go_library( srcs = [ "bench.go", ], - importpath = "github.com/google/cel-go/test/bench", + importpath = "cel.dev/cel-go/test/bench", deps = [ "//cel:go_default_library", "//ext:go_default_library", diff --git a/test/bench/bench.go b/test/bench/bench.go index 6725faaf7..95d23cec3 100644 --- a/test/bench/bench.go +++ b/test/bench/bench.go @@ -19,10 +19,10 @@ import ( "fmt" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/ext" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/ext" ) // Case represents a human-readable expression and an expected output given an input diff --git a/test/bench/bench_test.go b/test/bench/bench_test.go index 4cfc1e85c..d0798b11b 100644 --- a/test/bench/bench_test.go +++ b/test/bench/bench_test.go @@ -17,7 +17,7 @@ package bench import ( "testing" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" ) func BenchmarkReferenceCases(b *testing.B) { diff --git a/test/expr.go b/test/expr.go index 39adcee60..1390a6498 100644 --- a/test/expr.go +++ b/test/expr.go @@ -15,7 +15,7 @@ package test import ( - "github.com/google/cel-go/common/operators" + "cel.dev/cel-go/common/operators" "google.golang.org/protobuf/proto" diff --git a/test/proto2pb/BUILD.bazel b/test/proto2pb/BUILD.bazel index c7233c8f1..82f27495c 100644 --- a/test/proto2pb/BUILD.bazel +++ b/test/proto2pb/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "test_all_types.pb.go", "test_extensions.pb.go", ], - importpath = "github.com/google/cel-go/test/proto2pb", + importpath = "cel.dev/cel-go/test/proto2pb", deps = [ "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", @@ -59,7 +59,7 @@ proto_library( go_proto_library( name = "test_all_types_go_proto", - importpath = "github.com/google/cel-go/test/proto2pb", + importpath = "cel.dev/cel-go/test/proto2pb", protos = [ ":test_all_types_proto", ":test_extensions_proto", diff --git a/test/proto2pb/test_all_types.proto b/test/proto2pb/test_all_types.proto index a77cc6d8b..aaf1677ed 100644 --- a/test/proto2pb/test_all_types.proto +++ b/test/proto2pb/test_all_types.proto @@ -3,7 +3,7 @@ syntax = "proto2"; package google.expr.proto2.test; -option go_package = "github.com/google/cel-go/test/proto2pb"; +option go_package = "cel.dev/cel-go/test/proto2pb"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/test/proto2pb/test_extensions.proto b/test/proto2pb/test_extensions.proto index f98ca34a4..c41db5a08 100644 --- a/test/proto2pb/test_extensions.proto +++ b/test/proto2pb/test_extensions.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package google.expr.proto2.test; -option go_package = "github.com/google/cel-go/test/proto2pb"; +option go_package = "cel.dev/cel-go/test/proto2pb"; import "google/protobuf/wrappers.proto"; import "test/proto2pb/test_all_types.proto"; diff --git a/test/proto3pb/BUILD.bazel b/test/proto3pb/BUILD.bazel index 7b3449686..b30cc56c6 100644 --- a/test/proto3pb/BUILD.bazel +++ b/test/proto3pb/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "test_all_types.pb.go", "test_import.pb.go", ], - importpath = "github.com/google/cel-go/test/proto3pb", + importpath = "cel.dev/cel-go/test/proto3pb", deps = [ "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/anypb:go_default_library", @@ -57,7 +57,7 @@ proto_library( go_proto_library( name = "test_all_types_go_proto", - importpath = "github.com/google/cel-go/test/proto3pb", + importpath = "cel.dev/cel-go/test/proto3pb", protos = [ ":test_all_types_proto", ":test_import_proto", diff --git a/test/proto3pb/test_all_types.proto b/test/proto3pb/test_all_types.proto index f6e8f2c1e..dce24bac0 100644 --- a/test/proto3pb/test_all_types.proto +++ b/test/proto3pb/test_all_types.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package google.expr.proto3.test; -option go_package = "github.com/google/cel-go/test/proto3pb"; +option go_package = "cel.dev/cel-go/test/proto3pb"; import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; diff --git a/test/proto3pb/test_import.proto b/test/proto3pb/test_import.proto index f508fc5d0..afb62608d 100644 --- a/test/proto3pb/test_import.proto +++ b/test/proto3pb/test_import.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package google.expr.proto3.test; -option go_package = "github.com/google/cel-go/test/proto3pb"; +option go_package = "cel.dev/cel-go/test/proto3pb"; enum ImportedGlobalEnum { IMPORT_FOO = 0; diff --git a/tools/celtest/BUILD.bazel b/tools/celtest/BUILD.bazel index 8d5fd5a99..bb1ad7826 100644 --- a/tools/celtest/BUILD.bazel +++ b/tools/celtest/BUILD.bazel @@ -26,7 +26,7 @@ go_library( "test_coverage_reporter.go", "test_runner.go", ], - importpath = "github.com/google/cel-go/tools/celtest", + importpath = "cel.dev/cel-go/tools/celtest", deps = [ "//cel:go_default_library", "//common/ast:go_default_library", diff --git a/tools/celtest/test_coverage_reporter.go b/tools/celtest/test_coverage_reporter.go index 1147e84c6..e1eab67b5 100644 --- a/tools/celtest/test_coverage_reporter.go +++ b/tools/celtest/test_coverage_reporter.go @@ -20,9 +20,9 @@ import ( "strings" "testing" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/parser" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/parser" ) // reportCoverage reports the coverage information for the provided programs. diff --git a/tools/celtest/test_coverage_reporter_test.go b/tools/celtest/test_coverage_reporter_test.go index ae7b0c701..ac4a1de47 100644 --- a/tools/celtest/test_coverage_reporter_test.go +++ b/tools/celtest/test_coverage_reporter_test.go @@ -18,9 +18,9 @@ package celtest import ( "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/tools/compiler" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/tools/compiler" ) func TestCoverageStats(t *testing.T) { diff --git a/tools/celtest/test_runner.go b/tools/celtest/test_runner.go index 5f1e997d6..5e04bde59 100644 --- a/tools/celtest/test_runner.go +++ b/tools/celtest/test_runner.go @@ -25,16 +25,16 @@ import ( "strings" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/debug" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/interpreter" - "github.com/google/cel-go/test" - "github.com/google/cel-go/tools/compiler" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/debug" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/interpreter" + "cel.dev/cel-go/test" + "cel.dev/cel-go/tools/compiler" "github.com/google/go-cmp/cmp" "google.golang.org/protobuf/encoding/prototext" diff --git a/tools/celtest/test_runner_test.go b/tools/celtest/test_runner_test.go index deb6699a7..0ccfd391f 100644 --- a/tools/celtest/test_runner_test.go +++ b/tools/celtest/test_runner_test.go @@ -18,13 +18,13 @@ package celtest import ( "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/common/types/ref" - "github.com/google/cel-go/policy" - "github.com/google/cel-go/test" - "github.com/google/cel-go/tools/compiler" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/common/types/ref" + "cel.dev/cel-go/policy" + "cel.dev/cel-go/test" + "cel.dev/cel-go/tools/compiler" "go.yaml.in/yaml/v3" diff --git a/tools/compiler/BUILD.bazel b/tools/compiler/BUILD.bazel index de7d0cc6e..58ee40197 100644 --- a/tools/compiler/BUILD.bazel +++ b/tools/compiler/BUILD.bazel @@ -24,7 +24,7 @@ go_library( srcs = [ "compiler.go", ], - importpath = "github.com/google/cel-go/tools/compiler", + importpath = "cel.dev/cel-go/tools/compiler", deps = [ "//cel:go_default_library", "//common:go_default_library", diff --git a/tools/compiler/compiler.go b/tools/compiler/compiler.go index 4d4f69709..e5830f364 100644 --- a/tools/compiler/compiler.go +++ b/tools/compiler/compiler.go @@ -24,12 +24,12 @@ import ( "go.yaml.in/yaml/v3" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/common/types" - "github.com/google/cel-go/ext" - "github.com/google/cel-go/policy" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/common/types" + "cel.dev/cel-go/ext" + "cel.dev/cel-go/policy" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/tools/compiler/compiler_test.go b/tools/compiler/compiler_test.go index d528eed56..4dbca315d 100644 --- a/tools/compiler/compiler_test.go +++ b/tools/compiler/compiler_test.go @@ -18,10 +18,10 @@ import ( "reflect" "testing" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/env" - "github.com/google/cel-go/ext" - "github.com/google/cel-go/policy" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/env" + "cel.dev/cel-go/ext" + "cel.dev/cel-go/policy" celpb "cel.dev/expr" configpb "cel.dev/expr/conformance" diff --git a/tools/go.mod b/tools/go.mod index dc978e3aa..3fb749df2 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,11 +1,11 @@ -module github.com/google/cel-go/tools +module cel.dev/cel-go/tools go 1.23.0 require ( + cel.dev/cel-go v0.26.1 + cel.dev/cel-go/policy v0.0.0-20250311174852-f5ea07b389a1 cel.dev/expr v0.25.1 - github.com/google/cel-go v0.22.0 - github.com/google/cel-go/policy v0.0.0-20250311174852-f5ea07b389a1 github.com/google/go-cmp v0.7.0 go.yaml.in/yaml/v3 v3.0.4 google.golang.org/genproto/googleapis/api v0.0.0-20250311190419-81fb87f6b8bf @@ -14,11 +14,11 @@ require ( require ( github.com/antlr4-go/antlr/v4 v4.13.1 // indirect - github.com/stoewer/go-strcase v1.3.1 // indirect golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect golang.org/x/text v0.22.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/google/cel-go => ../. +replace cel.dev/cel-go => ../. + +replace cel.dev/cel-go/policy => ../policy diff --git a/tools/go.sum b/tools/go.sum index 2d091fe5a..02f0ae46e 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -2,24 +2,8 @@ cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= -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/google/cel-go/policy v0.0.0-20250311174852-f5ea07b389a1 h1:jT/04RYwo++S9tvHggXWuAqvnc2Pi0BTHYsZYVOoMOs= -github.com/google/cel-go/policy v0.0.0-20250311174852-f5ea07b389a1/go.mod h1:dgvqy3CzFx17CBMkL0s1hd0r1+rEQOo85tDpr0g6Dp4= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs= -github.com/stoewer/go-strcase v1.3.1/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= @@ -34,6 +18,3 @@ google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aO google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From fc6a53ca6468b21b36f13856c8657a7c22c601a4 Mon Sep 17 00:00:00 2001 From: dplotnikov Date: Thu, 13 Aug 2026 17:59:12 -0700 Subject: [PATCH 2/2] Update README.md badges and links for cel.dev/cel-go --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d07aa3ca4..1a4a99281 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # Common Expression Language [![Go Report Card](https://goreportcard.com/badge/cel.dev/cel-go)](https://goreportcard.com/report/cel.dev/cel-go) -[![GoDoc](https://godoc.org/cel.dev/cel-go?status.svg)][6] +[![GoDoc](https://pkg.go.dev/badge/cel.dev/cel-go.svg)][6] > [!WARNING] > **On June 16, 2026, this repository will move to > github.com/cel-expr/cel-go!** > > Please update your links and dependencies. See the [pinned -> issue](https://cel.dev/cel-go/issues/1329) for details. +> issue](https://github.com/cel-expr/cel-go/issues/1329) for details. The Common Expression Language (CEL) is a non-Turing complete language designed for simplicity, speed, safety, and portability. CEL's C-like [syntax][1] looks @@ -285,9 +285,9 @@ bazel test ... Released under the [Apache License](LICENSE). -[1]: https://github.com/google/cel-spec +[1]: https://github.com/cel-expr/cel-spec [2]: https://groups.google.com/forum/#!forum/cel-go-discuss -[3]: https://github.com/google/cel-cpp -[4]: https://cel.dev/cel-go/issues +[3]: https://github.com/cel-expr/cel-cpp +[4]: https://github.com/cel-expr/cel-go/issues [5]: https://bazel.build -[6]: https://godoc.org/cel.dev/cel-go +[6]: https://pkg.go.dev/cel.dev/cel-go