envoyproxy · htuch · Dec 19, 2019 · Dec 19, 2019
diff --git a/api/envoy/admin/v2alpha/certs.proto b/api/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

diff --git a/api/envoy/admin/v2alpha/clusters.proto b/api/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.

diff --git a/api/envoy/admin/v2alpha/config_dump.proto b/api/envoy/admin/v2alpha/config_dump.proto
@@ -2,10 +2,6 @@ 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";
@@ -16,6 +12,10 @@ 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

diff --git a/api/envoy/admin/v2alpha/listeners.proto b/api/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.

diff --git a/api/envoy/admin/v2alpha/server_info.proto b/api/envoy/admin/v2alpha/server_info.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
+import "google/protobuf/duration.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

diff --git a/api/envoy/admin/v2alpha/tap.proto b/api/envoy/admin/v2alpha/tap.proto
@@ -2,14 +2,14 @@ syntax = "proto3";
 
 package envoy.admin.v2alpha;
 
-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";
 
+option java_package = "io.envoyproxy.envoy.admin.v2alpha";
+option java_outer_classname = "TapProto";
+option java_multiple_files = true;
+
 // The /tap admin request body that is used to configure an active tap session.
 message TapRequest {
   // The opaque configuration ID used to match the configuration to a loaded extension.

diff --git a/api/envoy/admin/v3alpha/certs.proto b/api/envoy/admin/v3alpha/certs.proto
@@ -2,14 +2,14 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
-option java_outer_classname = "CertsProto";
-option java_multiple_files = true;
-
 import "google/protobuf/timestamp.proto";
 
 import "udpa/annotations/versioning.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
+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

diff --git a/api/envoy/admin/v3alpha/clusters.proto b/api/envoy/admin/v3alpha/clusters.proto
@@ -2,17 +2,17 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
-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 "udpa/annotations/versioning.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
+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.

diff --git a/api/envoy/admin/v3alpha/config_dump.proto b/api/envoy/admin/v3alpha/config_dump.proto
@@ -2,10 +2,6 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
-option java_outer_classname = "ConfigDumpProto";
-option java_multiple_files = true;
-
 import "envoy/api/v3alpha/auth/cert.proto";
 import "envoy/api/v3alpha/cds.proto";
 import "envoy/api/v3alpha/lds.proto";
@@ -18,6 +14,10 @@ import "google/protobuf/timestamp.proto";
 
 import "udpa/annotations/versioning.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
+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

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

diff --git a/api/envoy/admin/v3alpha/memory.proto b/api/envoy/admin/v3alpha/memory.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
+import "udpa/annotations/versioning.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 option java_outer_classname = "MemoryProto";
 option java_multiple_files = true;
 
-import "udpa/annotations/versioning.proto";
-
 // [#protodoc-title: Memory]
 
 // Proto representation of the internal memory consumption of an Envoy instance. These represent

diff --git a/api/envoy/admin/v3alpha/metrics.proto b/api/envoy/admin/v3alpha/metrics.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
+import "udpa/annotations/versioning.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 option java_outer_classname = "MetricsProto";
 option java_multiple_files = true;
 
-import "udpa/annotations/versioning.proto";
-
 // [#protodoc-title: Metrics]
 
 // Proto representation of an Envoy Counter or Gauge value.

diff --git a/api/envoy/admin/v3alpha/mutex_stats.proto b/api/envoy/admin/v3alpha/mutex_stats.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
+import "udpa/annotations/versioning.proto";
+
 option java_package = "io.envoyproxy.envoy.admin.v3alpha";
 option java_outer_classname = "MutexStatsProto";
 option java_multiple_files = true;
 
-import "udpa/annotations/versioning.proto";
-
 // [#protodoc-title: MutexStats]
 
 // Proto representation of the statistics collected upon absl::Mutex contention, if Envoy is run

diff --git a/api/envoy/admin/v3alpha/server_info.proto b/api/envoy/admin/v3alpha/server_info.proto
@@ -2,14 +2,14 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
-option java_outer_classname = "ServerInfoProto";
-option java_multiple_files = true;
-
 import "google/protobuf/duration.proto";
 
 import "udpa/annotations/versioning.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
+option java_outer_classname = "ServerInfoProto";
+option java_multiple_files = true;
+
 // [#protodoc-title: Server State]
 
 // Proto representation of the value returned by /server_info, containing

diff --git a/api/envoy/admin/v3alpha/tap.proto b/api/envoy/admin/v3alpha/tap.proto
@@ -2,16 +2,16 @@ syntax = "proto3";
 
 package envoy.admin.v3alpha;
 
-option java_package = "io.envoyproxy.envoy.admin.v3alpha";
-option java_outer_classname = "TapProto";
-option java_multiple_files = true;
-
 import "envoy/service/tap/v3alpha/common.proto";
 
 import "udpa/annotations/versioning.proto";
 
 import "validate/validate.proto";
 
+option java_package = "io.envoyproxy.envoy.admin.v3alpha";
+option java_outer_classname = "TapProto";
+option java_multiple_files = true;
+
 // The /tap admin request body that is used to configure an active tap session.
 message TapRequest {
   option (udpa.annotations.versioning).previous_message_type = "envoy.admin.v2alpha.TapRequest";

diff --git a/api/envoy/api/v2/auth/cert.proto b/api/envoy/api/v2/auth/cert.proto
@@ -2,10 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2.auth;
 
-option java_package = "io.envoyproxy.envoy.api.v2.auth";
-option java_outer_classname = "CertProto";
-option java_multiple_files = true;
-
 import "envoy/api/v2/core/base.proto";
 import "envoy/api/v2/core/config_source.proto";
 
@@ -15,6 +11,10 @@ import "google/protobuf/wrappers.proto";
 
 import "validate/validate.proto";
 
+option java_package = "io.envoyproxy.envoy.api.v2.auth";
+option java_outer_classname = "CertProto";
+option java_multiple_files = true;
+
 // [#protodoc-title: Common TLS configuration]
 
 message TlsParameters {

diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto
@@ -2,11 +2,6 @@ syntax = "proto3";
 
 package envoy.api.v2;
 
-option java_package = "io.envoyproxy.envoy.api.v2";
-option java_outer_classname = "CdsProto";
-option java_multiple_files = true;
-option java_generic_services = true;
-
 import "envoy/api/v2/auth/cert.proto";
 import "envoy/api/v2/cluster/circuit_breaker.proto";
 import "envoy/api/v2/cluster/filter.proto";
@@ -29,6 +24,11 @@ import "google/protobuf/wrappers.proto";
 import "udpa/annotations/migrate.proto";
 import "validate/validate.proto";
 
+option java_package = "io.envoyproxy.envoy.api.v2";
+option java_outer_classname = "CdsProto";
+option java_multiple_files = true;
+option java_generic_services = true;
+
 // [#protodoc-title: Clusters]
 
 // Return list of all clusters this proxy will load balance to.

diff --git a/api/envoy/api/v2/cluster/circuit_breaker.proto b/api/envoy/api/v2/cluster/circuit_breaker.proto
@@ -2,18 +2,18 @@ syntax = "proto3";
 
 package envoy.api.v2.cluster;
 
-option java_package = "io.envoyproxy.envoy.api.v2.cluster";
-option java_outer_classname = "CircuitBreakerProto";
-option java_multiple_files = true;
-option csharp_namespace = "Envoy.Api.V2.ClusterNS";
-option ruby_package = "Envoy.Api.V2.ClusterNS";
-
 import "envoy/api/v2/core/base.proto";
 
 import "google/protobuf/wrappers.proto";
 
 import "validate/validate.proto";
 
+option java_package = "io.envoyproxy.envoy.api.v2.cluster";
+option java_outer_classname = "CircuitBreakerProto";
+option java_multiple_files = true;
+option csharp_namespace = "Envoy.Api.V2.ClusterNS";
+option ruby_package = "Envoy.Api.V2.ClusterNS";
+
 // [#protodoc-title: Circuit breakers]
 
 // :ref:`Circuit breaking<arch_overview_circuit_break>` settings can be

diff --git a/api/envoy/api/v2/cluster/filter.proto b/api/envoy/api/v2/cluster/filter.proto
@@ -2,16 +2,16 @@ syntax = "proto3";
 
 package envoy.api.v2.cluster;
 
+import "google/protobuf/any.proto";
+
+import "validate/validate.proto";
+
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option java_outer_classname = "FilterProto";
 option java_multiple_files = true;
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 option ruby_package = "Envoy.Api.V2.ClusterNS";
 
-import "google/protobuf/any.proto";
-
-import "validate/validate.proto";
-
 // [#protodoc-title: Upstream filters]
 //
 // Upstream filters apply to the connections to the upstream cluster hosts.

diff --git a/api/envoy/api/v2/cluster/outlier_detection.proto b/api/envoy/api/v2/cluster/outlier_detection.proto
@@ -2,17 +2,17 @@ syntax = "proto3";
 
 package envoy.api.v2.cluster;
 
+import "google/protobuf/duration.proto";
+import "google/protobuf/wrappers.proto";
+
+import "validate/validate.proto";
+
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option java_outer_classname = "OutlierDetectionProto";
 option java_multiple_files = true;
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 option ruby_package = "Envoy.Api.V2.ClusterNS";
 
-import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
-
-import "validate/validate.proto";
-
 // [#protodoc-title: Outlier detection]
 
 // See the :ref:`architecture overview <arch_overview_outlier_detection>` for