Update protobuf definitions to Envoy latest as of 12 Feb 2020 (#130)

Signed-off-by: slonka <[email protected]>

Author: slonka

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

@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "google/protobuf/timestamp.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
 
-import "google/protobuf/timestamp.proto";
-
 // [#protodoc-title: Certificates]
 
 // Proto representation of certificate details. Admin endpoint uses this wrapper for `/certs` to

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

@@ -2,15 +2,15 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_outer_classname = "ClustersProto";
-option java_multiple_files = true;
-
 import "envoy/admin/v2alpha/metrics.proto";
 import "envoy/api/v2/core/address.proto";
 import "envoy/api/v2/core/health_check.proto";
 import "envoy/type/percent.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_outer_classname = "ClustersProto";
+option java_multiple_files = true;
+
 // [#protodoc-title: Clusters]
 
 // Admin endpoint uses this wrapper for `/clusters` to display cluster status information.
@@ -141,6 +141,6 @@ message HostHealthStatus {
 
   // Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
   // here.
-  // TODO(mrice32): pipe through remaining EDS health status possibilities.
+  // [#comment:TODO(mrice32): pipe through remaining EDS health status possibilities.]
   api.v2.core.HealthStatus eds_health_status = 3;
 }

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

@@ -2,20 +2,15 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
-option java_package = "io.envoyproxy.envoy.admin.v2alpha";
-option java_outer_classname = "ConfigDumpProto";
-option java_multiple_files = true;
-
-import "envoy/api/v2/auth/cert.proto";
-import "envoy/api/v2/cds.proto";
-import "envoy/api/v2/lds.proto";
-import "envoy/api/v2/rds.proto";
-import "envoy/api/v2/srds.proto";
 import "envoy/config/bootstrap/v2/bootstrap.proto";
 
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_outer_classname = "ConfigDumpProto";
+option java_multiple_files = true;
+
 // [#protodoc-title: ConfigDump]
 
 // The :ref:`/config_dump <operations_admin_interface_config_dump>` admin endpoint uses this wrapper
@@ -31,6 +26,12 @@ message ConfigDump {
   // * *clusters*: :ref:`ClustersConfigDump <envoy_api_msg_admin.v2alpha.ClustersConfigDump>`
   // * *listeners*: :ref:`ListenersConfigDump <envoy_api_msg_admin.v2alpha.ListenersConfigDump>`
   // * *routes*:  :ref:`RoutesConfigDump <envoy_api_msg_admin.v2alpha.RoutesConfigDump>`
+  //
+  // You can filter output with the resource and mask query parameters.
+  // See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
+  // :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,
+  // or :ref:`/config_dump?resource={},mask={}
+  // <operations_admin_interface_config_dump_by_resource_and_mask>` for more information.
   repeated google.protobuf.Any configs = 1;
 }
 
@@ -63,7 +64,7 @@ message ListenersConfigDump {
   // Describes a statically loaded listener.
   message StaticListener {
     // The listener config.
-    api.v2.Listener listener = 1;
+    google.protobuf.Any listener = 1;
 
     // The timestamp when the Listener was last successfully updated.
     google.protobuf.Timestamp last_updated = 2;
@@ -77,7 +78,7 @@ message ListenersConfigDump {
     string version_info = 1;
 
     // The listener config.
-    api.v2.Listener listener = 2;
+    google.protobuf.Any listener = 2;
 
     // The timestamp when the Listener was last successfully updated.
     google.protobuf.Timestamp last_updated = 3;
@@ -128,7 +129,7 @@ message ClustersConfigDump {
   // Describes a statically loaded cluster.
   message StaticCluster {
     // The cluster config.
-    api.v2.Cluster cluster = 1;
+    google.protobuf.Any cluster = 1;
 
     // The timestamp when the Cluster was last updated.
     google.protobuf.Timestamp last_updated = 2;
@@ -143,7 +144,7 @@ message ClustersConfigDump {
     string version_info = 1;
 
     // The cluster config.
-    api.v2.Cluster cluster = 2;
+    google.protobuf.Any cluster = 2;
 
     // The timestamp when the Cluster was last updated.
     google.protobuf.Timestamp last_updated = 3;
@@ -176,7 +177,7 @@ message ClustersConfigDump {
 message RoutesConfigDump {
   message StaticRouteConfig {
     // The route config.
-    api.v2.RouteConfiguration route_config = 1;
+    google.protobuf.Any route_config = 1;
 
     // The timestamp when the Route was last updated.
     google.protobuf.Timestamp last_updated = 2;
@@ -189,7 +190,7 @@ message RoutesConfigDump {
     string version_info = 1;
 
     // The route config.
-    api.v2.RouteConfiguration route_config = 2;
+    google.protobuf.Any route_config = 2;
 
     // The timestamp when the Route was last updated.
     google.protobuf.Timestamp last_updated = 3;
@@ -212,7 +213,7 @@ message ScopedRoutesConfigDump {
     string name = 1;
 
     // The scoped route configurations.
-    repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 2;
+    repeated google.protobuf.Any scoped_route_configs = 2;
 
     // The timestamp when the scoped route config set was last updated.
     google.protobuf.Timestamp last_updated = 3;
@@ -228,7 +229,7 @@ message ScopedRoutesConfigDump {
     string version_info = 2;
 
     // The scoped route configurations.
-    repeated api.v2.ScopedRouteConfiguration scoped_route_configs = 3;
+    repeated google.protobuf.Any scoped_route_configs = 3;
 
     // The timestamp when the scoped route config set was last updated.
     google.protobuf.Timestamp last_updated = 4;
@@ -257,7 +258,7 @@ message SecretsConfigDump {
     // The actual secret information.
     // Security sensitive information is redacted (replaced with "[redacted]") for
     // private keys and passwords in TLS certificates.
-    api.v2.auth.Secret secret = 4;
+    google.protobuf.Any secret = 4;
   }
 
   // StaticSecret specifies statically loaded secret in bootstrap.
@@ -271,7 +272,7 @@ message SecretsConfigDump {
     // The actual secret information.
     // Security sensitive information is redacted (replaced with "[redacted]") for
     // private keys and passwords in TLS certificates.
-    api.v2.auth.Secret secret = 3;
+    google.protobuf.Any secret = 3;
   }
 
   // The statically loaded secrets.

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

@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "envoy/api/v2/core/address.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ListenersProto";
 option java_multiple_files = true;
 
-import "envoy/api/v2/core/address.proto";
-
 // [#protodoc-title: Listeners]
 
 // Admin endpoint uses this wrapper for `/listeners` to display listener status information.

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

@@ -2,12 +2,14 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "google/protobuf/duration.proto";
+
+import "envoy/annotations/deprecation.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ServerInfoProto";
 option java_multiple_files = true;
 
-import "google/protobuf/duration.proto";
-
 // [#protodoc-title: Server State]
 
 // Proto representation of the value returned by /server_info, containing
@@ -47,7 +49,7 @@ message ServerInfo {
   CommandLineOptions command_line_options = 6;
 }
 
-// [#next-free-field: 28]
+// [#next-free-field: 29]
 message CommandLineOptions {
   enum IpVersion {
     v4 = 0;
@@ -128,9 +130,10 @@ message CommandLineOptions {
   Mode mode = 19;
 
   // max_stats and max_obj_name_len are now unused and have no effect.
-  uint64 max_stats = 20 [deprecated = true];
+  uint64 max_stats = 20 [deprecated = true, (envoy.annotations.disallowed_by_default) = true];
 
-  uint64 max_obj_name_len = 21 [deprecated = true];
+  uint64 max_obj_name_len = 21
+      [deprecated = true, (envoy.annotations.disallowed_by_default) = true];
 
   // See :option:`--disable-hot-restart` for details.
   bool disable_hot_restart = 22;
@@ -143,4 +146,7 @@ message CommandLineOptions {
 
   // See :option:`--cpuset-threads` for details.
   bool cpuset_threads = 25;
+
+  // See :option:`--disable-extensions` for details.
+  repeated string disabled_extensions = 28;
 }

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

@@ -2,13 +2,15 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "envoy/service/tap/v2alpha/common.proto";
+
+import "validate/validate.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "TapProto";
 option java_multiple_files = true;
 
-import "envoy/service/tap/v2alpha/common.proto";
-
-import "validate/validate.proto";
+// [#protodoc-title: Tap]
 
 // The /tap admin request body that is used to configure an active tap session.
 message TapRequest {

api/src/main/proto/envoy/admin/v3alpha/certs.proto renamed to api/src/main/proto/envoy/admin/v3/certs.proto

@@ -1,15 +1,15 @@
 syntax = "proto3";
 
-package envoy.admin.v3alpha;
-
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
-option java_outer_classname = "CertsProto";
-option java_multiple_files = true;
+package envoy.admin.v3;
 
 import "google/protobuf/timestamp.proto";
 
 import "udpa/annotations/versioning.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3";
+option java_outer_classname = "CertsProto";
+option java_multiple_files = true;
+
 // [#protodoc-title: Certificates]
 
 // Proto representation of certificate details. Admin endpoint uses this wrapper for `/certs` to

api/src/main/proto/envoy/admin/v3alpha/clusters.proto renamed to api/src/main/proto/envoy/admin/v3/clusters.proto

@@ -1,18 +1,18 @@
 syntax = "proto3";
 
-package envoy.admin.v3alpha;
+package envoy.admin.v3;
 
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
-option java_outer_classname = "ClustersProto";
-option java_multiple_files = true;
-
-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 "envoy/admin/v3/metrics.proto";
+import "envoy/config/core/v3/address.proto";
+import "envoy/config/core/v3/health_check.proto";
+import "envoy/type/v3/percent.proto";
 
 import "udpa/annotations/versioning.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3";
+option java_outer_classname = "ClustersProto";
+option java_multiple_files = true;
+
 // [#protodoc-title: Clusters]
 
 // Admin endpoint uses this wrapper for `/clusters` to display cluster status information.
@@ -37,10 +37,10 @@ message ClusterStatus {
 
   // The success rate threshold used in the last interval.
   // If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *false*, all errors: externally and locally generated were used to calculate the threshold.
   // If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*, only externally generated errors were used to calculate the threshold.
   // The threshold is used to eject hosts based on their success rate. See
   // :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for details.
@@ -52,15 +52,15 @@ message ClusterStatus {
   // 2. The threshold is computed to be < 0 because a negative value implies that there was no
   //    threshold for that interval.
   // 3. Outlier detection is not enabled for this cluster.
-  type.v3alpha.Percent success_rate_ejection_threshold = 3;
+  type.v3.Percent success_rate_ejection_threshold = 3;
 
   // Mapping from host address to the host's current status.
   repeated HostStatus host_statuses = 4;
 
   // The success rate threshold used in the last interval when only locally originated failures were
   // taken into account and externally originated errors were treated as success.
   // This field should be interpreted only when
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*. The threshold is used to eject hosts based on their success rate.
   // See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
   // details.
@@ -72,7 +72,7 @@ message ClusterStatus {
   // 2. The threshold is computed to be < 0 because a negative value implies that there was no
   //    threshold for that interval.
   // 3. Outlier detection is not enabled for this cluster.
-  type.v3alpha.Percent local_origin_success_rate_ejection_threshold = 5;
+  type.v3.Percent local_origin_success_rate_ejection_threshold = 5;
 }
 
 // Current state of a particular host.
@@ -81,7 +81,7 @@ message HostStatus {
   option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.HostStatus";
 
   // Address of this host.
-  api.v3alpha.core.Address address = 1;
+  config.core.v3.Address address = 1;
 
   // List of stats specific to this host.
   repeated SimpleMetric stats = 2;
@@ -91,18 +91,18 @@ message HostStatus {
 
   // Request success rate for this host over the last calculated interval.
   // If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *false*, all errors: externally and locally generated were used in success rate
   // calculation. If
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*, only externally generated errors were used in success rate calculation.
   // See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
   // details.
   //
   // Note: the message will not be present if host did not have enough request volume to calculate
   // success rate or the cluster did not have enough hosts to run through success rate outlier
   // ejection.
-  type.v3alpha.Percent success_rate = 4;
+  type.v3.Percent success_rate = 4;
 
   // The host's weight. If not configured, the value defaults to 1.
   uint32 weight = 5;
@@ -117,15 +117,15 @@ message HostStatus {
   // interval when only locally originated errors are taken into account and externally originated
   // errors were treated as success.
   // This field should be interpreted only when
-  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_api.v3alpha.cluster.OutlierDetection.split_external_local_origin_errors>`
+  // :ref:`outlier_detection.split_external_local_origin_errors<envoy_api_field_config.cluster.v3.OutlierDetection.split_external_local_origin_errors>`
   // is *true*.
   // See :ref:`Cluster outlier detection <arch_overview_outlier_detection>` documentation for
   // details.
   //
   // Note: the message will not be present if host did not have enough request volume to calculate
   // success rate or the cluster did not have enough hosts to run through success rate outlier
   // ejection.
-  type.v3alpha.Percent local_origin_success_rate = 8;
+  type.v3.Percent local_origin_success_rate = 8;
 }
 
 // Health status for a host.
@@ -152,6 +152,6 @@ message HostHealthStatus {
 
   // Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
   // here.
-  // TODO(mrice32): pipe through remaining EDS health status possibilities.
-  api.v3alpha.core.HealthStatus eds_health_status = 3;
+  // [#comment:TODO(mrice32): pipe through remaining EDS health status possibilities.]
+  config.core.v3.HealthStatus eds_health_status = 3;
 }