chore: Update dependencies (#23)

* envoy-types: update dependencies

`prost` v0.14 ; `tonic` v0.14 ; `tonic-prost` v0.14
`tonic-prost-build` v0.14

* envoy-types: adjust `tests/bootstrap`

Use `tonic-prost-build`, refactor.

* envoy-types: update generated files

* examples: update dependencies

`tokio` v1.47 ; `tonic` v0.14

Author: flemosr

envoy-types/Cargo.toml

@@ -17,18 +17,13 @@ version = "0.6.1"
 
 [dependencies]
 futures-core = "0.3"
-prost = { version = "0.13", default-features = false, features = [
-    "prost-derive",
-] }
-tonic = { version = "0.13", default-features = false, features = [
+prost = { version = "0.14", default-features = false, features = ["derive"] }
+tonic = { version = "0.14", default-features = false, features = [
     "codegen",
     "transport",
-    "prost",
 ] }
+tonic-prost = "0.14"
 
 [dev-dependencies]
 glob = "0.3"
-tonic-build = { version = "0.13", default-features = false, features = [
-    "prost",
-    "cleanup-markdown",
-] }
+tonic-prost-build = "0.14"

envoy-types/src/generated/cel.expr.rs

@@ -40,7 +40,7 @@ pub struct Expr {
 /// Nested message and enum types in `Expr`.
 pub mod expr {
     /// An identifier expression. e.g. `request`.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct Ident {
         /// Required. Holds a single, unqualified identifier, possibly preceded by a
         /// '.'.
@@ -387,7 +387,7 @@ pub struct SourceInfo {
 /// Nested message and enum types in `SourceInfo`.
 pub mod source_info {
     /// An extension that was requested for the source expression.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct Extension {
         /// Identifier for the extension. Example: constant_folding
         #[prost(string, tag = "1")]
@@ -406,7 +406,7 @@ pub mod source_info {
     /// Nested message and enum types in `Extension`.
     pub mod extension {
         /// Version
-        #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+        #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
         pub struct Version {
             /// Major version changes indicate different required support level from
             /// the required components.

envoy-types/src/generated/envoy.admin.v3.rs

@@ -48,7 +48,7 @@ pub struct CertificateDetails {
 }
 /// Nested message and enum types in `CertificateDetails`.
 pub mod certificate_details {
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct OcspDetails {
         /// Indicates the time from which the OCSP response is valid.
         #[prost(message, optional, tag = "1")]
@@ -62,7 +62,7 @@ pub mod certificate_details {
         >,
     }
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SubjectAlternateName {
     /// Subject Alternate Name.
     #[prost(oneof = "subject_alternate_name::Name", tags = "1, 2, 3")]
@@ -71,7 +71,7 @@ pub struct SubjectAlternateName {
 /// Nested message and enum types in `SubjectAlternateName`.
 pub mod subject_alternate_name {
     /// Subject Alternate Name.
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Oneof)]
     pub enum Name {
         #[prost(string, tag = "1")]
         Dns(::prost::alloc::string::String),
@@ -82,7 +82,7 @@ pub mod subject_alternate_name {
     }
 }
 /// Proto representation of an Envoy Counter or Gauge value.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SimpleMetric {
     /// Type of the metric represented.
     #[prost(enumeration = "simple_metric::Type", tag = "1")]
@@ -274,7 +274,7 @@ pub struct HostStatus {
 }
 /// Health status for a host.
 /// \[\#next-free-field: 9\]
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HostHealthStatus {
     /// The host is currently failing active health checks.
     #[prost(bool, tag = "1")]
@@ -309,7 +309,7 @@ pub struct HostHealthStatus {
     #[prost(enumeration = "super::super::config::core::v3::HealthStatus", tag = "3")]
     pub eds_health_status: i32,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct UpdateFailureState {
     /// What the component configuration would have been if the update had succeeded.
     /// This field may not be populated by xDS clients due to storage overhead.
@@ -354,7 +354,7 @@ pub struct ListenersConfigDump {
 /// Nested message and enum types in `ListenersConfigDump`.
 pub mod listeners_config_dump {
     /// Describes a statically loaded listener.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct StaticListener {
         /// The listener config.
         #[prost(message, optional, tag = "1")]
@@ -367,7 +367,7 @@ pub mod listeners_config_dump {
             super::super::super::super::google::protobuf::Timestamp,
         >,
     }
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct DynamicListenerState {
         ///
         /// This is the per-resource version information. This version is currently taken from the
@@ -389,7 +389,7 @@ pub mod listeners_config_dump {
     }
     /// Describes a dynamically loaded listener via the LDS API.
     /// \[\#next-free-field: 7\]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct DynamicListener {
         /// The name or unique id of this listener, pulled from the DynamicListenerState config.
         #[prost(string, tag = "1")]
@@ -453,7 +453,7 @@ pub struct ClustersConfigDump {
 /// Nested message and enum types in `ClustersConfigDump`.
 pub mod clusters_config_dump {
     /// Describes a statically loaded cluster.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct StaticCluster {
         /// The cluster config.
         #[prost(message, optional, tag = "1")]
@@ -468,7 +468,7 @@ pub mod clusters_config_dump {
     }
     /// Describes a dynamically loaded cluster via the CDS API.
     /// \[\#next-free-field: 6\]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct DynamicCluster {
         ///
         /// This is the per-resource version information. This version is currently taken from the
@@ -520,7 +520,7 @@ pub struct RoutesConfigDump {
 }
 /// Nested message and enum types in `RoutesConfigDump`.
 pub mod routes_config_dump {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct StaticRouteConfig {
         /// The route config.
         #[prost(message, optional, tag = "1")]
@@ -534,7 +534,7 @@ pub mod routes_config_dump {
         >,
     }
     /// \[\#next-free-field: 6\]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct DynamicRouteConfig {
         ///
         /// This is the per-resource version information. This version is currently taken from the
@@ -653,7 +653,7 @@ pub struct EndpointsConfigDump {
 }
 /// Nested message and enum types in `EndpointsConfigDump`.
 pub mod endpoints_config_dump {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct StaticEndpointConfig {
         /// The endpoint config.
         #[prost(message, optional, tag = "1")]
@@ -667,7 +667,7 @@ pub mod endpoints_config_dump {
         >,
     }
     /// \[\#next-free-field: 6\]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct DynamicEndpointConfig {
         ///
         /// \[\#not-implemented-hide:\] This is the per-resource version information. This version is currently taken from the
@@ -711,7 +711,7 @@ pub struct EcdsConfigDump {
 /// Nested message and enum types in `EcdsConfigDump`.
 pub mod ecds_config_dump {
     /// \[\#next-free-field: 6\]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct EcdsFilterConfig {
         /// This is the per-resource version information. This version is currently
         /// taken from the :ref:`version_info  <envoy_v3_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
@@ -873,7 +873,7 @@ pub struct SecretsConfigDump {
 pub mod secrets_config_dump {
     /// DynamicSecret contains secret information fetched via SDS.
     /// \[\#next-free-field: 7\]
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct DynamicSecret {
         /// The name assigned to the secret.
         #[prost(string, tag = "1")]
@@ -906,7 +906,7 @@ pub mod secrets_config_dump {
         pub client_status: i32,
     }
     /// StaticSecret specifies statically loaded secret in bootstrap.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct StaticSecret {
         /// The name assigned to the secret.
         #[prost(string, tag = "1")]
@@ -941,7 +941,7 @@ pub struct UnreadyTargetsDumps {
 /// Nested message and enum types in `UnreadyTargetsDumps`.
 pub mod unready_targets_dumps {
     /// Message of unready targets information of an init manager.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct UnreadyTargetsDump {
         /// Name of the init manager. Example: "init_manager_xxx".
         #[prost(string, tag = "1")]
@@ -980,7 +980,7 @@ pub struct ListenerStatus {
 /// values extracted from an internal TCMalloc instance. For more information, see the section of the
 /// docs entitled ["Generic Tcmalloc Status"](<https://gperftools.github.io/gperftools/tcmalloc.html>).
 /// \[\#next-free-field: 7\]
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Memory {
     /// The number of bytes allocated by the heap for Envoy. This is an alias for
     /// `generic.current_allocated_bytes`.
@@ -1016,7 +1016,7 @@ pub struct Memory {
 /// *NB*: The wait cycles below are measured by `absl::base_internal::CycleClock`, and may not
 /// correspond to core clock frequency. For more information, see the `CycleClock`
 /// [docs](<https://github.com/abseil/abseil-cpp/blob/master/absl/base/internal/cycleclock.h>).
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MutexStats {
     /// The number of individual mutex contentions which have occurred since startup.
     #[prost(uint64, tag = "1")]
@@ -1109,7 +1109,7 @@ pub mod server_info {
     }
 }
 /// \[\#next-free-field: 42\]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CommandLineOptions {
     /// See :option:`--base-id` for details.
     #[prost(uint64, tag = "1")]

envoy-types/src/generated/envoy.annotations.rs

@@ -1,5 +1,5 @@
 // This file is @generated by prost-build.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ResourceAnnotation {
     /// Annotation for xDS services that indicates the fully-qualified Protobuf type for the resource
     /// type.

envoy-types/src/generated/envoy.config.accesslog.v3.rs

@@ -16,7 +16,7 @@ pub struct AccessLog {
 pub mod access_log {
     /// Custom configuration that must be set according to the access logger extension being instantiated.
     /// \[\#extension-category: envoy.access_loggers\]
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Oneof)]
     pub enum ConfigType {
         #[prost(message, tag = "4")]
         TypedConfig(super::super::super::super::super::google::protobuf::Any),
@@ -78,7 +78,7 @@ pub mod access_log_filter {
     }
 }
 /// Filter on an integer comparison.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ComparisonFilter {
     /// Comparison operator.
     #[prost(enumeration = "comparison_filter::Op", tag = "1")]
@@ -135,7 +135,7 @@ pub mod comparison_filter {
     }
 }
 /// Filters on HTTP response/status code.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct StatusCodeFilter {
     /// Comparison.
     #[prost(message, optional, tag = "1")]
@@ -145,22 +145,22 @@ pub struct StatusCodeFilter {
 /// For end of stream access logs, the total duration of the stream will be used.
 /// For :ref:`periodic access logs<arch_overview_access_log_periodic>`,
 /// the duration of the stream at the time of log recording will be used.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct DurationFilter {
     /// Comparison.
     #[prost(message, optional, tag = "1")]
     pub comparison: ::core::option::Option<ComparisonFilter>,
 }
 /// Filters for requests that are not health check requests. A health check
 /// request is marked by the health check filter.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NotHealthCheckFilter {}
 /// Filters for requests that are traceable. See the tracing overview for more
 /// information on how a request becomes traceable.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct TraceableFilter {}
 /// Filters requests based on runtime-configurable sampling rates.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct RuntimeFilter {
     /// Specifies a key used to look up a custom sampling rate from the runtime configuration. If a value is found for this
     /// key, it will override the default sampling rate specified in `percent_sampled`.
@@ -215,7 +215,7 @@ pub struct OrFilter {
     pub filters: ::prost::alloc::vec::Vec<AccessLogFilter>,
 }
 /// Filters requests based on the presence or value of a request header.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HeaderFilter {
     /// Only requests with a header which matches the specified HeaderMatcher will
     /// pass the filter check.
@@ -227,7 +227,7 @@ pub struct HeaderFilter {
 /// A list of the response flags can be found
 /// in the access log formatter
 /// : ref:`documentation<config_access_log_format_response_flags>`.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ResponseFlagFilter {
     /// Only responses with the any of the flags listed in this field will be
     /// logged. This field is optional. If it is not specified, then any response
@@ -237,7 +237,7 @@ pub struct ResponseFlagFilter {
 }
 /// Filters gRPC requests based on their response status. If a gRPC status is not
 /// provided, the filter will infer the status from the HTTP status code.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct GrpcStatusFilter {
     /// Logs only responses that have any one of the gRPC statuses in this field.
     #[prost(
@@ -360,7 +360,7 @@ pub struct MetadataFilter {
     >,
 }
 /// Filters based on access log type.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct LogTypeFilter {
     /// Logs only records which their type is one of the types defined in this field.
     #[prost(
@@ -376,7 +376,7 @@ pub struct LogTypeFilter {
     pub exclude: bool,
 }
 /// Extension filter is statically registered at runtime.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ExtensionFilter {
     /// The name of the filter implementation to instantiate. The name must
     /// match a statically registered filter.
@@ -389,7 +389,7 @@ pub struct ExtensionFilter {
 /// Nested message and enum types in `ExtensionFilter`.
 pub mod extension_filter {
     /// Custom configuration that depends on the filter being instantiated.
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Oneof)]
     pub enum ConfigType {
         #[prost(message, tag = "3")]
         TypedConfig(super::super::super::super::super::google::protobuf::Any),