autoinherit and bump prost* to 14 (#65)

closes #64 
closes #63 
closes #62

Author: clux

Cargo.toml

@@ -5,3 +5,14 @@ members = [
   "k8s-pb"
 ]
 resolver = "2"
+
+[workspace.dependencies]
+anyhow = "1.0.98"
+env_logger = "0.11.8"
+log = "0.4.27"
+prost = "0.14.1"
+prost-build = "0.14.1"
+prost-types = "0.14.1"
+quote = "1.0"
+serde = "1.0.219"
+serde_json = "1.0.140"

k8s-pb-codegen/Cargo.toml

@@ -6,12 +6,12 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-prost = "0.13.1"
-prost-build = "0.13.1"
-prost-types = "0.13.1"
-serde_json = "1.0.67"
-serde = { version = "1.0.130", features = ["derive"] }
-log = "0.4.14"
-anyhow = "1.0.44"
-env_logger = "0.11.0"
-quote = "1.0"
+prost = { workspace = true }
+prost-build = { workspace = true }
+prost-types = { workspace = true }
+serde_json = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+log = { workspace = true }
+anyhow = { workspace = true }
+env_logger = { workspace = true }
+quote = { workspace = true }

k8s-pb/Cargo.toml

@@ -15,4 +15,4 @@ rust-version = "1.65.0"
 edition = "2021"
 
 [dependencies]
-prost = "0.13.1"
+prost = { workspace = true }

k8s-pb/src/api/admissionregistration/v1/mod.rs

@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// AuditAnnotation describes how to produce an audit annotation for an API request.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AuditAnnotation {
     /// key specifies the audit annotation key. The audit annotation keys of
     /// a ValidatingAdmissionPolicy must be unique. The key must be a qualified
@@ -38,7 +38,7 @@ pub struct AuditAnnotation {
     pub value_expression: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// ExpressionWarning is a warning information that targets a specific expression.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ExpressionWarning {
     /// The path to the field that refers the expression.
     /// For example, the reference to the expression of the first item of
@@ -52,7 +52,7 @@ pub struct ExpressionWarning {
     pub warning: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// MatchCondition represents a condition which must by fulfilled for a request to be sent to a webhook.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MatchCondition {
     /// Name is an identifier for this match condition, used for strategic merging of MatchConditions,
     /// as well as providing an identifier for logging purposes. A good name should be descriptive of
@@ -380,7 +380,7 @@ pub struct MutatingWebhookConfigurationList {
 }
 /// NamedRuleWithOperations is a tuple of Operations and Resources with ResourceNames.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NamedRuleWithOperations {
     /// ResourceNames is an optional white list of names that the rule applies to.  An empty set means that everything is allowed.
     /// +listType=atomic
@@ -393,7 +393,7 @@ pub struct NamedRuleWithOperations {
 }
 /// ParamKind is a tuple of Group Kind and Version.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ParamKind {
     /// APIVersion is the API group version the resources belong to.
     /// In format of "group/version".
@@ -466,7 +466,7 @@ pub struct ParamRef {
 }
 /// Rule is a tuple of APIGroups, APIVersion, and Resources.It is recommended
 /// to make sure that all the tuple expansions are valid.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Rule {
     /// APIGroups is the API groups the resources belong to. '*' is all groups.
     /// If '*' is present, the length of the slice must be one.
@@ -513,7 +513,7 @@ pub struct Rule {
 }
 /// RuleWithOperations is a tuple of Operations and Resources. It is recommended to make
 /// sure that all the tuple expansions are valid.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct RuleWithOperations {
     /// Operations is the operations the admission hook cares about - CREATE, UPDATE, DELETE, CONNECT or *
     /// for all of those operations and any future admission operations that are added.
@@ -528,7 +528,7 @@ pub struct RuleWithOperations {
     pub rule: ::core::option::Option<Rule>,
 }
 /// ServiceReference holds a reference to Service.legacy.k8s.io
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ServiceReference {
     /// `namespace` is the namespace of the service.
     /// Required
@@ -976,7 +976,7 @@ pub struct ValidatingWebhookConfigurationList {
     pub items: ::prost::alloc::vec::Vec<ValidatingWebhookConfiguration>,
 }
 /// Validation specifies the CEL expression which is used to apply the validation.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Validation {
     /// Expression represents the expression which will be evaluated by CEL.
     /// ref: <https://github.com/google/cel-spec>
@@ -1056,7 +1056,7 @@ pub struct Validation {
 }
 /// Variable is the definition of a variable that is used for composition. A variable is defined as a named expression.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Variable {
     /// Name is the name of the variable. The name must be a valid CEL identifier and unique among all variables.
     /// The variable can be accessed in other expressions through `variables`
@@ -1070,7 +1070,7 @@ pub struct Variable {
 }
 /// WebhookClientConfig contains the information to make a TLS
 /// connection with the webhook
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct WebhookClientConfig {
     /// `url` gives the location of the webhook, in standard URL form
     /// (`scheme://host:port/path`). Exactly one of `url` or `service`

k8s-pb/src/api/admissionregistration/v1alpha1/mod.rs

@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// ApplyConfiguration defines the desired configuration values of an object.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ApplyConfiguration {
     /// expression will be evaluated by CEL to create an apply configuration.
     /// ref: <https://github.com/google/cel-spec>
@@ -46,7 +46,7 @@ pub struct ApplyConfiguration {
     pub expression: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// AuditAnnotation describes how to produce an audit annotation for an API request.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AuditAnnotation {
     /// key specifies the audit annotation key. The audit annotation keys of
     /// a ValidatingAdmissionPolicy must be unique. The key must be a qualified
@@ -84,7 +84,7 @@ pub struct AuditAnnotation {
     pub value_expression: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// ExpressionWarning is a warning information that targets a specific expression.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ExpressionWarning {
     /// The path to the field that refers the expression.
     /// For example, the reference to the expression of the first item of
@@ -98,7 +98,7 @@ pub struct ExpressionWarning {
     pub warning: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// JSONPatch defines a JSON Patch.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct JsonPatch {
     /// expression will be evaluated by CEL to create a [JSON patch](<https://jsonpatch.com/>).
     /// ref: <https://github.com/google/cel-spec>
@@ -167,7 +167,7 @@ pub struct JsonPatch {
     #[prost(string, optional, tag = "1")]
     pub expression: ::core::option::Option<::prost::alloc::string::String>,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MatchCondition {
     /// Name is an identifier for this match condition, used for strategic merging of MatchConditions,
     /// as well as providing an identifier for logging purposes. A good name should be descriptive of
@@ -469,7 +469,7 @@ pub struct MutatingAdmissionPolicySpec {
     pub reinvocation_policy: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// Mutation specifies the CEL expression which is used to apply the Mutation.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Mutation {
     /// patchType indicates the patch strategy used.
     /// Allowed values are "ApplyConfiguration" and "JSONPatch".
@@ -491,7 +491,7 @@ pub struct Mutation {
 }
 /// NamedRuleWithOperations is a tuple of Operations and Resources with ResourceNames.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NamedRuleWithOperations {
     /// ResourceNames is an optional white list of names that the rule applies to.  An empty set means that everything is allowed.
     /// +listType=atomic
@@ -504,7 +504,7 @@ pub struct NamedRuleWithOperations {
 }
 /// ParamKind is a tuple of Group Kind and Version.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ParamKind {
     /// APIVersion is the API group version the resources belong to.
     /// In format of "group/version".
@@ -818,7 +818,7 @@ pub struct ValidatingAdmissionPolicyStatus {
         ::prost::alloc::vec::Vec<super::super::super::apimachinery::pkg::apis::meta::v1::Condition>,
 }
 /// Validation specifies the CEL expression which is used to apply the validation.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Validation {
     /// Expression represents the expression which will be evaluated by CEL.
     /// ref: <https://github.com/google/cel-spec>
@@ -897,7 +897,7 @@ pub struct Validation {
     pub message_expression: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// Variable is the definition of a variable that is used for composition.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Variable {
     /// Name is the name of the variable. The name must be a valid CEL identifier and unique among all variables.
     /// The variable can be accessed in other expressions through `variables`

k8s-pb/src/api/admissionregistration/v1beta1/mod.rs

@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// AuditAnnotation describes how to produce an audit annotation for an API request.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AuditAnnotation {
     /// key specifies the audit annotation key. The audit annotation keys of
     /// a ValidatingAdmissionPolicy must be unique. The key must be a qualified
@@ -38,7 +38,7 @@ pub struct AuditAnnotation {
     pub value_expression: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// ExpressionWarning is a warning information that targets a specific expression.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ExpressionWarning {
     /// The path to the field that refers the expression.
     /// For example, the reference to the expression of the first item of
@@ -52,7 +52,7 @@ pub struct ExpressionWarning {
     pub warning: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// MatchCondition represents a condition which must be fulfilled for a request to be sent to a webhook.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MatchCondition {
     /// Name is an identifier for this match condition, used for strategic merging of MatchConditions,
     /// as well as providing an identifier for logging purposes. A good name should be descriptive of
@@ -384,7 +384,7 @@ pub struct MutatingWebhookConfigurationList {
 }
 /// NamedRuleWithOperations is a tuple of Operations and Resources with ResourceNames.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NamedRuleWithOperations {
     /// ResourceNames is an optional white list of names that the rule applies to.  An empty set means that everything is allowed.
     /// +listType=atomic
@@ -397,7 +397,7 @@ pub struct NamedRuleWithOperations {
 }
 /// ParamKind is a tuple of Group Kind and Version.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ParamKind {
     /// APIVersion is the API group version the resources belong to.
     /// In format of "group/version".
@@ -469,7 +469,7 @@ pub struct ParamRef {
     pub parameter_not_found_action: ::core::option::Option<::prost::alloc::string::String>,
 }
 /// ServiceReference holds a reference to Service.legacy.k8s.io
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ServiceReference {
     /// `namespace` is the namespace of the service.
     /// Required
@@ -929,7 +929,7 @@ pub struct ValidatingWebhookConfigurationList {
     pub items: ::prost::alloc::vec::Vec<ValidatingWebhookConfiguration>,
 }
 /// Validation specifies the CEL expression which is used to apply the validation.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Validation {
     /// Expression represents the expression which will be evaluated by CEL.
     /// ref: <https://github.com/google/cel-spec>
@@ -1009,7 +1009,7 @@ pub struct Validation {
 }
 /// Variable is the definition of a variable that is used for composition. A variable is defined as a named expression.
 /// +structType=atomic
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Variable {
     /// Name is the name of the variable. The name must be a valid CEL identifier and unique among all variables.
     /// The variable can be accessed in other expressions through `variables`
@@ -1023,7 +1023,7 @@ pub struct Variable {
 }
 /// WebhookClientConfig contains the information to make a TLS
 /// connection with the webhook
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct WebhookClientConfig {
     /// `url` gives the location of the webhook, in standard URL form
     /// (`scheme://host:port/path`). Exactly one of `url` or `service`

k8s-pb/src/api/apiserverinternal/v1alpha1/mod.rs

@@ -1,7 +1,7 @@
 // This file is @generated by prost-build.
 /// An API server instance reports the version it can decode and the version it
 /// encodes objects to when persisting objects in the backend.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ServerStorageVersion {
     /// The ID of the reporting API server.
     #[prost(string, optional, tag = "1")]
@@ -36,7 +36,7 @@ pub struct StorageVersion {
     pub status: ::core::option::Option<StorageVersionStatus>,
 }
 /// Describes the state of the storageVersion at a certain point.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct StorageVersionCondition {
     /// Type of the condition.
     /// +required
@@ -76,7 +76,7 @@ pub struct StorageVersionList {
     pub items: ::prost::alloc::vec::Vec<StorageVersion>,
 }
 /// StorageVersionSpec is an empty spec.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct StorageVersionSpec {}
 /// API server instances report the versions they can decode and the version they
 /// encode objects to when persisting objects in the backend.