Rename access log streams to make it more friendly to posix terminology (#15721)

Signed-off-by: Sotiris Nanopoulos <sonanopo@microsoft.com>

Mirrored from https://github.com/envoyproxy/envoy @ 98fb5d6f8fe09a88218598d757756e702857dd03

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/stream/v3:pkg",
-        "//envoy/extensions/access_loggers/stdoutput/v3:pkg",
         "//envoy/extensions/access_loggers/wasm/v3:pkg",
         "//envoy/extensions/clusters/aggregate/v3:pkg",
         "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",

envoy/extensions/access_loggers/stderror/v3/stderror.proto

@@ -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 <envoy_api_msg_config.accesslog.v3.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_access_log_default_format>`.
-    config.core.v3.SubstitutionFormatString log_format = 1
-        [(validate.rules).message = {required: true}];
-  }
-}

envoy/extensions/access_loggers/stderror/v4alpha/stderror.proto

@@ -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 <envoy_api_msg_config.accesslog.v4alpha.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_access_log_default_format>`.
-    config.core.v4alpha.SubstitutionFormatString log_format = 1
-        [(validate.rules).message = {required: true}];
-  }
-}

envoy/extensions/access_loggers/stdoutput/v3/BUILD

@@ -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",
-    ],
-)

envoy/extensions/access_loggers/stdoutput/v4alpha/BUILD

@@ -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",
-    ],
-)

envoy/extensions/access_loggers/stdoutput/v4alpha/stdoutput.proto

@@ -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 <envoy_api_msg_config.accesslog.v4alpha.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_access_log_default_format>`.
-    config.core.v4alpha.SubstitutionFormatString log_format = 1
-        [(validate.rules).message = {required: true}];
-  }
-}

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_package = "io.envoyproxy.envoy.extensions.access_loggers.stream.v3";
-option java_outer_classname = "StdoutputProto";
+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]
+// [#protodoc-title: Standard Streams Access loggers]
-// [#extension: envoy.access_loggers.stdoutput]
+// [#extension: envoy.access_loggers.stream]
 
 // Custom configuration for an :ref:`AccessLog <envoy_api_msg_config.accesslog.v3.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_access_log_default_format>`.
+    config.core.v3.SubstitutionFormatString log_format = 1
+        [(validate.rules).message = {required: true}];
+  }
+}
+
+// Custom configuration for an :ref:`AccessLog <envoy_api_msg_config.accesslog.v3.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 <config_access_log_default_format>`.

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",
     ],
 )

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 <envoy_api_msg_config.accesslog.v4alpha.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_access_log_default_format>`.
+    config.core.v4alpha.SubstitutionFormatString log_format = 1
+        [(validate.rules).message = {required: true}];
+  }
+}
+
+// Custom configuration for an :ref:`AccessLog <envoy_api_msg_config.accesslog.v4alpha.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_access_log_default_format>`.
+    config.core.v4alpha.SubstitutionFormatString log_format = 1
+        [(validate.rules).message = {required: true}];
+  }
+}

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/stream/v3:pkg",
-        "//envoy/extensions/access_loggers/stdoutput/v3:pkg",
         "//envoy/extensions/access_loggers/wasm/v3:pkg",
         "//envoy/extensions/clusters/aggregate/v3:pkg",
         "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",