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