fix: Fix CRD schema, clippy warnings, and formatting

sionsmith · claude · sionsmith · commit 0d3cb8dbb8ee · 2026-01-06T18:37:32.000Z
- Add explicit object type schema for affinity and securityContext fields - Replace manual modulo check with is_multiple_of() - Replace format! with to_string() for static strings - Run cargo fmt to fix all formatting issues 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
diff --git a/deploy/crds/all.yaml b/deploy/crds/all.yaml
@@ -305,7 +305,7 @@ spec:
                 properties:
                   affinity:
                     description: Affinity rules (JSON/YAML format matching k8s affinity)
-                    nullable: true
+                    type: object
                   annotations:
                     additionalProperties:
                       type: string
@@ -355,7 +355,7 @@ spec:
                     type: object
                   securityContext:
                     description: Security context (JSON/YAML format matching k8s pod security context)
-                    nullable: true
+                    type: object
                   serviceAccountName:
                     description: Service account name
                     nullable: true
@@ -388,6 +388,9 @@ spec:
                           type: string
                       type: object
                     type: array
+                required:
+                - affinity
+                - securityContext
                 type: object
               replicas:
                 default: 1
diff --git a/deploy/helm/kafka-partition-remapper-operator/crds/all.yaml b/deploy/helm/kafka-partition-remapper-operator/crds/all.yaml
@@ -305,7 +305,7 @@ spec:
                 properties:
                   affinity:
                     description: Affinity rules (JSON/YAML format matching k8s affinity)
-                    nullable: true
+                    type: object
                   annotations:
                     additionalProperties:
                       type: string
@@ -355,7 +355,7 @@ spec:
                     type: object
                   securityContext:
                     description: Security context (JSON/YAML format matching k8s pod security context)
-                    nullable: true
+                    type: object
                   serviceAccountName:
                     description: Service account name
                     nullable: true
@@ -388,6 +388,9 @@ spec:
                           type: string
                       type: object
                     type: array
+                required:
+                - affinity
+                - securityContext
                 type: object
               replicas:
                 default: 1
diff --git a/src/adapters/deployment_builder.rs b/src/adapters/deployment_builder.rs
@@ -2,8 +2,8 @@
 
 use k8s_openapi::api::apps::v1::{Deployment, DeploymentSpec};
 use k8s_openapi::api::core::v1::{
-    Container, ContainerPort, EnvVar, PodSpec, PodTemplateSpec, Probe, TCPSocketAction,
-    Volume, VolumeMount, ConfigMapVolumeSource, LocalObjectReference,
+    ConfigMapVolumeSource, Container, ContainerPort, EnvVar, LocalObjectReference, PodSpec,
+    PodTemplateSpec, Probe, TCPSocketAction, Volume, VolumeMount,
 };
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::{LabelSelector, ObjectMeta, OwnerReference};
 use k8s_openapi::apimachinery::pkg::util::intstr::IntOrString;
@@ -278,9 +278,7 @@ fn build_pod_spec(spec: &KafkaPartitionRemapperSpec, config_map_name: &str) -> P
             pod_spec.image_pull_secrets = Some(
                 pt.image_pull_secrets
                     .iter()
-                    .map(|s| LocalObjectReference {
-                        name: s.clone(),
-                    })
+                    .map(|s| LocalObjectReference { name: s.clone() })
                     .collect(),
             );
         }
diff --git a/src/adapters/mod.rs b/src/adapters/mod.rs
@@ -1,6 +1,6 @@
 //! Adapters for configuration transformation and Kubernetes resource building
 
-pub mod secrets;
-pub mod remapper_config;
 pub mod deployment_builder;
+pub mod remapper_config;
+pub mod secrets;
 pub mod service_builder;
