From 3da931002403dd0bb85c1f6bd19cef3483736bc6 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Mon, 29 Mar 2021 16:28:02 +0000 Subject: [PATCH] Rename access log streams to make it more friendly to posix terminology (#15721) Signed-off-by: Sotiris Nanopoulos Mirrored from https://github.com/envoyproxy/envoy @ 98fb5d6f8fe09a88218598d757756e702857dd03 --- BUILD | 3 +- .../access_loggers/stderror/v3/stderror.proto | 27 ----------- .../stderror/v4alpha/stderror.proto | 31 ------------- .../access_loggers/stdoutput/v3/BUILD | 12 ----- .../access_loggers/stdoutput/v4alpha/BUILD | 13 ------ .../stdoutput/v4alpha/stdoutput.proto | 31 ------------- .../{stderror => stream}/v3/BUILD | 0 .../v3/stream.proto} | 23 +++++++--- .../{stderror => stream}/v4alpha/BUILD | 2 +- .../stream/v4alpha/stream.proto | 45 +++++++++++++++++++ versioning/BUILD | 3 +- 11 files changed, 65 insertions(+), 125 deletions(-) delete mode 100644 envoy/extensions/access_loggers/stderror/v3/stderror.proto delete mode 100644 envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto delete mode 100644 envoy/extensions/access_loggers/stdoutput/v3/BUILD delete mode 100644 envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD delete mode 100644 envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto rename envoy/extensions/access_loggers/{stderror => stream}/v3/BUILD (100%) rename envoy/extensions/access_loggers/{stdoutput/v3/stdoutput.proto => stream/v3/stream.proto} (52%) rename envoy/extensions/access_loggers/{stderror => stream}/v4alpha/BUILD (83%) create mode 100644 envoy/extensions/access_loggers/stream/v4alpha/stream.proto diff --git a/BUILD b/BUILD index 914eaa89..0167c8a6 100644 --- a/BUILD +++ b/BUILD @@ -156,8 +156,7 @@ proto_library( "//envoy/extensions/access_loggers/file/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", "//envoy/extensions/access_loggers/open_telemetry/v3alpha:pkg", - "//envoy/extensions/access_loggers/stderror/v3:pkg", - "//envoy/extensions/access_loggers/stdoutput/v3:pkg", + "//envoy/extensions/access_loggers/stream/v3:pkg", "//envoy/extensions/access_loggers/wasm/v3:pkg", "//envoy/extensions/clusters/aggregate/v3:pkg", "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg", diff --git a/envoy/extensions/access_loggers/stderror/v3/stderror.proto b/envoy/extensions/access_loggers/stderror/v3/stderror.proto deleted file mode 100644 index e25401bc..00000000 --- a/envoy/extensions/access_loggers/stderror/v3/stderror.proto +++ /dev/null @@ -1,27 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.access_loggers.stderror.v3; - -import "envoy/config/core/v3/substitution_format_string.proto"; - -import "udpa/annotations/status.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stderror.v3"; -option java_outer_classname = "StderrorProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = ACTIVE; - -// [#protodoc-title: Standard Error access log] -// [#extension: envoy.access_loggers.stderror] - -// Custom configuration for an :ref:`AccessLog ` -// that writes log entries directly to the operating system's standard error. -message StdErrorAccessLog { - oneof access_log_format { - // Configuration to form access log data and format. - // If not specified, use :ref:`default format `. - config.core.v3.SubstitutionFormatString log_format = 1 - [(validate.rules).message = {required: true}]; - } -} diff --git a/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto b/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto deleted file mode 100644 index 3045e8e5..00000000 --- a/envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto +++ /dev/null @@ -1,31 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.access_loggers.stderror.v4alpha; - -import "envoy/config/core/v4alpha/substitution_format_string.proto"; - -import "udpa/annotations/status.proto"; -import "udpa/annotations/versioning.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stderror.v4alpha"; -option java_outer_classname = "StderrorProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; - -// [#protodoc-title: Standard Error access log] -// [#extension: envoy.access_loggers.stderror] - -// Custom configuration for an :ref:`AccessLog ` -// that writes log entries directly to the operating system's standard error. -message StdErrorAccessLog { - option (udpa.annotations.versioning).previous_message_type = - "envoy.extensions.access_loggers.stderror.v3.StdErrorAccessLog"; - - oneof access_log_format { - // Configuration to form access log data and format. - // If not specified, use :ref:`default format `. - config.core.v4alpha.SubstitutionFormatString log_format = 1 - [(validate.rules).message = {required: true}]; - } -} diff --git a/envoy/extensions/access_loggers/stdoutput/v3/BUILD b/envoy/extensions/access_loggers/stdoutput/v3/BUILD deleted file mode 100644 index 1c1a6f6b..00000000 --- a/envoy/extensions/access_loggers/stdoutput/v3/BUILD +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - deps = [ - "//envoy/config/core/v3:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], -) diff --git a/envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD b/envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD deleted file mode 100644 index db001ead..00000000 --- a/envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. - -load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") - -licenses(["notice"]) # Apache 2 - -api_proto_package( - deps = [ - "//envoy/config/core/v4alpha:pkg", - "//envoy/extensions/access_loggers/stdoutput/v3:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], -) diff --git a/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto b/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto deleted file mode 100644 index 4ecc9c58..00000000 --- a/envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto +++ /dev/null @@ -1,31 +0,0 @@ -syntax = "proto3"; - -package envoy.extensions.access_loggers.stdoutput.v4alpha; - -import "envoy/config/core/v4alpha/substitution_format_string.proto"; - -import "udpa/annotations/status.proto"; -import "udpa/annotations/versioning.proto"; -import "validate/validate.proto"; - -option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stdoutput.v4alpha"; -option java_outer_classname = "StdoutputProto"; -option java_multiple_files = true; -option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; - -// [#protodoc-title: Standard Output access log] -// [#extension: envoy.access_loggers.stdoutput] - -// Custom configuration for an :ref:`AccessLog ` -// that writes log entries directly to the operating system's standard output. -message StdoutputAccessLog { - option (udpa.annotations.versioning).previous_message_type = - "envoy.extensions.access_loggers.stdoutput.v3.StdoutputAccessLog"; - - oneof access_log_format { - // Configuration to form access log data and format. - // If not specified, use :ref:`default format `. - config.core.v4alpha.SubstitutionFormatString log_format = 1 - [(validate.rules).message = {required: true}]; - } -} diff --git a/envoy/extensions/access_loggers/stderror/v3/BUILD b/envoy/extensions/access_loggers/stream/v3/BUILD similarity index 100% rename from envoy/extensions/access_loggers/stderror/v3/BUILD rename to envoy/extensions/access_loggers/stream/v3/BUILD diff --git a/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto b/envoy/extensions/access_loggers/stream/v3/stream.proto similarity index 52% rename from envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto rename to envoy/extensions/access_loggers/stream/v3/stream.proto index 849218d9..cd683b67 100644 --- a/envoy/extensions/access_loggers/stdoutput/v3/stdoutput.proto +++ b/envoy/extensions/access_loggers/stream/v3/stream.proto @@ -1,23 +1,34 @@ syntax = "proto3"; -package envoy.extensions.access_loggers.stdoutput.v3; +package envoy.extensions.access_loggers.stream.v3; import "envoy/config/core/v3/substitution_format_string.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stdoutput.v3"; -option java_outer_classname = "StdoutputProto"; +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stream.v3"; +option java_outer_classname = "StreamProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; -// [#protodoc-title: Standard Output access log] -// [#extension: envoy.access_loggers.stdoutput] +// [#protodoc-title: Standard Streams Access loggers] +// [#extension: envoy.access_loggers.stream] // Custom configuration for an :ref:`AccessLog ` // that writes log entries directly to the operating system's standard output. -message StdoutputAccessLog { +message StdoutAccessLog { + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v3.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard error. +message StderrAccessLog { oneof access_log_format { // Configuration to form access log data and format. // If not specified, use :ref:`default format `. diff --git a/envoy/extensions/access_loggers/stderror/v4alpha/BUILD b/envoy/extensions/access_loggers/stream/v4alpha/BUILD similarity index 83% rename from envoy/extensions/access_loggers/stderror/v4alpha/BUILD rename to envoy/extensions/access_loggers/stream/v4alpha/BUILD index 650f69cd..33240deb 100644 --- a/envoy/extensions/access_loggers/stderror/v4alpha/BUILD +++ b/envoy/extensions/access_loggers/stream/v4alpha/BUILD @@ -7,7 +7,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v4alpha:pkg", - "//envoy/extensions/access_loggers/stderror/v3:pkg", + "//envoy/extensions/access_loggers/stream/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/extensions/access_loggers/stream/v4alpha/stream.proto b/envoy/extensions/access_loggers/stream/v4alpha/stream.proto new file mode 100644 index 00000000..a0dbeb7b --- /dev/null +++ b/envoy/extensions/access_loggers/stream/v4alpha/stream.proto @@ -0,0 +1,45 @@ +syntax = "proto3"; + +package envoy.extensions.access_loggers.stream.v4alpha; + +import "envoy/config/core/v4alpha/substitution_format_string.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.stream.v4alpha"; +option java_outer_classname = "StreamProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Standard Streams Access loggers] +// [#extension: envoy.access_loggers.stream] + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard output. +message StdoutAccessLog { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.access_loggers.stream.v3.StdoutAccessLog"; + + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v4alpha.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} + +// Custom configuration for an :ref:`AccessLog ` +// that writes log entries directly to the operating system's standard error. +message StderrAccessLog { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.access_loggers.stream.v3.StderrAccessLog"; + + oneof access_log_format { + // Configuration to form access log data and format. + // If not specified, use :ref:`default format `. + config.core.v4alpha.SubstitutionFormatString log_format = 1 + [(validate.rules).message = {required: true}]; + } +} diff --git a/versioning/BUILD b/versioning/BUILD index daadfd39..1be50dfd 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -39,8 +39,7 @@ proto_library( "//envoy/extensions/access_loggers/file/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", "//envoy/extensions/access_loggers/open_telemetry/v3alpha:pkg", - "//envoy/extensions/access_loggers/stderror/v3:pkg", - "//envoy/extensions/access_loggers/stdoutput/v3:pkg", + "//envoy/extensions/access_loggers/stream/v3:pkg", "//envoy/extensions/access_loggers/wasm/v3:pkg", "//envoy/extensions/clusters/aggregate/v3:pkg", "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",