[protobuf] Update protobuf definitions to v1.33.0 (#449)

Signed-off-by: envoy-bot <[email protected]>
Co-authored-by: envoy-bot <[email protected]>

Author: github-actions[bot]

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

@@ -1,9 +1,25 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 syntax = "proto2";
 
 package cel.expr.conformance.proto2;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/field_mask.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
@@ -65,6 +81,8 @@ message TestAllTypes {
   optional google.protobuf.ListValue list_value = 114;
   optional google.protobuf.NullValue null_value = 115;
   optional google.protobuf.NullValue optional_null_value = 116;
+  optional google.protobuf.FieldMask field_mask = 117;
+  optional google.protobuf.Empty empty = 118;
 
   // Nested messages
   oneof nested_type {
@@ -286,6 +304,19 @@ message TestAllTypes {
   map<string, google.protobuf.StringValue> map_string_string_wrapper = 321;
   map<string, google.protobuf.BoolValue> map_string_bool_wrapper = 322;
   map<string, google.protobuf.BytesValue> map_string_bytes_wrapper = 323;
+
+  oneof kind {
+    NestedTestAllTypes oneof_type = 400;
+    NestedMessage oneof_msg = 401;
+    bool oneof_bool = 402;
+  }
+
+  optional group NestedGroup = 403 {
+    optional int32 single_id = 404;
+    optional string single_name = 405;
+  }
+
+  extensions 1000 to max;
 }
 
 // This proto includes a recursively nested message.

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

@@ -0,0 +1,44 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+package cel.expr.conformance.proto2;
+
+import "cel/expr/conformance/proto2/test_all_types.proto";
+
+option cc_enable_arenas = true;
+option go_package = "cel.dev/expr/conformance/proto2";
+option java_outer_classname = "TestAllTypesExtensions";
+option java_package = "dev.cel.expr.conformance.proto2";
+option java_multiple_files = true;
+
+// Package scoped extensions
+extend TestAllTypes {
+  optional int32 int32_ext = 1000;
+  optional TestAllTypes nested_ext = 1001;
+  optional TestAllTypes test_all_types_ext = 1002;
+  optional TestAllTypes.NestedEnum nested_enum_ext = 1003;
+  repeated TestAllTypes repeated_test_all_types = 1004;
+}
+
+// Message scoped extensions
+message Proto2ExtensionScopedMessage {
+  extend TestAllTypes {
+    optional int64 int64_ext = 1005;
+    optional TestAllTypes message_scoped_nested_ext = 1006;
+    optional TestAllTypes.NestedEnum nested_enum_ext = 1007;
+    repeated TestAllTypes message_scoped_repeated_test_all_types = 1008;
+  }
+}

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

@@ -1,9 +1,25 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 syntax = "proto3";
 
 package cel.expr.conformance.proto3;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/field_mask.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
@@ -46,6 +62,8 @@ message TestAllTypes {
   bool single_bool = 13;
   string single_string = 14;
   bytes single_bytes = 15;
+  optional bool optional_bool = 16;
+  optional bool optional_string = 17;
 
   // Wellknown.
   google.protobuf.Any single_any = 100;
@@ -65,6 +83,8 @@ message TestAllTypes {
   google.protobuf.ListValue list_value = 114;
   google.protobuf.NullValue null_value = 115;
   optional google.protobuf.NullValue optional_null_value = 116;
+  google.protobuf.FieldMask field_mask = 117;
+  google.protobuf.Empty empty = 118;
 
   // Nested messages
   oneof nested_type {
@@ -286,6 +306,12 @@ message TestAllTypes {
   map<string, google.protobuf.StringValue> map_string_string_wrapper = 321;
   map<string, google.protobuf.BoolValue> map_string_bool_wrapper = 322;
   map<string, google.protobuf.BytesValue> map_string_bytes_wrapper = 323;
+
+  oneof kind {
+    NestedTestAllTypes oneof_type = 400;
+    NestedMessage oneof_msg = 401;
+    bool oneof_bool = 402;
+  }
 }
 
 // This proto includes a recursively nested message.

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

@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 syntax = "proto3";
 
-package cel.expr.conformance;
+package cel.expr.conformance.test;
 
 import "cel/expr/checked.proto";
 import "cel/expr/eval.proto";
 import "cel/expr/value.proto";
 
 option cc_enable_arenas = true;
-option go_package = "cel.dev/expr/conformance";
+option go_package = "cel.dev/expr/conformance/test";
 option java_multiple_files = true;
 option java_outer_classname = "SimpleProto";
-option java_package = "dev.cel.expr.conformance";
+option java_package = "dev.cel.expr.conformance.test";
 
 // The format of a simple test file, expected to be stored in text format.
 // A file is the unit of granularity for selecting conformance tests,
@@ -76,6 +76,9 @@ message SimpleTest {
   // Disables the check phase.
   bool disable_check = 5;
 
+  // Disables the evaluate phase.
+  bool check_only = 15;
+
   // The type environment to use for the check phase.
   repeated cel.expr.Decl type_env = 6;
 
@@ -97,6 +100,9 @@ message SimpleTest {
     // *   a floating point NaN should match any NaN.
     cel.expr.Value value = 8;
 
+    // A result and deduced expression type.
+    TypedResult typed_result = 16;
+
     // Matches error evaluation results.
     cel.expr.ErrorSet eval_error = 9;
 
@@ -111,7 +117,17 @@ message SimpleTest {
     // (Using explicit message since oneof can't handle repeated.)
     UnknownSetMatcher any_unknowns = 12;
   }
-  // Next is 15.
+  // Next is 17.
+}
+
+// Matches a result along with deduced expression type.
+message TypedResult {
+  // A normal value, which must match the evaluation result exactly
+  // via value equality semantics. This is ignored if the test is `check_only`.
+  cel.expr.Value result = 1;
+
+  // The deduced type of the expression as reported by the checker.
+  cel.expr.Type deduced_type = 2;
 }
 
 // Matches error results from Eval.

api/src/main/proto/cel/expr/conformance/simple.proto renamed to api/src/main/proto/cel/expr/conformance/test/simple.proto

@@ -216,13 +216,12 @@ message Expr {
   // ```
   message Comprehension {
     // The name of the first iteration variable.
-    // When the iter_range is a list, this variable is the list element.
-    // When the iter_range is a map, this variable is the map entry key.
+    // For the single iteration variable macros, when iter_range is a list, this
+    // variable is the list element and when the iter_range is a map, this
+    // variable is the map key.
     string iter_var = 1;
 
     // The name of the second iteration variable, empty if not set.
-    // When the iter_range is a list, this variable is the integer index.
-    // When the iter_range is a map, this variable is the map entry value.
     // This field is only set for comprehension v2 macros.
     string iter_var2 = 8;
 

api/src/main/proto/cel/expr/syntax.proto

@@ -39,6 +39,14 @@ enum ClientResourceStatus {
 
   // Client received this resource and replied with NACK.
   NACKED = 4;
+
+  // Client received an error from the control plane. The attached config
+  // dump is the most recent accepted one. If no config is accepted yet,
+  // the attached config dump will be empty.
+  RECEIVED_ERROR = 5;
+
+  // Client timed out waiting for the resource from the control plane.
+  TIMEOUT = 6;
 }
 
 message UpdateFailureState {

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

@@ -59,7 +59,7 @@ message ServerInfo {
   config.core.v3.Node node = 7;
 }
 
-// [#next-free-field: 41]
+// [#next-free-field: 42]
 message CommandLineOptions {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.admin.v2alpha.CommandLineOptions";
@@ -125,6 +125,9 @@ message CommandLineOptions {
   // See :option:`--ignore-unknown-dynamic-fields` for details.
   bool ignore_unknown_dynamic_fields = 30;
 
+  // See :option:`--skip-deprecated-logs` for details.
+  bool skip_deprecated_logs = 41;
+
   // See :option:`--admin-address-path` for details.
   string admin_address_path = 6;
 

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

@@ -152,35 +152,38 @@ message TraceableFilter {
       "envoy.config.filter.accesslog.v2.TraceableFilter";
 }
 
-// Filters for random sampling of requests.
+// Filters requests based on runtime-configurable sampling rates.
 message RuntimeFilter {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.config.filter.accesslog.v2.RuntimeFilter";
 
-  // Runtime key to get an optional overridden numerator for use in the
-  // ``percent_sampled`` field. If found in runtime, this value will replace the
-  // default numerator.
+  // Specifies a key used to look up a custom sampling rate from the runtime configuration. If a value is found for this
+  // key, it will override the default sampling rate specified in ``percent_sampled``.
   string runtime_key = 1 [(validate.rules).string = {min_len: 1}];
 
-  // The default sampling percentage. If not specified, defaults to 0% with
-  // denominator of 100.
+  // Defines the default sampling percentage when no runtime override is present. If not specified, the default is
+  // **0%** (with a denominator of 100).
   type.v3.FractionalPercent percent_sampled = 2;
 
-  // By default, sampling pivots on the header
-  // :ref:`x-request-id<config_http_conn_man_headers_x-request-id>` being
-  // present. If :ref:`x-request-id<config_http_conn_man_headers_x-request-id>`
-  // is present, the filter will consistently sample across multiple hosts based
-  // on the runtime key value and the value extracted from
-  // :ref:`x-request-id<config_http_conn_man_headers_x-request-id>`. If it is
-  // missing, or ``use_independent_randomness`` is set to true, the filter will
-  // randomly sample based on the runtime key value alone.
-  // ``use_independent_randomness`` can be used for logging kill switches within
-  // complex nested :ref:`AndFilter
-  // <envoy_v3_api_msg_config.accesslog.v3.AndFilter>` and :ref:`OrFilter
-  // <envoy_v3_api_msg_config.accesslog.v3.OrFilter>` blocks that are easier to
-  // reason about from a probability perspective (i.e., setting to true will
-  // cause the filter to behave like an independent random variable when
-  // composed within logical operator filters).
+  // Controls how sampling decisions are made.
+  //
+  // - Default behavior (``false``):
+  //
+  //   * Uses the :ref:`x-request-id<config_http_conn_man_headers_x-request-id>` as a consistent sampling pivot.
+  //   * When :ref:`x-request-id<config_http_conn_man_headers_x-request-id>` is present, sampling will be consistent
+  //     across multiple hosts based on both the ``runtime_key`` and
+  //     :ref:`x-request-id<config_http_conn_man_headers_x-request-id>`.
+  //   * Useful for tracking related requests across a distributed system.
+  //
+  // - When set to ``true`` or :ref:`x-request-id<config_http_conn_man_headers_x-request-id>` is missing:
+  //
+  //   * Sampling decisions are made randomly based only on the ``runtime_key``.
+  //   * Useful in complex filter configurations (like nested
+  //     :ref:`AndFilter<envoy_v3_api_msg_config.accesslog.v3.AndFilter>`/
+  //     :ref:`OrFilter<envoy_v3_api_msg_config.accesslog.v3.OrFilter>` blocks) where independent probability
+  //     calculations are desired.
+  //   * Can be used to implement logging kill switches with predictable probability distributions.
+  //
   bool use_independent_randomness = 3;
 }
 

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

@@ -43,14 +43,14 @@ option (udpa.annotations.file_status).package_version_status = FROZEN;
 //       address: foo.bar.com
 //       port_value: 22120
 //     cluster_type:
-//     name: envoy.clusters.redis
-//     typed_config:
-//       "@type": type.googleapis.com/google.protobuf.Struct
-//       value:
-//         cluster_refresh_rate: 30s
-//         cluster_refresh_timeout: 0.5s
-//         redirect_refresh_interval: 10s
-//         redirect_refresh_threshold: 10
+//       name: envoy.clusters.redis
+//       typed_config:
+//         "@type": type.googleapis.com/google.protobuf.Struct
+//         value:
+//           cluster_refresh_rate: 30s
+//           cluster_refresh_timeout: 0.5s
+//           redirect_refresh_interval: 10s
+//           redirect_refresh_threshold: 10
 // [#extension: envoy.clusters.redis]
 
 // [#next-free-field: 7]