docs: Fix REQ command operator usage example (#13197)

This fixes the docs for REQ command operator usage example in LocalReplyConfig and SubstitutionFormatString protos. $REQ(:path)% is an invalid command operator, it should be %REQ(:path)%.

Risk Level: N/A
Testing: N/A
Docs Changes: This is a docs change.
Release Notes: N/A

Signed-off-by: Dhi Aurrahman <dio@tetrate.io>

Mirrored from https://github.com/envoyproxy/envoy @ 130c7c4e271fe306ae4dd747daa5f09ff31aef79
master-ci-test
data-plane-api(CircleCI) 5 years ago
parent 90f90dd3e3
commit df31479603
  1. 25
      envoy/config/core/v3/substitution_format_string.proto
  2. 25
      envoy/config/core/v4alpha/substitution_format_string.proto
  3. 24
      envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
  4. 24
      envoy/extensions/filters/network/http_connection_manager/v4alpha/http_connection_manager.proto

@ -23,15 +23,18 @@ message SubstitutionFormatString {
// Specify a format with command operators to form a text string. // Specify a format with command operators to form a text string.
// Its details is described in :ref:`format string<config_access_log_format_strings>`. // Its details is described in :ref:`format string<config_access_log_format_strings>`.
// //
// .. code-block:: // For example, setting ``text_format`` like below,
// //
// text_format: %LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=$REQ(:path)% // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// The following plain text will be created: // text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
// //
// .. code-block:: // generates plain text similar to:
// //
// upstream connect error:204:path=/foo // .. code-block:: text
//
// upstream connect error:503:path=/foo
// //
string text_format = 1 [(validate.rules).string = {min_bytes: 1}]; string text_format = 1 [(validate.rules).string = {min_bytes: 1}];
@ -41,11 +44,12 @@ message SubstitutionFormatString {
// Nested JSON objects may be produced by some command operators (e.g. FILTER_STATE or DYNAMIC_METADATA). // Nested JSON objects may be produced by some command operators (e.g. FILTER_STATE or DYNAMIC_METADATA).
// See the documentation for a specific command operator for details. // See the documentation for a specific command operator for details.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// json_format: // json_format:
// status: %RESPONSE_CODE% // status: "%RESPONSE_CODE%"
// message: %LOCAL_REPLY_BODY% // message: "%LOCAL_REPLY_BODY%"
// //
// The following JSON object would be created: // The following JSON object would be created:
// //
@ -70,7 +74,8 @@ message SubstitutionFormatString {
// If this field is not set then ``text/plain`` is used for *text_format* and // If this field is not set then ``text/plain`` is used for *text_format* and
// ``application/json`` is used for *json_format*. // ``application/json`` is used for *json_format*.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// content_type: "text/html; charset=UTF-8" // content_type: "text/html; charset=UTF-8"
// //

@ -27,15 +27,18 @@ message SubstitutionFormatString {
// Specify a format with command operators to form a text string. // Specify a format with command operators to form a text string.
// Its details is described in :ref:`format string<config_access_log_format_strings>`. // Its details is described in :ref:`format string<config_access_log_format_strings>`.
// //
// .. code-block:: // For example, setting ``text_format`` like below,
// //
// text_format: %LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=$REQ(:path)% // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// The following plain text will be created: // text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
// //
// .. code-block:: // generates plain text similar to:
// //
// upstream connect error:204:path=/foo // .. code-block:: text
//
// upstream connect error:503:path=/foo
// //
string text_format = 1 [(validate.rules).string = {min_bytes: 1}]; string text_format = 1 [(validate.rules).string = {min_bytes: 1}];
@ -45,11 +48,12 @@ message SubstitutionFormatString {
// Nested JSON objects may be produced by some command operators (e.g. FILTER_STATE or DYNAMIC_METADATA). // Nested JSON objects may be produced by some command operators (e.g. FILTER_STATE or DYNAMIC_METADATA).
// See the documentation for a specific command operator for details. // See the documentation for a specific command operator for details.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// json_format: // json_format:
// status: %RESPONSE_CODE% // status: "%RESPONSE_CODE%"
// message: %LOCAL_REPLY_BODY% // message: "%LOCAL_REPLY_BODY%"
// //
// The following JSON object would be created: // The following JSON object would be created:
// //
@ -74,7 +78,8 @@ message SubstitutionFormatString {
// If this field is not set then ``text/plain`` is used for *text_format* and // If this field is not set then ``text/plain`` is used for *text_format* and
// ``application/json`` is used for *json_format*. // ``application/json`` is used for *json_format*.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// content_type: "text/html; charset=UTF-8" // content_type: "text/html; charset=UTF-8"
// //

@ -571,27 +571,29 @@ message LocalReplyConfig {
// The configuration to form response body from the :ref:`command operators <config_access_log_command_operators>` // The configuration to form response body from the :ref:`command operators <config_access_log_command_operators>`
// and to specify response content type as one of: plain/text or application/json. // and to specify response content type as one of: plain/text or application/json.
// //
// Example one: plain/text body_format. // Example one: "plain/text" ``body_format``.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// text_format: %LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=$REQ(:path)% // text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
// //
// The following response body in `plain/text` format will be generated for a request with // The following response body in "plain/text" format will be generated for a request with
// local reply body of "upstream connection error", response_code=503 and path=/foo. // local reply body of "upstream connection error", response_code=503 and path=/foo.
// //
// .. code-block:: // .. code-block:: text
// //
// upstream connect error:503:path=/foo // upstream connect error:503:path=/foo
// //
// Example two: application/json body_format. // Example two: "application/json" ``body_format``.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// json_format: // json_format:
// status: %RESPONSE_CODE% // status: "%RESPONSE_CODE%"
// message: %LOCAL_REPLY_BODY% // message: "%LOCAL_REPLY_BODY%"
// path: $REQ(:path)% // path: "%REQ(:path)%"
// //
// The following response body in "application/json" format would be generated for a request with // The following response body in "application/json" format would be generated for a request with
// local reply body of "upstream connection error", response_code=503 and path=/foo. // local reply body of "upstream connection error", response_code=503 and path=/foo.

@ -573,27 +573,29 @@ message LocalReplyConfig {
// The configuration to form response body from the :ref:`command operators <config_access_log_command_operators>` // The configuration to form response body from the :ref:`command operators <config_access_log_command_operators>`
// and to specify response content type as one of: plain/text or application/json. // and to specify response content type as one of: plain/text or application/json.
// //
// Example one: plain/text body_format. // Example one: "plain/text" ``body_format``.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// text_format: %LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=$REQ(:path)% // text_format: "%LOCAL_REPLY_BODY%:%RESPONSE_CODE%:path=%REQ(:path)%\n"
// //
// The following response body in `plain/text` format will be generated for a request with // The following response body in "plain/text" format will be generated for a request with
// local reply body of "upstream connection error", response_code=503 and path=/foo. // local reply body of "upstream connection error", response_code=503 and path=/foo.
// //
// .. code-block:: // .. code-block:: text
// //
// upstream connect error:503:path=/foo // upstream connect error:503:path=/foo
// //
// Example two: application/json body_format. // Example two: "application/json" ``body_format``.
// //
// .. code-block:: // .. validated-code-block:: yaml
// :type-name: envoy.config.core.v3.SubstitutionFormatString
// //
// json_format: // json_format:
// status: %RESPONSE_CODE% // status: "%RESPONSE_CODE%"
// message: %LOCAL_REPLY_BODY% // message: "%LOCAL_REPLY_BODY%"
// path: $REQ(:path)% // path: "%REQ(:path)%"
// //
// The following response body in "application/json" format would be generated for a request with // The following response body in "application/json" format would be generated for a request with
// local reply body of "upstream connection error", response_code=503 and path=/foo. // local reply body of "upstream connection error", response_code=503 and path=/foo.

Loading…
Cancel
Save