api: update protobuf definitions to v1.12.2 (envoyproxy#125)

Signed-off-by: Greg Einfrank <[email protected]>

Author: gregeinfrank

api/src/main/proto/envoy/admin/v2alpha/certs.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "google/protobuf/timestamp.proto";
 

api/src/main/proto/envoy/admin/v2alpha/clusters.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ClustersProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "envoy/admin/v2alpha/metrics.proto";
 import "envoy/api/v2/core/address.proto";

api/src/main/proto/envoy/admin/v2alpha/config_dump.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ConfigDumpProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "envoy/api/v2/auth/cert.proto";
 import "envoy/api/v2/cds.proto";
@@ -34,6 +34,17 @@ message ConfigDump {
   repeated google.protobuf.Any configs = 1;
 }
 
+message UpdateFailureState {
+  // What the component configuration would have been if the update had succeeded.
+  google.protobuf.Any failed_configuration = 1;
+
+  // Time of the latest failed update attempt.
+  google.protobuf.Timestamp last_update_attempt = 2;
+
+  // Details about the last failed update attempt.
+  string details = 3;
+}
+
 // This message describes the bootstrap configuration that Envoy was started with. This includes
 // any CLI overrides that were merged. Bootstrap configuration information can be used to recreate
 // the static portions of an Envoy configuration by reusing the output as the bootstrap
@@ -48,19 +59,17 @@ message BootstrapConfigDump {
 // Envoy's listener manager fills this message with all currently known listeners. Listener
 // configuration information can be used to recreate an Envoy configuration by populating all
 // listeners as static listeners or by returning them in a LDS response.
-// [#next-free-field: 6]
 message ListenersConfigDump {
   // Describes a statically loaded listener.
   message StaticListener {
     // The listener config.
     api.v2.Listener listener = 1;
 
-    // The timestamp when the Listener was last updated.
+    // The timestamp when the Listener was last successfully updated.
     google.protobuf.Timestamp last_updated = 2;
   }
 
-  // Describes a dynamically loaded cluster via the LDS API.
-  message DynamicListener {
+  message DynamicListenerState {
     // This is the per-resource version information. This version is currently taken from the
     // :ref:`version_info <envoy_api_field_DiscoveryResponse.version_info>` field at the time
     // that the listener was loaded. In the future, discrete per-listener versions may be supported
@@ -70,10 +79,36 @@ message ListenersConfigDump {
     // The listener config.
     api.v2.Listener listener = 2;
 
-    // The timestamp when the Listener was last updated.
+    // The timestamp when the Listener was last successfully updated.
     google.protobuf.Timestamp last_updated = 3;
   }
 
+  // Describes a dynamically loaded listener via the LDS API.
+  // [#next-free-field: 6]
+  message DynamicListener {
+    // The name or unique id of this listener, pulled from the DynamicListenerState config.
+    string name = 1;
+
+    // The listener state for any active listener by this name.
+    // These are listeners that are available to service data plane traffic.
+    DynamicListenerState active_state = 2;
+
+    // The listener state for any warming listener by this name.
+    // These are listeners that are currently undergoing warming in preparation to service data
+    // plane traffic. Note that if attempting to recreate an Envoy configuration from a
+    // configuration dump, the warming listeners should generally be discarded.
+    DynamicListenerState warming_state = 3;
+
+    // The listener state for any draining listener by this name.
+    // These are listeners that are currently undergoing draining in preparation to stop servicing
+    // data plane traffic. Note that if attempting to recreate an Envoy configuration from a
+    // configuration dump, the draining listeners should generally be discarded.
+    DynamicListenerState draining_state = 4;
+
+    // Set if the last update failed, cleared after the next successful update.
+    UpdateFailureState error_state = 5;
+  }
+
   // This is the :ref:`version_info <envoy_api_field_DiscoveryResponse.version_info>` in the
   // last processed LDS discovery response. If there are only static bootstrap listeners, this field
   // will be "".
@@ -82,21 +117,8 @@ message ListenersConfigDump {
   // The statically loaded listener configs.
   repeated StaticListener static_listeners = 2;
 
-  // The dynamically loaded active listeners. These are listeners that are available to service
-  // data plane traffic.
-  repeated DynamicListener dynamic_active_listeners = 3;
-
-  // The dynamically loaded warming listeners. These are listeners that are currently undergoing
-  // warming in preparation to service data plane traffic. Note that if attempting to recreate an
-  // Envoy configuration from a configuration dump, the warming listeners should generally be
-  // discarded.
-  repeated DynamicListener dynamic_warming_listeners = 4;
-
-  // The dynamically loaded draining listeners. These are listeners that are currently undergoing
-  // draining in preparation to stop servicing data plane traffic. Note that if attempting to
-  // recreate an Envoy configuration from a configuration dump, the draining listeners should
-  // generally be discarded.
-  repeated DynamicListener dynamic_draining_listeners = 5;
+  // State for any warming, active, or draining listeners.
+  repeated DynamicListener dynamic_listeners = 3;
 }
 
 // Envoy's cluster manager fills this message with all currently known clusters. Cluster

api/src/main/proto/envoy/admin/v2alpha/listeners.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ListenersProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "envoy/api/v2/core/address.proto";
 

api/src/main/proto/envoy/admin/v2alpha/memory.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "MemoryProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: Memory]
 

api/src/main/proto/envoy/admin/v2alpha/metrics.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "MetricsProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: Metrics]
 

api/src/main/proto/envoy/admin/v2alpha/mutex_stats.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "MutexStatsProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: MutexStats]
 

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

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ServerInfoProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "google/protobuf/duration.proto";
 
@@ -47,7 +47,7 @@ message ServerInfo {
   CommandLineOptions command_line_options = 6;
 }
 
-// [#next-free-field: 27]
+// [#next-free-field: 28]
 message CommandLineOptions {
   enum IpVersion {
     v4 = 0;
@@ -100,6 +100,9 @@ message CommandLineOptions {
   // See :option:`--log-format` for details.
   string log_format = 10;
 
+  // See :option:`--log-format-escaped` for details.
+  bool log_format_escaped = 27;
+
   // See :option:`--log-path` for details.
   string log_path = 11;
 

api/src/main/proto/envoy/admin/v2alpha/tap.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "TapProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "envoy/service/tap/v2alpha/common.proto";
 

api/src/main/proto/envoy/admin/v3alpha/certs.proto

@@ -2,23 +2,29 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 
 import "google/protobuf/timestamp.proto";
 
+import "udpa/annotations/versioning.proto";
+
 // [#protodoc-title: Certificates]
 
 // Proto representation of certificate details. Admin endpoint uses this wrapper for `/certs` to
 // display certificate information. See :ref:`/certs <operations_admin_interface_certs>` for more
 // information.
 message Certificates {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.Certificates";
+
   // List of certificates known to an Envoy.
   repeated Certificate certificates = 1;
 }
 
 message Certificate {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.Certificate";
+
   // Details of CA certificate.
   repeated CertificateDetails ca_cert = 1;
 
@@ -28,6 +34,9 @@ message Certificate {
 
 // [#next-free-field: 7]
 message CertificateDetails {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.admin.v2alpha.CertificateDetails";
+
   // Path of the certificate.
   string path = 1;
 
@@ -48,6 +57,9 @@ message CertificateDetails {
 }
 
 message SubjectAlternateName {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.admin.v2alpha.SubjectAlternateName";
+
   // Subject Alternate Name.
   oneof name {
     string dns = 1;

api/src/main/proto/envoy/admin/v3alpha/clusters.proto

@@ -2,27 +2,33 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 option java_outer_classname = "ClustersProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 
 import "envoy/admin/v3alpha/metrics.proto";
 import "envoy/api/v3alpha/core/address.proto";
 import "envoy/api/v3alpha/core/health_check.proto";
 import "envoy/type/v3alpha/percent.proto";
 
+import "udpa/annotations/versioning.proto";
+
 // [#protodoc-title: Clusters]
 
 // Admin endpoint uses this wrapper for `/clusters` to display cluster status information.
 // See :ref:`/clusters <operations_admin_interface_clusters>` for more information.
 message Clusters {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.Clusters";
+
   // Mapping from cluster name to each cluster's status.
   repeated ClusterStatus cluster_statuses = 1;
 }
 
 // Details an individual cluster's current status.
 // [#next-free-field: 6]
 message ClusterStatus {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.ClusterStatus";
+
   // Name of the cluster.
   string name = 1;
 
@@ -72,6 +78,8 @@ message ClusterStatus {
 // Current state of a particular host.
 // [#next-free-field: 9]
 message HostStatus {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.HostStatus";
+
   // Address of this host.
   api.v3alpha.core.Address address = 1;
 
@@ -123,6 +131,9 @@ message HostStatus {
 // Health status for a host.
 // [#next-free-field: 7]
 message HostHealthStatus {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.admin.v2alpha.HostHealthStatus";
+
   // The host is currently failing active health checks.
   bool failed_active_health_check = 1;