Break the world

Historically C++ was implemented using the unversioned protobuf descriptors. It eventually included a mix of the versioned variant. When moving to OSS, unversioned protobuf descriptors were rewritten to the versioned variant unconditionally. This has created a bit of a conundrum, now that their is an unversioned canonical protobuf descriptor in cel-spec. We have decided to bit the bullet and break the world. The versioned and unversioned protobuf descriptors are wire compatible, so if you run into issues you can serialize and parse to convert between the two.

PiperOrigin-RevId: 689784464

Author: jcking

base/ast_internal/expr.h

@@ -575,7 +575,7 @@ using TypeKind =
                   absl::Nullable<std::unique_ptr<Type>>, ErrorType,
                   AbstractType>;
 
-// Analogous to google::api::expr::v1alpha1::Type.
+// Analogous to cel::expr::Type.
 // Represents a CEL type.
 //
 // TODO: align with value.proto

bazel/deps.bzl

@@ -142,10 +142,10 @@ def cel_spec_deps():
         url = "https://github.com/bazelbuild/rules_python/releases/download/0.33.2/rules_python-0.33.2.tar.gz",
     )
 
-    CEL_SPEC_GIT_SHA = "f027a86d2e5bf18f796be0c4373f637a61041cde"  # Aug 23, 2024
+    CEL_SPEC_GIT_SHA = "373994d7e20e582fce56767b01ac5039524cddab"  # Oct 23, 2024
     http_archive(
         name = "com_google_cel_spec",
-        sha256 = "006594fa4f97819a4e4cd98404e4522f5f46ed5ac65402b354649bcc871b0cf2",
+        sha256 = "b498a768140fc0ed0314eef8b2519a48287661d09ca15b17c8ca34088af6aac3",
         strip_prefix = "cel-spec-" + CEL_SPEC_GIT_SHA,
         urls = ["https://github.com/google/cel-spec/archive/" + CEL_SPEC_GIT_SHA + ".zip"],
     )

checker/internal/BUILD

@@ -175,8 +175,8 @@ cc_test(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:status_matchers",
         "@com_google_absl//absl/strings",
-        "@com_google_cel_spec//proto/test/v1/proto2:test_all_types_cc_proto",
-        "@com_google_cel_spec//proto/test/v1/proto3:test_all_types_cc_proto",
+        "@com_google_cel_spec//proto/cel/expr/conformance/proto2:test_all_types_cc_proto",
+        "@com_google_cel_spec//proto/cel/expr/conformance/proto3:test_all_types_cc_proto",
         "@com_google_protobuf//:protobuf",
     ],
 )

checker/internal/type_checker_impl_test.cc

@@ -81,7 +81,7 @@ TEST(OptionalTest, OptSelectDoesNotAnnotateFieldType) {
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
   ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
   ASSERT_THAT(builder.AddLibrary(OptionalCheckerLibrary()), IsOk());
-  builder.set_container("google.api.expr.test.v1.proto3");
+  builder.set_container("cel.expr.conformance.proto3");
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<TypeChecker> checker,
                        std::move(builder).Build());
 
@@ -227,10 +227,10 @@ INSTANTIATE_TEST_SUITE_P(
                      new AstType(ast_internal::PrimitiveType::kString)))))},
         TestCase{"['v1', ?'v2']", _,
                  "expected type 'optional_type<string>' but found 'string'"},
-        TestCase{"google.api.expr.test.v1.proto3.TestAllTypes{?single_int64: "
+        TestCase{"cel.expr.conformance.proto3.TestAllTypes{?single_int64: "
                  "optional.of(1)}",
                  Eq(AstType(ast_internal::MessageType(
-                     "google.api.expr.test.v1.proto3.TestAllTypes")))},
+                     "cel.expr.conformance.proto3.TestAllTypes")))},
         TestCase{"[0][?1]",
                  IsOptionalType(AstType(ast_internal::PrimitiveType::kInt64))},
         TestCase{"[[0]][?1][?1]",
@@ -250,19 +250,18 @@ INSTANTIATE_TEST_SUITE_P(
         TestCase{"optional.of('abc').optFlatMap(x, optional.of(x + 'def'))",
                  IsOptionalType(AstType(ast_internal::PrimitiveType::kString))},
         // Legacy nullability behaviors.
-        TestCase{"google.api.expr.test.v1.proto3.TestAllTypes{?null_value: "
+        TestCase{"cel.expr.conformance.proto3.TestAllTypes{?null_value: "
                  "optional.of(0)}",
                  Eq(AstType(ast_internal::MessageType(
-                     "google.api.expr.test.v1.proto3.TestAllTypes")))},
-        TestCase{
-            "google.api.expr.test.v1.proto3.TestAllTypes{?null_value: null}",
-            Eq(AstType(ast_internal::MessageType(
-                "google.api.expr.test.v1.proto3.TestAllTypes")))},
-        TestCase{"google.api.expr.test.v1.proto3.TestAllTypes{?null_value: "
+                     "cel.expr.conformance.proto3.TestAllTypes")))},
+        TestCase{"cel.expr.conformance.proto3.TestAllTypes{?null_value: null}",
+                 Eq(AstType(ast_internal::MessageType(
+                     "cel.expr.conformance.proto3.TestAllTypes")))},
+        TestCase{"cel.expr.conformance.proto3.TestAllTypes{?null_value: "
                  "optional.of(null)}",
                  Eq(AstType(ast_internal::MessageType(
-                     "google.api.expr.test.v1.proto3.TestAllTypes")))},
-        TestCase{"google.api.expr.test.v1.proto3.TestAllTypes{}.?single_int64 "
+                     "cel.expr.conformance.proto3.TestAllTypes")))},
+        TestCase{"cel.expr.conformance.proto3.TestAllTypes{}.?single_int64 "
                  "== null",
                  Eq(AstType(ast_internal::PrimitiveType::kBool))}));
 
