Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / 110434116ae3c5c8c3cb0f23f97aa3c26171a037 / . / third_party / go / patches / cel-fix-googleapis.patch
blob: 64767cebf721832ba1a4a25431c5a4e300e57fca [file] [log] [blame]
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]1From 2e9547d93456722db9e4336ea0b2ab8dfc3f2ade Mon Sep 17 00:00:00 2001
2From: Lorenz Brun <lorenz@brun.one>
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]3Date: Mon, 21 Mar 2022 16:11:14 +0100
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]4Subject: [PATCH 2/2] Fix googleapis import paths
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]5
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]6Generated using this sed expression:
7s#@org_golang_google_genproto//googleapis/#@go_googleapis//google/#
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]8---
9 cel/BUILD.bazel | 4 ++--
10 checker/BUILD.bazel | 2 +-
11 checker/decls/BUILD.bazel | 2 +-
12 common/BUILD.bazel | 2 +-
13 common/containers/BUILD.bazel | 4 ++--
14 common/debug/BUILD.bazel | 2 +-
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]15 common/types/BUILD.bazel | 6 +++---
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]16 common/types/pb/BUILD.bazel | 2 +-
17 common/types/ref/BUILD.bazel | 2 +-
18 ext/BUILD.bazel | 2 +-
19 interpreter/BUILD.bazel | 4 ++--
20 parser/BUILD.bazel | 2 +-
21 server/BUILD.bazel | 12 ++++++------
22 test/BUILD.bazel | 2 +-
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]23 14 files changed, 24 insertions(+), 24 deletions(-)
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]24
25diff --git a/cel/BUILD.bazel b/cel/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]26index b43beed..aabc323 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]27--- a/cel/BUILD.bazel
28+++ b/cel/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]29@@ -28,7 +28,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]30 "//interpreter:go_default_library",
31 "//interpreter/functions:go_default_library",
32 "//parser:go_default_library",
33- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
34+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
35 "@org_golang_google_protobuf//proto:go_default_library",
36 "@org_golang_google_protobuf//reflect/protodesc:go_default_library",
37 "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]38@@ -64,8 +64,8 @@ go_test(
39 "//test:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]40 "//test/proto2pb:go_default_library",
41 "//test/proto3pb:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]42+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]43 "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
44- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]45 "@org_golang_google_protobuf//types/known/structpb:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]46 ],
47 )
48diff --git a/checker/BUILD.bazel b/checker/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]49index bec40b6..1deaba7 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]50--- a/checker/BUILD.bazel
51+++ b/checker/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]52@@ -30,7 +30,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]53 "//common/types/pb:go_default_library",
54 "//common/types/ref:go_default_library",
55 "//parser:go_default_library",
56- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
57+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
58 "@org_golang_google_protobuf//proto:go_default_library",
59 "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
60 "@org_golang_google_protobuf//types/known/structpb:go_default_library",
61diff --git a/checker/decls/BUILD.bazel b/checker/decls/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]62index 5a24f1d..de067ae 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]63--- a/checker/decls/BUILD.bazel
64+++ b/checker/decls/BUILD.bazel
65@@ -13,7 +13,7 @@ go_library(
66 ],
67 importpath = "github.com/google/cel-go/checker/decls",
68 deps = [
69- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
70+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
71 "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
72 "@org_golang_google_protobuf//types/known/structpb:go_default_library",
73 ],
74diff --git a/common/BUILD.bazel b/common/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]75index a0058ae..3c1b00b 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]76--- a/common/BUILD.bazel
77+++ b/common/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]78@@ -17,7 +17,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]79 importpath = "github.com/google/cel-go/common",
80 deps = [
81 "//common/runes:go_default_library",
82- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
83+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
84 "@org_golang_x_text//width:go_default_library",
85 ],
86 )
87diff --git a/common/containers/BUILD.bazel b/common/containers/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]88index 18142d9..7ab7767 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]89--- a/common/containers/BUILD.bazel
90+++ b/common/containers/BUILD.bazel
91@@ -12,7 +12,7 @@ go_library(
92 ],
93 importpath = "github.com/google/cel-go/common/containers",
94 deps = [
95- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
96+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
97 ],
98 )
99
100@@ -26,6 +26,6 @@ go_test(
101 ":go_default_library",
102 ],
103 deps = [
104- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
105+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
106 ],
107 )
108diff --git a/common/debug/BUILD.bazel b/common/debug/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]109index cf5c5d2..07e48fe 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]110--- a/common/debug/BUILD.bazel
111+++ b/common/debug/BUILD.bazel
112@@ -13,6 +13,6 @@ go_library(
113 importpath = "github.com/google/cel-go/common/debug",
114 deps = [
115 "//common:go_default_library",
116- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
117+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
118 ],
119 )
120diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]121index 1f77c86..1847312 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]122--- a/common/types/BUILD.bazel
123+++ b/common/types/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]124@@ -38,8 +38,8 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]125 "//common/types/ref:go_default_library",
126 "//common/types/traits:go_default_library",
127 "@com_github_stoewer_go_strcase//:go_default_library",
128- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]129- "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]130+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]131+ "@go_googleapis//google/rpc:status_go_proto",
132 "@org_golang_google_grpc//codes:go_default_library",
133 "@org_golang_google_grpc//status:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]134 "@org_golang_google_protobuf//encoding/protojson:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]135@@ -79,7 +79,7 @@ go_test(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]136 "//common/types/ref:go_default_library",
137 "//test:go_default_library",
138 "//test/proto3pb:test_all_types_go_proto",
139- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
140+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
141 "@org_golang_google_protobuf//encoding/protojson:go_default_library",
142 "@org_golang_google_protobuf//types/known/anypb:go_default_library",
143 "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
144diff --git a/common/types/pb/BUILD.bazel b/common/types/pb/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]145index f23ac9c..fc142f4 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]146--- a/common/types/pb/BUILD.bazel
147+++ b/common/types/pb/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]148@@ -17,7 +17,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]149 ],
150 importpath = "github.com/google/cel-go/common/types/pb",
151 deps = [
152- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
153+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]154 "@org_golang_google_protobuf//encoding/protowire:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]155 "@org_golang_google_protobuf//proto:go_default_library",
156 "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]157diff --git a/common/types/ref/BUILD.bazel b/common/types/ref/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]158index 1d0f468..73e84b3 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]159--- a/common/types/ref/BUILD.bazel
160+++ b/common/types/ref/BUILD.bazel
161@@ -13,7 +13,7 @@ go_library(
162 ],
163 importpath = "github.com/google/cel-go/common/types/ref",
164 deps = [
165- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
166+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
167 "@org_golang_google_protobuf//proto:go_default_library",
168 "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
169 ],
170diff --git a/ext/BUILD.bazel b/ext/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]171index 582a79a..1d186f8 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]172--- a/ext/BUILD.bazel
173+++ b/ext/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]174@@ -20,7 +20,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]175 "//common/types/ref:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]176 "//common/types/traits:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]177 "//interpreter/functions:go_default_library",
178- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
179+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
180 ],
181 )
182
183diff --git a/interpreter/BUILD.bazel b/interpreter/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]184index 04a3ec7..5a31467 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]185--- a/interpreter/BUILD.bazel
186+++ b/interpreter/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]187@@ -32,7 +32,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]188 "//common/types/ref:go_default_library",
189 "//common/types/traits:go_default_library",
190 "//interpreter/functions:go_default_library",
191- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
192+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
193 "@org_golang_google_protobuf//proto:go_default_library",
194 "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
195 "@org_golang_google_protobuf//types/known/structpb:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]196@@ -65,7 +65,7 @@ go_test(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]197 "//test:go_default_library",
198 "//test/proto2pb:go_default_library",
199 "//test/proto3pb:go_default_library",
200- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
201+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
202 "@org_golang_google_protobuf//proto:go_default_library",
203 "@org_golang_google_protobuf//types/known/anypb:go_default_library",
204 ],
205diff --git a/parser/BUILD.bazel b/parser/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]206index b76e6e4..3ff9ba3 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]207--- a/parser/BUILD.bazel
208+++ b/parser/BUILD.bazel
209@@ -24,7 +24,7 @@ go_library(
210 "//common/runes:go_default_library",
211 "//parser/gen:go_default_library",
212 "@com_github_antlr_antlr4_runtime_go_antlr//:go_default_library",
213- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
214+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
215 "@org_golang_google_protobuf//proto:go_default_library",
216 "@org_golang_google_protobuf//types/known/structpb:go_default_library",
217 ],
218diff --git a/server/BUILD.bazel b/server/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]219index 4629ca4..fddf409 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]220--- a/server/BUILD.bazel
221+++ b/server/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]222@@ -18,9 +18,9 @@ go_library(
223 "//common/types/ref:go_default_library",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]224 "@com_google_cel_spec//proto/test/v1/proto2:test_all_types_go_proto",
225 "@com_google_cel_spec//proto/test/v1/proto3:test_all_types_go_proto",
226- "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
227- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
228- "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
229+ "@go_googleapis//google/api/expr/conformance/v1alpha1:conformance_go_proto",
230+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]231+ "@go_googleapis//google/rpc:status_go_proto",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]232 "@org_golang_google_grpc//codes:go_default_library",
233 "@org_golang_google_grpc//status:go_default_library",
234 "@org_golang_google_protobuf//proto:go_default_library",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]235@@ -41,8 +41,8 @@ go_test(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]236 "//common/operators:go_default_library",
237 "//test:go_default_library",
238 "@com_google_cel_spec//tools/celrpc:go_default_library",
239- "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
240- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
241- "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
242+ "@go_googleapis//google/api/expr/conformance/v1alpha1:conformance_go_proto",
243+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]244+ "@go_googleapis//google/rpc:status_go_proto",
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]245 ],
246 )
247diff --git a/test/BUILD.bazel b/test/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]248index 057beaa..233dad7 100644
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]249--- a/test/BUILD.bazel
250+++ b/test/BUILD.bazel
Lorenz Brunf2b7ab62022-05-04 19:06:00 +0200[diff] [blame]251@@ -21,7 +21,7 @@ go_library(
Lorenz Brund13c1c62022-03-30 19:58:58 +0200[diff] [blame]252 importpath = "github.com/google/cel-go/test",
253 deps = [
254 "//common/operators:go_default_library",
255- "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
256+ "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
257 "@org_golang_google_protobuf//proto:go_default_library",
258 "@org_golang_google_protobuf//types/known/structpb:go_default_library",
259 ],
260--
2612.25.1
262