diff --git a/src/adapters/secrets.rs b/src/adapters/secrets.rs
@@ -19,7 +19,7 @@ pub fn get_secret_key(secret: &Secret, key: &str) -> Result<String> {
     let data = secret
         .data
         .as_ref()
-        .ok_or_else(|| Error::SecretError(format!("Secret has no data")))?;
+        .ok_or_else(|| Error::SecretError("Secret has no data".to_string()))?;
 
     let value = data
         .get(key)
diff --git a/src/controllers/remapper_controller.rs b/src/controllers/remapper_controller.rs
@@ -15,7 +15,7 @@ use tracing::{error, info, instrument};
 
 use crate::controllers::Context;
 use crate::crd::KafkaPartitionRemapper;
-use crate::metrics::prometheus::{RECONCILIATIONS, RECONCILE_DURATION, RECONCILIATION_ERRORS};
+use crate::metrics::prometheus::{RECONCILE_DURATION, RECONCILIATIONS, RECONCILIATION_ERRORS};
 use crate::reconcilers::remapper;
 use crate::Error;
 
@@ -53,7 +53,9 @@ async fn reconcile(
     let ns = remapper.namespace().unwrap_or_default();
     let name = remapper.name_any();
 
-    RECONCILIATIONS.with_label_values(&["KafkaPartitionRemapper"]).inc();
+    RECONCILIATIONS
+        .with_label_values(&["KafkaPartitionRemapper"])
+        .inc();
 
     let remappers: Api<KafkaPartitionRemapper> = Api::namespaced(ctx.client.clone(), &ns);
 
@@ -100,7 +102,8 @@ async fn apply(remapper: &KafkaPartitionRemapper, ctx: &Context) -> Result<Actio
     let config_map_name = remapper::reconcile_config_map(remapper, &ctx.client, &ns).await?;
 
     // Reconcile Deployment
-    let deployment_name = remapper::reconcile_deployment(remapper, &ctx.client, &ns, &config_map_name).await?;
+    let deployment_name =
+        remapper::reconcile_deployment(remapper, &ctx.client, &ns, &config_map_name).await?;
 
     // Reconcile Service
     let service_name = remapper::reconcile_service(remapper, &ctx.client, &ns).await?;
@@ -138,15 +141,14 @@ fn error_policy(remapper: Arc<KafkaPartitionRemapper>, err: &Error, _ctx: Arc<Co
     let ns = remapper.namespace().unwrap_or_default();
     let name = remapper.name_any();
 
-    error!(
-        "Reconciliation error for {}/{}: {:?}",
-        ns, name, err
-    );
+    error!("Reconciliation error for {}/{}: {:?}", ns, name, err);
 
     // Requeue with exponential backoff based on error type
     match err {
         Error::KubeError(_) => Action::requeue(Duration::from_secs(30)),
-        Error::ConfigError(_) | Error::ValidationError(_) => Action::requeue(Duration::from_secs(300)),
+        Error::ConfigError(_) | Error::ValidationError(_) => {
+            Action::requeue(Duration::from_secs(300))
+        }
         _ => Action::requeue(Duration::from_secs(60)),
     }
 }
diff --git a/src/crd/kafka_partition_remapper.rs b/src/crd/kafka_partition_remapper.rs
@@ -439,6 +439,7 @@ pub struct PodTemplateSpec {
 
     /// Affinity rules (JSON/YAML format matching k8s affinity)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[schemars(schema_with = "any_object_schema")]
     pub affinity: Option<serde_json::Value>,
 
     /// Resource requirements
@@ -467,9 +468,18 @@ pub struct PodTemplateSpec {
 
     /// Security context (JSON/YAML format matching k8s pod security context)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[schemars(schema_with = "any_object_schema")]
     pub security_context: Option<serde_json::Value>,
 }
 
+/// Generate a schema for arbitrary JSON objects
+fn any_object_schema(_gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+    schemars::schema::Schema::Object(schemars::schema::SchemaObject {
+        instance_type: Some(schemars::schema::InstanceType::Object.into()),
+        ..Default::default()
+    })
+}
+
 /// Toleration specification
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
diff --git a/src/main.rs b/src/main.rs
@@ -56,8 +56,9 @@ async fn main() -> anyhow::Result<()> {
 
 /// Initialize tracing subscriber
 fn init_tracing() {
-    let env_filter = EnvFilter::try_from_default_env()
-        .unwrap_or_else(|_| EnvFilter::new("info,kafka_partition_remapper_operator=debug,kube=warn,hyper=warn"));
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| {
+        EnvFilter::new("info,kafka_partition_remapper_operator=debug,kube=warn,hyper=warn")
+    });
 
     tracing_subscriber::registry()
         .with(env_filter)
diff --git a/src/reconcilers/remapper.rs b/src/reconcilers/remapper.rs
@@ -38,7 +38,7 @@ pub fn validate(remapper: &KafkaPartitionRemapper) -> Result<()> {
         ));
     }
 
-    if spec.mapping.virtual_partitions % spec.mapping.physical_partitions != 0 {
+    if !spec.mapping.virtual_partitions.is_multiple_of(spec.mapping.physical_partitions) {
         return Err(Error::ValidationError(
             "mapping.virtualPartitions must be evenly divisible by mapping.physicalPartitions"
                 .to_string(),
@@ -56,9 +56,7 @@ pub fn validate(remapper: &KafkaPartitionRemapper) -> Result<()> {
 
     // Validate replicas
     if spec.replicas < 0 {
-        return Err(Error::ValidationError(
-            "replicas must be >= 0".to_string(),
-        ));
+        return Err(Error::ValidationError("replicas must be >= 0".to_string()));
     }
 
     // Validate security protocol
@@ -254,13 +252,18 @@ pub async fn update_status(
         type_: "DeploymentAvailable".to_string(),
         status: if ready_replicas > 0 { "True" } else { "False" }.to_string(),
         last_transition_time: now,
-        reason: Some(if ready_replicas > 0 {
-            "ReplicasAvailable"
-        } else {
-            "NoReplicasAvailable"
-        }
-        .to_string()),
-        message: Some(format!("{}/{} replicas ready", ready_replicas, spec.replicas)),
+        reason: Some(
+            if ready_replicas > 0 {
+                "ReplicasAvailable"
+            } else {
+                "NoReplicasAvailable"
+            }
+            .to_string(),
+        ),
+        message: Some(format!(
+            "{}/{} replicas ready",
+            ready_replicas, spec.replicas
+        )),
     });
 
     conditions.push(Condition {
diff --git a/tests/reconciler_validation_tests.rs b/tests/reconciler_validation_tests.rs
@@ -5,8 +5,8 @@
 
 use k8s_openapi::apimachinery::pkg::apis::meta::v1::ObjectMeta;
 use kafka_partition_remapper_operator::crd::{
-    KafkaClusterSpec, KafkaPartitionRemapper, KafkaPartitionRemapperSpec, ListenSpec,
-    LoggingSpec, MappingSpec, MetricsSpec, ServiceSpec,
+    KafkaClusterSpec, KafkaPartitionRemapper, KafkaPartitionRemapperSpec, ListenSpec, LoggingSpec,
+    MappingSpec, MetricsSpec, ServiceSpec,
 };
 use kafka_partition_remapper_operator::reconcilers::remapper;
 
@@ -172,11 +172,11 @@ fn remapper_virtual_not_divisible_by_physical_fails_validation() {
 #[test]
 fn remapper_valid_partition_ratios_pass_validation() {
     let valid_ratios = vec![
-        (100, 100),   // 1:1
-        (100, 200),   // 1:2
-        (100, 1000),  // 1:10
-        (50, 500),    // 1:10
-        (10, 100),    // 1:10
+        (100, 100),  // 1:1
+        (100, 200),  // 1:2
+        (100, 1000), // 1:10
+        (50, 500),   // 1:10
+        (10, 100),   // 1:10
     ];
 
     for (physical, virtual_p) in valid_ratios {
