Skip to content

Commit 51a818d

Browse files
[protobuf] Update protobuf definitions to v1.37.0 (#480)
Signed-off-by: envoy-bot <envoy-bot@users.noreply.github.com> Co-authored-by: envoy-bot <envoy-bot@users.noreply.github.com>
1 parent 232b4bd commit 51a818d

99 files changed

Lines changed: 3273 additions & 689 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/src/main/proto/cel/expr/conformance/conformance_service.proto

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package cel.expr.conformance;
1919
import "cel/expr/checked.proto";
2020
import "cel/expr/eval.proto";
2121
import "cel/expr/syntax.proto";
22-
import "google/rpc/status.proto";
2322

2423
option cc_enable_arenas = true;
2524
option go_package = "cel.dev/expr/conformance";
@@ -69,7 +68,7 @@ message ParseResponse {
6968
cel.expr.ParsedExpr parsed_expr = 1;
7069

7170
// Any number of issues with [StatusDetails][] as the details.
72-
repeated google.rpc.Status issues = 2;
71+
cel.expr.ErrorSet issues = 2;
7372
}
7473

7574
// Request message for the Check method.
@@ -86,7 +85,7 @@ message CheckRequest {
8685
// Language Definition.
8786
string container = 3;
8887

89-
// If true, use only the declarations in [type_env][google.api.expr.conformance.v1alpha1.CheckRequest.type_env]. If false (default),
88+
// If true, use only the declarations in [type_env][cel.expr.conformance.CheckRequest.type_env]. If false (default),
9089
// add declarations for the standard definitions to the type environment. See
9190
// "Standard Definitions" in the Language Definition.
9291
bool no_std_env = 4;
@@ -98,7 +97,7 @@ message CheckResponse {
9897
cel.expr.CheckedExpr checked_expr = 1;
9998

10099
// Any number of issues with [StatusDetails][] as the details.
101-
repeated google.rpc.Status issues = 2;
100+
cel.expr.ErrorSet issues = 2;
102101
}
103102

104103
// Request message for the Eval method.
@@ -113,10 +112,10 @@ message EvalRequest {
113112
}
114113

115114
// Bindings for the external variables. The types SHOULD be compatible
116-
// with the type environment in [CheckRequest][google.api.expr.conformance.v1alpha1.CheckRequest], if checked.
115+
// with the type environment in [CheckRequest][cel.expr.conformance.CheckRequest], if checked.
117116
map<string, cel.expr.ExprValue> bindings = 3;
118117

119-
// SHOULD be the same container as used in [CheckRequest][google.api.expr.conformance.v1alpha1.CheckRequest], if checked.
118+
// SHOULD be the same container as used in [CheckRequest][cel.expr.conformance.CheckRequest], if checked.
120119
string container = 4;
121120
}
122121

@@ -129,7 +128,7 @@ message EvalResponse {
129128
// Note that CEL execution errors are reified into [ExprValue][].
130129
// Nevertheless, we'll allow out-of-band issues to be raised,
131130
// which also makes the replies more regular.
132-
repeated google.rpc.Status issues = 2;
131+
cel.expr.ErrorSet issues = 2;
133132
}
134133

135134
// A specific position in source.

api/src/main/proto/cel/expr/conformance/proto2/test_all_types.proto

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,25 @@ message TestAllTypes {
319319
optional string single_name = 405;
320320
}
321321

322+
// Field names formerly defined as reserved CEL identifiers.
323+
optional bool as = 500;
324+
optional bool break = 501;
325+
optional bool const = 502;
326+
optional bool continue = 503;
327+
optional bool else = 504;
328+
optional bool for = 505;
329+
optional bool function = 506;
330+
optional bool if = 507;
331+
optional bool import = 508;
332+
optional bool let = 509;
333+
optional bool loop = 510;
334+
optional bool package = 511;
335+
optional bool namespace = 512;
336+
optional bool return = 513;
337+
optional bool var = 514;
338+
optional bool void = 515;
339+
optional bool while = 516;
340+
322341
extensions 1000 to max;
323342
}
324343

api/src/main/proto/cel/expr/conformance/proto3/test_all_types.proto

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,25 @@ message TestAllTypes {
315315
NestedMessage oneof_msg = 401;
316316
bool oneof_bool = 402;
317317
}
318+
319+
// Field names formerly defined as reserved CEL identifiers.
320+
bool as = 500;
321+
bool break = 501;
322+
bool const = 502;
323+
bool continue = 503;
324+
bool else = 504;
325+
bool for = 505;
326+
bool function = 506;
327+
bool if = 507;
328+
bool import = 508;
329+
bool let = 509;
330+
bool loop = 510;
331+
bool package = 511;
332+
bool namespace = 512;
333+
bool return = 513;
334+
bool var = 514;
335+
bool void = 515;
336+
bool while = 516;
318337
}
319338

320339
// This proto includes a recursively nested message.

api/src/main/proto/envoy/admin/v3/server_info.proto

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ message ServerInfo {
5959
config.core.v3.Node node = 7;
6060
}
6161

62-
// [#next-free-field: 42]
62+
// [#next-free-field: 43]
6363
message CommandLineOptions {
6464
option (udpa.annotations.versioning).previous_message_type =
6565
"envoy.admin.v2alpha.CommandLineOptions";
@@ -161,6 +161,9 @@ message CommandLineOptions {
161161
// See :option:`--file-flush-interval-msec` for details.
162162
google.protobuf.Duration file_flush_interval = 16;
163163

164+
// See :option:`--file-flush-min-size-kb` for details.
165+
uint32 file_flush_min_size = 42;
166+
164167
// See :option:`--drain-time-s` for details.
165168
google.protobuf.Duration drain_time = 17;
166169

api/src/main/proto/envoy/config/accesslog/v3/accesslog.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ message ComparisonFilter {
108108

109109
// <=
110110
LE = 2;
111+
112+
// !=
113+
NE = 3;
111114
}
112115

113116
// Comparison operator.

0 commit comments

Comments
 (0)