@@ -311,11 +310,10 @@ INSTANTIATE_TEST_SUITE_P(
     OptionalTests, OptionalStrictNullAssignmentTest,
     ::testing::Values(
         TestCase{
-            "google.api.expr.test.v1.proto3.TestAllTypes{?single_int64: null}",
-            _,
+            "cel.expr.conformance.proto3.TestAllTypes{?single_int64: null}", _,
             "expected type of field 'single_int64' is 'optional_type<int>' but "
             "provided type is 'null_type'"},
-        TestCase{"google.api.expr.test.v1.proto3.TestAllTypes{}.?single_int64 "
+        TestCase{"cel.expr.conformance.proto3.TestAllTypes{}.?single_int64 "
                  "== null",
                  _, "no matching overload for '_==_'"}));
 

checker/optional_test.cc

@@ -48,7 +48,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
-        "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
+        "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -80,7 +80,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
-        "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
+        "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
         "@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
         "@com_google_protobuf//:protobuf",
     ],

codelab/BUILD

@@ -17,7 +17,7 @@
 #include <memory>
 #include <string>
 
-#include "google/api/expr/v1alpha1/syntax.pb.h"
+#include "proto/cel/expr/syntax.pb.h"
 #include "google/protobuf/arena.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
@@ -54,7 +54,7 @@ absl::StatusOr<std::string> ConvertResult(const CelValue& value) {
 absl::StatusOr<std::string> ParseAndEvaluate(absl::string_view cel_expr) {
   // === Start Codelab ===
   // Parse the expression using ::google::api::expr::parser::Parse;
-  // This will return a google::api::expr::v1alpha1::ParsedExpr message.
+  // This will return a cel::expr::ParsedExpr message.
 
   // Setup a default environment for building expressions.
   // std::unique_ptr<CelExpressionBuilder> builder =

codelab/exercise1.cc

@@ -17,7 +17,7 @@
 #include <memory>
 #include <string>
 
-#include "google/api/expr/v1alpha1/syntax.pb.h"
+#include "proto/cel/expr/syntax.pb.h"
 #include "google/rpc/context/attribute_context.pb.h"
 #include "google/protobuf/arena.h"
 #include "absl/status/status.h"
@@ -35,7 +35,7 @@
 namespace google::api::expr::codelab {
 namespace {
 
-using ::google::api::expr::v1alpha1::ParsedExpr;
+using ::cel::expr::ParsedExpr;
 using ::google::api::expr::parser::Parse;
 using ::google::api::expr::runtime::Activation;
 using ::google::api::expr::runtime::CelError;

codelab/exercise2.cc

@@ -32,7 +32,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
-        "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
+        "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -63,7 +63,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
-        "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
+        "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
         "@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
         "@com_google_protobuf//:protobuf",
     ],

codelab/solutions/BUILD

@@ -17,7 +17,7 @@
 #include <memory>
 #include <string>
 
-#include "google/api/expr/v1alpha1/syntax.pb.h"
+#include "proto/cel/expr/syntax.pb.h"
 #include "google/protobuf/arena.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
@@ -34,7 +34,7 @@
 namespace google::api::expr::codelab {
 namespace {
 
-using ::google::api::expr::v1alpha1::ParsedExpr;
+using ::cel::expr::ParsedExpr;
 using ::google::api::expr::parser::Parse;
 using ::google::api::expr::runtime::Activation;
 using ::google::api::expr::runtime::CelExpression;