From bc5c47823918f4909538f2b7cb4f44416d365455 Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 06:46:32 +0000 Subject: [PATCH] Rename value_bytes to raw_value to avoid java proto issues. (#28245) This is to address issue: #28243 The value_bytes proto is added by #27865. Signed-off-by: Yanjun Xiang Mirrored from https://github.com/envoyproxy/envoy @ 8a2d9502638789b1d078f06f48b51918589a1f4a --- envoy/config/core/v3/base.proto | 6 +++--- .../service/ext_proc/v3/external_processor.proto | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/envoy/config/core/v3/base.proto b/envoy/config/core/v3/base.proto index 2a6c9446..859fcbae 100644 --- a/envoy/config/core/v3/base.proto +++ b/envoy/config/core/v3/base.proto @@ -325,15 +325,15 @@ message HeaderValue { // :ref:`HTTP access logging ` applies here, however // unknown header values are replaced with the empty string instead of ``-``. // Header value is encoded as string. This does not work for non-utf8 characters. - // Only one of ``value`` or ``value_bytes`` can be set. + // Only one of ``value`` or ``raw_value`` can be set. string value = 2 [ (validate.rules).string = {max_bytes: 16384 well_known_regex: HTTP_HEADER_VALUE strict: false}, (udpa.annotations.field_migrate).oneof_promotion = "value_type" ]; // Header value is encoded as bytes which can support non-utf8 characters. - // Only one of ``value`` or ``value_bytes`` can be set. - bytes value_bytes = 3 [ + // Only one of ``value`` or ``raw_value`` can be set. + bytes raw_value = 3 [ (validate.rules).bytes = {min_len: 0 max_len: 16384}, (udpa.annotations.field_migrate).oneof_promotion = "value_type" ]; diff --git a/envoy/service/ext_proc/v3/external_processor.proto b/envoy/service/ext_proc/v3/external_processor.proto index ae28733a..666e6529 100644 --- a/envoy/service/ext_proc/v3/external_processor.proto +++ b/envoy/service/ext_proc/v3/external_processor.proto @@ -197,9 +197,9 @@ message HttpHeaders { // The HTTP request headers. All header keys will be // lower-cased, because HTTP header keys are case-insensitive. // The ``headers`` encoding is based on the runtime guard - // envoy_reloadable_features_send_header_value_in_bytes setting. + // envoy_reloadable_features_send_header_raw_value setting. // When it is true, the header value is encoded in the - // :ref:`value_bytes ` field. + // :ref:`raw_value ` field. // When it is false, the header value is encoded in the // :ref:`value ` field. config.core.v3.HeaderMap headers = 1; @@ -227,9 +227,9 @@ message HttpBody { // This message contains the trailers. message HttpTrailers { // The ``trailers`` encoding is based on the runtime guard - // envoy_reloadable_features_send_header_value_in_bytes setting. + // envoy_reloadable_features_send_header_raw_value setting. // When it is true, the header value is encoded in the - // :ref:`value_bytes ` field. + // :ref:`raw_value ` field. // When it is false, the header value is encoded in the // :ref:`value ` field. config.core.v3.HeaderMap trailers = 1; @@ -300,9 +300,9 @@ message CommonResponse { // HttpHeaders or HttpBody message, but only if this message is returned // along with the CONTINUE_AND_REPLACE status. // The ``trailers`` encoding is based on the runtime guard - // envoy_reloadable_features_send_header_value_in_bytes setting. + // envoy_reloadable_features_send_header_raw_value setting. // When it is true, the header value is encoded in the - // :ref:`value_bytes ` field. + // :ref:`raw_value ` field. // When it is false, the header value is encoded in the // :ref:`value ` field. config.core.v3.HeaderMap trailers = 4; @@ -353,9 +353,9 @@ message HeaderMutation { // any ``x-envoy`` header, and attempts to set the ``:method``, // ``:authority``, ``:scheme``, or ``host`` headers will be ignored. // The ``set_headers`` encoding is based on the runtime guard - // envoy_reloadable_features_send_header_value_in_bytes setting. + // envoy_reloadable_features_send_header_raw_value setting. // When it is true, the header value is encoded in the - // :ref:`value_bytes ` field. + // :ref:`raw_value ` field. // When it is false, the header value is encoded in the // :ref:`value ` field. repeated config.core.v3.HeaderValueOption set_headers = 1;