Switch google/api/expr/v1alpha protos to canonical dev/cel/expr protos

PiperOrigin-RevId: 509689149

Author: l46kok

WORKSPACE

@@ -128,3 +128,23 @@ http_archive(
     strip_prefix = "bazel-common-%s" % BAZEL_COMMON_TAG,
     url = "https://github.com/google/bazel-common/archive/%s.tar.gz" % BAZEL_COMMON_TAG,
 )
+
+# cel-spec api/expr canonical protos
+http_archive(
+    name = "cel_spec",
+    sha256 = "dca9a2e71bda5fadbc9292a533f2ee6d200e9395a6f3632ed18c80b1c6ff7ac0",
+    strip_prefix = "cel-spec-d10463e91785b042b041bce39941c86769e56fd4",
+    urls = [
+        "https://github.com/google/cel-spec/archive/d10463e91785b042b041bce39941c86769e56fd4.tar.gz",
+    ],
+)
+
+# required by cel_spec
+http_archive(
+    name = "io_bazel_rules_go",
+    sha256 = "19ef30b21eae581177e0028f6f4b1f54c66467017be33d211ab6fc81da01ea4d",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip",
+    ],
+)

common/src/main/java/dev/cel/common/BUILD.bazel

@@ -25,7 +25,7 @@ java_library(
         "//common/src/main/java/dev/cel/common/types",
         "//common/src/main/java/dev/cel/common/types:cel_types",
         "//common/src/main/java/dev/cel/common/types:type_providers",
-        "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
+        "@cel_spec//proto/expr:expr_java_proto",
         "@com_google_protobuf//:protobuf_java",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",

common/src/main/java/dev/cel/common/CelAbstractSyntaxTree.java

@@ -17,11 +17,11 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 
-import com.google.api.expr.v1alpha1.CheckedExpr;
-import com.google.api.expr.v1alpha1.Expr;
-import com.google.api.expr.v1alpha1.ParsedExpr;
-import com.google.api.expr.v1alpha1.SourceInfo;
-import com.google.api.expr.v1alpha1.Type;
+import dev.cel.expr.CheckedExpr;
+import dev.cel.expr.Expr;
+import dev.cel.expr.ParsedExpr;
+import dev.cel.expr.SourceInfo;
+import dev.cel.expr.Type;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.annotations.CheckReturnValue;

common/src/main/java/dev/cel/common/ast/BUILD.bazel

@@ -34,7 +34,7 @@ java_library(
     srcs = EXPR_CONVERTER_SOURCES,
     deps = [
         ":ast",
-        "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
+        "@cel_spec//proto/expr:expr_java_proto",
         "@maven//:com_google_guava_guava",
     ],
 )

common/src/main/java/dev/cel/common/ast/CelExprConverter.java

@@ -14,15 +14,15 @@
 
 package dev.cel.common.ast;
 
-import com.google.api.expr.v1alpha1.Constant;
-import com.google.api.expr.v1alpha1.Expr;
-import com.google.api.expr.v1alpha1.Expr.Call;
-import com.google.api.expr.v1alpha1.Expr.Comprehension;
-import com.google.api.expr.v1alpha1.Expr.CreateList;
-import com.google.api.expr.v1alpha1.Expr.CreateStruct;
-import com.google.api.expr.v1alpha1.Expr.CreateStruct.Entry;
-import com.google.api.expr.v1alpha1.Expr.Select;
-import com.google.api.expr.v1alpha1.Reference;
+import dev.cel.expr.Constant;
+import dev.cel.expr.Expr;
+import dev.cel.expr.Expr.Call;
+import dev.cel.expr.Expr.Comprehension;
+import dev.cel.expr.Expr.CreateList;
+import dev.cel.expr.Expr.CreateStruct;
+import dev.cel.expr.Expr.CreateStruct.Entry;
+import dev.cel.expr.Expr.Select;
+import dev.cel.expr.Reference;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.UnsignedLong;
 import java.util.Optional;

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -20,7 +20,7 @@ java_library(
     deps = [
         "//:auto_value",
         "//common/src/main/java/dev/cel/common/annotations",
-        "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
+        "@cel_spec//proto/expr:expr_java_proto",
         "@com_google_protobuf//:protobuf_java",
         "@com_google_protobuf//:struct_proto",
         "@maven//:com_google_errorprone_error_prone_annotations",
@@ -72,7 +72,7 @@ java_library(
         "//common/src/main/java/dev/cel/common",
         "//common/src/main/java/dev/cel/common/annotations",
         "//common/src/main/java/dev/cel/common/types:cel_types",
-        "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
+        "@cel_spec//proto/expr:expr_java_proto",
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:protobuf_java",

common/src/main/java/dev/cel/common/internal/Constants.java

@@ -18,7 +18,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import com.google.api.expr.v1alpha1.Constant;
+import dev.cel.expr.Constant;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.UnsignedLong;
 import com.google.protobuf.ByteString;

common/src/main/java/dev/cel/common/internal/ProtoAdapter.java

@@ -18,7 +18,7 @@
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static java.util.Arrays.stream;
 
-import com.google.api.expr.v1alpha1.ExprValue;
+import dev.cel.expr.ExprValue;
 import javax.annotation.concurrent.ThreadSafe;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

common/src/main/java/dev/cel/common/types/BUILD.bazel

@@ -45,7 +45,7 @@ java_library(
         ":type_providers",
         ":types",
         "//common/src/main/java/dev/cel/common/annotations",
-        "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
+        "@cel_spec//proto/expr:expr_java_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:protobuf_java",
         "@com_google_protobuf//:struct_proto",

common/src/main/java/dev/cel/common/types/CelTypes.java

@@ -16,9 +16,9 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 
-import com.google.api.expr.v1alpha1.Type;
-import com.google.api.expr.v1alpha1.Type.PrimitiveType;
-import com.google.api.expr.v1alpha1.Type.WellKnownType;
+import dev.cel.expr.Type;
+import dev.cel.expr.Type.PrimitiveType;
+import dev.cel.expr.Type.WellKnownType;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;