workspace: update cel-go to 0.11.4
This allows us to remove a patch which has been upstreamed.
While I'm at it let's also drop the patch fixing up the googleapis
references and make Gazelle do the work as it does include the
necessary resolutions since 0.25.
Change-Id: I66d6dae609661c311911144b82807ebddd8f3805
Reviewed-on: https://review.monogon.dev/c/monogon/+/684
Reviewed-by: Mateusz Zalega <mateusz@monogon.tech>
diff --git a/go.mod b/go.mod
index 319d1c5..754231f 100644
--- a/go.mod
+++ b/go.mod
@@ -214,7 +214,7 @@
github.com/golang/mock v1.6.0 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/cadvisor v0.44.1 // indirect
- github.com/google/cel-go v0.10.1 // indirect
+ github.com/google/cel-go v0.11.4 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-dap v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
diff --git a/go.sum b/go.sum
index 4238804..c446ecd 100644
--- a/go.sum
+++ b/go.sum
@@ -228,8 +228,9 @@
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e h1:GCzyKMDDjSGnlpl3clrdAK7I1AaVoaiKDOYkUzChZzg=
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
+github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed h1:ue9pVfIcP+QMEjfgo/Ez4ZjNZfonGgR6NgjMaJMu1Cg=
+github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
github.com/apache/beam v2.28.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu/ACaQhYjeefzQ0y1o=
github.com/apache/beam v2.32.0+incompatible/go.mod h1:/8NX3Qi8vGstDLLaeaU7+lzVEu/ACaQhYjeefzQ0y1o=
@@ -882,8 +883,9 @@
github.com/google/cadvisor v0.38.6/go.mod h1:1OFB9sOOMkBdUBGCO/1SArawTnDscgMzTodacVDe8mA=
github.com/google/cadvisor v0.44.1 h1:hsAxDZOY+5xSCXH12d/G9cxYTfP+32cMT3J7aatrgDY=
github.com/google/cadvisor v0.44.1/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg=
-github.com/google/cel-go v0.10.1 h1:MQBGSZGnDwh7T/un+mzGKOMz3x+4E/GDPprWjDL+1Jg=
github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w=
+github.com/google/cel-go v0.11.4 h1:wWOnKmLxALl3l9Av221MfIOWRiR01sDVljzg6LZ6Zn0=
+github.com/google/cel-go v0.11.4/go.mod h1:Av7CU6r6X3YmcHR9GXqVDaEJYfEtSxl6wvIjUQTriCw=
github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA=
github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs=
@@ -2773,8 +2775,9 @@
google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e h1:gMjH4zLGs9m+dGzR7qHCHaXMOwsJHJKKkHtyXhtOrJk=
google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
diff --git a/third_party/go/patches/cel-fix-antlr.patch b/third_party/go/patches/cel-fix-antlr.patch
deleted file mode 100644
index 5c5636a..0000000
--- a/third_party/go/patches/cel-fix-antlr.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From a0f8916f104566a2538a70153c016de7c5d9f304 Mon Sep 17 00:00:00 2001
-From: Lorenz Brun <lorenz@monogon.tech>
-Date: Wed, 16 Mar 2022 18:54:11 +0100
-Subject: [PATCH] Use conventional import path for antlr
-
----
- WORKSPACE | 9 +++++----
- checker/BUILD.bazel | 2 +-
- parser/BUILD.bazel | 4 ++--
- parser/gen/BUILD.bazel | 2 +-
- 4 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/WORKSPACE b/WORKSPACE
-index 4238e7a..b62cf15 100644
---- a/WORKSPACE
-+++ b/WORKSPACE
-@@ -99,11 +99,12 @@ go_repository(
- version = "v0.3.2",
- )
-
--# Antlr deps to pickup golang concurrency fixes 4/30/2020
-+# Antlr deps
- go_repository(
-- name = "com_github_antlr",
-- commit = "621b933c7a7f01c67ae9de15103151fa0f9d6d90",
-- importpath = "github.com/antlr/antlr4",
-+ name = "com_github_antlr_antlr4_runtime_go_antlr",
-+ importpath = "github.com/antlr/antlr4/runtime/Go/antlr",
-+ sum = "h1:zvkJv+9Pxm1nnEMcKnShREt4qtduHKz4iw4AB4ul0Ao=",
-+ version = "v0.0.0-20220209173558-ad29539cd2e9",
- )
-
- # CEL Spec deps
-diff --git a/checker/BUILD.bazel b/checker/BUILD.bazel
-index 2ef326b..bec40b6 100644
---- a/checker/BUILD.bazel
-+++ b/checker/BUILD.bazel
-@@ -54,7 +54,7 @@ go_test(
- "//test:go_default_library",
- "//test/proto2pb:go_default_library",
- "//test/proto3pb:go_default_library",
-- "@com_github_antlr//runtime/Go/antlr:go_default_library",
-+ "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
- ],
- )
-diff --git a/parser/BUILD.bazel b/parser/BUILD.bazel
-index a1917b4..b76e6e4 100644
---- a/parser/BUILD.bazel
-+++ b/parser/BUILD.bazel
-@@ -23,7 +23,7 @@ go_library(
- "//common/operators:go_default_library",
- "//common/runes:go_default_library",
- "//parser/gen:go_default_library",
-- "@com_github_antlr//runtime/Go/antlr:go_default_library",
-+ "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library",
- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
-@@ -45,7 +45,7 @@ go_test(
- "//common/debug:go_default_library",
- "//parser/gen:go_default_library",
- "//test:go_default_library",
-- "@com_github_antlr//runtime/Go/antlr:go_default_library",
-+ "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
- ],
- )
-diff --git a/parser/gen/BUILD.bazel b/parser/gen/BUILD.bazel
-index 78e0432..2271131 100644
---- a/parser/gen/BUILD.bazel
-+++ b/parser/gen/BUILD.bazel
-@@ -21,6 +21,6 @@ go_library(
- ],
- importpath = "github.com/google/cel-go/parser/gen",
- deps = [
-- "@com_github_antlr//runtime/Go/antlr:go_default_library",
-+ "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library",
- ],
- )
---
-2.25.1
-
diff --git a/third_party/go/patches/cel-fix-googleapis.patch b/third_party/go/patches/cel-fix-googleapis.patch
deleted file mode 100644
index 64767ce..0000000
--- a/third_party/go/patches/cel-fix-googleapis.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 2e9547d93456722db9e4336ea0b2ab8dfc3f2ade Mon Sep 17 00:00:00 2001
-From: Lorenz Brun <lorenz@brun.one>
-Date: Mon, 21 Mar 2022 16:11:14 +0100
-Subject: [PATCH 2/2] Fix googleapis import paths
-
-Generated using this sed expression:
-s#@org_golang_google_genproto//googleapis/#@go_googleapis//google/#
----
- cel/BUILD.bazel | 4 ++--
- checker/BUILD.bazel | 2 +-
- checker/decls/BUILD.bazel | 2 +-
- common/BUILD.bazel | 2 +-
- common/containers/BUILD.bazel | 4 ++--
- common/debug/BUILD.bazel | 2 +-
- common/types/BUILD.bazel | 6 +++---
- common/types/pb/BUILD.bazel | 2 +-
- common/types/ref/BUILD.bazel | 2 +-
- ext/BUILD.bazel | 2 +-
- interpreter/BUILD.bazel | 4 ++--
- parser/BUILD.bazel | 2 +-
- server/BUILD.bazel | 12 ++++++------
- test/BUILD.bazel | 2 +-
- 14 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/cel/BUILD.bazel b/cel/BUILD.bazel
-index b43beed..aabc323 100644
---- a/cel/BUILD.bazel
-+++ b/cel/BUILD.bazel
-@@ -28,7 +28,7 @@ go_library(
- "//interpreter:go_default_library",
- "//interpreter/functions:go_default_library",
- "//parser:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//reflect/protodesc:go_default_library",
- "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
-@@ -64,8 +64,8 @@ go_test(
- "//test:go_default_library",
- "//test/proto2pb:go_default_library",
- "//test/proto3pb:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
- ],
- )
-diff --git a/checker/BUILD.bazel b/checker/BUILD.bazel
-index bec40b6..1deaba7 100644
---- a/checker/BUILD.bazel
-+++ b/checker/BUILD.bazel
-@@ -30,7 +30,7 @@ go_library(
- "//common/types/pb:go_default_library",
- "//common/types/ref:go_default_library",
- "//parser:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
-diff --git a/checker/decls/BUILD.bazel b/checker/decls/BUILD.bazel
-index 5a24f1d..de067ae 100644
---- a/checker/decls/BUILD.bazel
-+++ b/checker/decls/BUILD.bazel
-@@ -13,7 +13,7 @@ go_library(
- ],
- importpath = "github.com/google/cel-go/checker/decls",
- deps = [
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
- ],
-diff --git a/common/BUILD.bazel b/common/BUILD.bazel
-index a0058ae..3c1b00b 100644
---- a/common/BUILD.bazel
-+++ b/common/BUILD.bazel
-@@ -17,7 +17,7 @@ go_library(
- importpath = "github.com/google/cel-go/common",
- deps = [
- "//common/runes:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_x_text//width:go_default_library",
- ],
- )
-diff --git a/common/containers/BUILD.bazel b/common/containers/BUILD.bazel
-index 18142d9..7ab7767 100644
---- a/common/containers/BUILD.bazel
-+++ b/common/containers/BUILD.bazel
-@@ -12,7 +12,7 @@ go_library(
- ],
- importpath = "github.com/google/cel-go/common/containers",
- deps = [
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- ],
- )
-
-@@ -26,6 +26,6 @@ go_test(
- ":go_default_library",
- ],
- deps = [
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- ],
- )
-diff --git a/common/debug/BUILD.bazel b/common/debug/BUILD.bazel
-index cf5c5d2..07e48fe 100644
---- a/common/debug/BUILD.bazel
-+++ b/common/debug/BUILD.bazel
-@@ -13,6 +13,6 @@ go_library(
- importpath = "github.com/google/cel-go/common/debug",
- deps = [
- "//common:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- ],
- )
-diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel
-index 1f77c86..1847312 100644
---- a/common/types/BUILD.bazel
-+++ b/common/types/BUILD.bazel
-@@ -38,8 +38,8 @@ go_library(
- "//common/types/ref:go_default_library",
- "//common/types/traits:go_default_library",
- "@com_github_stoewer_go_strcase//:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-- "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
-+ "@go_googleapis//google/rpc:status_go_proto",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_google_protobuf//encoding/protojson:go_default_library",
-@@ -79,7 +79,7 @@ go_test(
- "//common/types/ref:go_default_library",
- "//test:go_default_library",
- "//test/proto3pb:test_all_types_go_proto",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//encoding/protojson:go_default_library",
- "@org_golang_google_protobuf//types/known/anypb:go_default_library",
- "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
-diff --git a/common/types/pb/BUILD.bazel b/common/types/pb/BUILD.bazel
-index f23ac9c..fc142f4 100644
---- a/common/types/pb/BUILD.bazel
-+++ b/common/types/pb/BUILD.bazel
-@@ -17,7 +17,7 @@ go_library(
- ],
- importpath = "github.com/google/cel-go/common/types/pb",
- deps = [
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//encoding/protowire:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
-diff --git a/common/types/ref/BUILD.bazel b/common/types/ref/BUILD.bazel
-index 1d0f468..73e84b3 100644
---- a/common/types/ref/BUILD.bazel
-+++ b/common/types/ref/BUILD.bazel
-@@ -13,7 +13,7 @@ go_library(
- ],
- importpath = "github.com/google/cel-go/common/types/ref",
- deps = [
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
- ],
-diff --git a/ext/BUILD.bazel b/ext/BUILD.bazel
-index 582a79a..1d186f8 100644
---- a/ext/BUILD.bazel
-+++ b/ext/BUILD.bazel
-@@ -20,7 +20,7 @@ go_library(
- "//common/types/ref:go_default_library",
- "//common/types/traits:go_default_library",
- "//interpreter/functions:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- ],
- )
-
-diff --git a/interpreter/BUILD.bazel b/interpreter/BUILD.bazel
-index 04a3ec7..5a31467 100644
---- a/interpreter/BUILD.bazel
-+++ b/interpreter/BUILD.bazel
-@@ -32,7 +32,7 @@ go_library(
- "//common/types/ref:go_default_library",
- "//common/types/traits:go_default_library",
- "//interpreter/functions:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
-@@ -65,7 +65,7 @@ go_test(
- "//test:go_default_library",
- "//test/proto2pb:go_default_library",
- "//test/proto3pb:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//types/known/anypb:go_default_library",
- ],
-diff --git a/parser/BUILD.bazel b/parser/BUILD.bazel
-index b76e6e4..3ff9ba3 100644
---- a/parser/BUILD.bazel
-+++ b/parser/BUILD.bazel
-@@ -24,7 +24,7 @@ go_library(
- "//common/runes:go_default_library",
- "//parser/gen:go_default_library",
- "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
- ],
-diff --git a/server/BUILD.bazel b/server/BUILD.bazel
-index 4629ca4..fddf409 100644
---- a/server/BUILD.bazel
-+++ b/server/BUILD.bazel
-@@ -18,9 +18,9 @@ go_library(
- "//common/types/ref:go_default_library",
- "@com_google_cel_spec//proto/test/v1/proto2:test_all_types_go_proto",
- "@com_google_cel_spec//proto/test/v1/proto3:test_all_types_go_proto",
-- "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-- "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
-+ "@go_googleapis//google/api/expr/conformance/v1alpha1:conformance_go_proto",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
-+ "@go_googleapis//google/rpc:status_go_proto",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- "@org_golang_google_protobuf//proto:go_default_library",
-@@ -41,8 +41,8 @@ go_test(
- "//common/operators:go_default_library",
- "//test:go_default_library",
- "@com_google_cel_spec//tools/celrpc:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-- "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
-+ "@go_googleapis//google/api/expr/conformance/v1alpha1:conformance_go_proto",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
-+ "@go_googleapis//google/rpc:status_go_proto",
- ],
- )
-diff --git a/test/BUILD.bazel b/test/BUILD.bazel
-index 057beaa..233dad7 100644
---- a/test/BUILD.bazel
-+++ b/test/BUILD.bazel
-@@ -21,7 +21,7 @@ go_library(
- importpath = "github.com/google/cel-go/test",
- deps = [
- "//common/operators:go_default_library",
-- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
- "@org_golang_google_protobuf//proto:go_default_library",
- "@org_golang_google_protobuf//types/known/structpb:go_default_library",
- ],
---
-2.25.1
-
diff --git a/third_party/go/repositories.bzl b/third_party/go/repositories.bzl
index 92ecee0..82da125 100644
--- a/third_party/go/repositories.bzl
+++ b/third_party/go/repositories.bzl
@@ -117,8 +117,8 @@
go_repository(
name = "com_github_antlr_antlr4_runtime_go_antlr",
importpath = "github.com/antlr/antlr4/runtime/Go/antlr",
- sum = "h1:GCzyKMDDjSGnlpl3clrdAK7I1AaVoaiKDOYkUzChZzg=",
- version = "v0.0.0-20210826220005-b48c857c3a0e",
+ sum = "h1:ue9pVfIcP+QMEjfgo/Ez4ZjNZfonGgR6NgjMaJMu1Cg=",
+ version = "v0.0.0-20220418222510-f25a4f6275ed",
)
go_repository(
@@ -1649,15 +1649,15 @@
)
go_repository(
name = "com_github_google_cel_go",
+ # Gazelle needs to regenerate the upstream build files due to a
+ # mismatch in how the Google APIs repository is canonically called.
+ # See https://github.com/bazelbuild/rules_go/issues/1986 for more
+ # details.
+ build_file_generation = "on",
build_naming_convention = "go_default_library",
importpath = "github.com/google/cel-go",
- patch_args = ["-p1"],
- pre_patches = [
- "//third_party/go/patches:cel-fix-antlr.patch",
- "//third_party/go/patches:cel-fix-googleapis.patch",
- ],
- sum = "h1:MQBGSZGnDwh7T/un+mzGKOMz3x+4E/GDPprWjDL+1Jg=",
- version = "v0.10.1",
+ sum = "h1:wWOnKmLxALl3l9Av221MfIOWRiR01sDVljzg6LZ6Zn0=",
+ version = "v0.11.4",
)
go_repository(
name = "com_github_google_cel_spec",
@@ -4921,8 +4921,8 @@
go_repository(
name = "org_golang_google_genproto",
importpath = "google.golang.org/genproto",
- sum = "h1:gMjH4zLGs9m+dGzR7qHCHaXMOwsJHJKKkHtyXhtOrJk=",
- version = "v0.0.0-20220429170224-98d788798c3e",
+ sum = "h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I=",
+ version = "v0.0.0-20220502173005-c8bf987b8c21",
)
go_repository(
name = "org_golang_google_grpc",