chore: First round of pedantic clippy lints

Author: sbernauer

crates/stackable-operator/CHANGELOG.md

@@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file.
 - Add support for specifying a `clientAuthenticationMethod` for OIDC ([#1178]).
   This was originally done in [#1158] and had been reverted in [#1170].
 
+### Changed
+
+- BREAKING: `OpaConfig::full_document_url` now takes `&OpaApiVersion` instead of `OpaApiVersion` ([#XXXX]).
+
 ### Removed
 
 - BREAKING: Remove unused `add_prefix`, `try_add_prefix`, `set_name`, and `try_set_name` associated

crates/stackable-operator/src/builder/event.rs

@@ -116,10 +116,7 @@ impl EventBuilder {
             reporting_instance: self.reporting_instance.clone(),
             series: None,
             source,
-            type_: self
-                .event_type
-                .as_ref()
-                .map(|event_type| event_type.to_string()),
+            type_: self.event_type.as_ref().map(ToString::to_string),
         }
     }
 }

crates/stackable-operator/src/builder/meta.rs

@@ -152,7 +152,7 @@ impl ObjectMetaBuilder {
     /// for more flexibility if needed.
     pub fn with_recommended_labels<T: Resource>(
         &mut self,
-        object_labels: ObjectLabels<T>,
+        object_labels: &ObjectLabels<T>,
     ) -> Result<&mut Self> {
         let recommended_labels =
             Labels::recommended(object_labels).context(RecommendedLabelsSnafu)?;
@@ -206,8 +206,8 @@ impl ObjectMetaBuilder {
                 .ownerreference
                 .as_ref()
                 .map(|ownerreference| vec![ownerreference.clone()]),
-            labels: self.labels.clone().map(|l| l.into()),
-            annotations: self.annotations.clone().map(|a| a.into()),
+            labels: self.labels.clone().map(Into::into),
+            annotations: self.annotations.clone().map(Into::into),
             finalizers: self.finalizers.clone(),
             ..ObjectMeta::default()
         }
@@ -350,7 +350,7 @@ mod tests {
             .namespace("bar")
             .ownerreference_from_resource(&pod, Some(true), Some(false))
             .unwrap()
-            .with_recommended_labels(ObjectLabels {
+            .with_recommended_labels(&ObjectLabels {
                 owner: &pod,
                 app_name: "test_app",
                 app_version: "1.0",

crates/stackable-operator/src/builder/pdb.rs

@@ -190,7 +190,7 @@ impl PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, PodDisruptionBudgetCo
                 min_available: min_available.map(i32::from).map(IntOrString::Int),
                 selector: Some(self.selector),
                 // Because this feature is still in beta in k8s version 1.27, the builder currently does not offer this attribute.
-                unhealthy_pod_eviction_policy: Default::default(),
+                unhealthy_pod_eviction_policy: None,
             }),
             ..Default::default()
         }
@@ -250,7 +250,7 @@ mod tests {
                 }),
                 ..Default::default()
             }
-        )
+        );
     }
 
     #[test]
@@ -340,6 +340,6 @@ mod tests {
                 }),
                 ..Default::default()
             }
-        )
+        );
     }
 }

crates/stackable-operator/src/builder/pod/container.rs

@@ -83,7 +83,7 @@ impl ContainerBuilder {
         self
     }
 
-    /// Adds the following container attributes from a [ResolvedProductImage]:
+    /// Adds the following container attributes from a [`ResolvedProductImage`]:
     /// * image
     /// * image_pull_policy
     pub fn image_from_product_image(&mut self, product_image: &ResolvedProductImage) -> &mut Self {
@@ -118,7 +118,7 @@ impl ContainerBuilder {
     pub fn add_env_var_from_field_path(
         &mut self,
         name: impl Into<String>,
-        field_path: FieldPathEnvVar,
+        field_path: &FieldPathEnvVar,
     ) -> &mut Self {
         self.add_env_var_from_source(
             name,
@@ -587,12 +587,12 @@ mod tests {
             assert_eq!(
                 source.to_string(),
                 "input is 64 bytes long but must be no more than 63"
-            )
+            );
         }
         // One characters shorter name is valid
         let max_len_container_name: String = long_container_name.chars().skip(1).collect();
         assert_eq!(max_len_container_name.len(), 63);
-        assert!(ContainerBuilder::new(&max_len_container_name).is_ok())
+        assert!(ContainerBuilder::new(&max_len_container_name).is_ok());
     }
 
     #[test]
@@ -644,7 +644,7 @@ mod tests {
             .resources(resources.clone())
             .build();
 
-        assert_eq!(container.resources, Some(resources))
+        assert_eq!(container.resources, Some(resources));
     }
 
     /// Panics if given container builder constructor result is not [Err] with error message

crates/stackable-operator/src/builder/pod/probe.rs

@@ -194,7 +194,10 @@ impl ProbeBuilder<ProbeAction, Duration> {
 
         // SAFETY: Period is checked above to be non-zero
         let success_threshold = success_threshold_duration.div_duration_f32(*self.period);
-        Ok(self.with_success_threshold(success_threshold.ceil() as i32))
+        // Note: We calculate an f32, which can overflow an i32, so we clamp it to bo in range
+        #[expect(clippy::cast_possible_truncation)]
+        #[expect(clippy::cast_precision_loss)]
+        Ok(self.with_success_threshold(success_threshold.ceil().clamp(0.0, i32::MAX as f32) as i32))
     }
 
     /// After a probe fails `failureThreshold` times in a row, Kubernetes considers that the
@@ -257,7 +260,10 @@ impl ProbeBuilder<ProbeAction, Duration> {
 
         // SAFETY: Period is checked above to be non-zero
         let failure_threshold = failure_threshold_duration.div_duration_f32(*self.period);
-        Ok(self.with_failure_threshold(failure_threshold.ceil() as i32))
+        // Note: We calculate an f32, which can overflow an i32, so we clamp it to bo in range
+        #[expect(clippy::cast_possible_truncation)]
+        #[expect(clippy::cast_precision_loss)]
+        Ok(self.with_failure_threshold(failure_threshold.ceil().clamp(0.0, i32::MAX as f32) as i32))
     }
 
     /// Build the [`Probe`] using the specified contents.

crates/stackable-operator/src/builder/pod/resources.rs

@@ -98,11 +98,11 @@ impl<MR, ML> ResourceRequirementsBuilder<Quantity, (), MR, ML> {
     }
 }
 
-impl<CR, CL, ML> ResourceRequirementsBuilder<CL, CR, (), ML> {
+impl<CR, CL, ML> ResourceRequirementsBuilder<CR, CL, (), ML> {
     pub fn with_memory_request(
         self,
         request: impl Into<String>,
-    ) -> ResourceRequirementsBuilder<CL, CR, Quantity, ML> {
+    ) -> ResourceRequirementsBuilder<CR, CL, Quantity, ML> {
         let Self {
             cpu_request,
             cpu_limit,
@@ -124,7 +124,7 @@ impl<CR, CL, ML> ResourceRequirementsBuilder<CL, CR, (), ML> {
         self,
         request: impl Into<String>,
         factor: f32,
-    ) -> memory::Result<ResourceRequirementsBuilder<CL, CR, Quantity, Quantity>> {
+    ) -> memory::Result<ResourceRequirementsBuilder<CR, CL, Quantity, Quantity>> {
         let request = MemoryQuantity::from_str(&request.into())?;
         let limit = request * factor;
 
@@ -168,7 +168,7 @@ impl<CR, CL> ResourceRequirementsBuilder<CR, CL, Quantity, ()> {
     }
 }
 
-impl<CL, CR, ML, MR> ResourceRequirementsBuilder<CL, CR, ML, MR> {
+impl<CR, CL, MR, ML> ResourceRequirementsBuilder<CR, CL, MR, ML> {
     pub fn with_resource(
         mut self,
         rr_type: ResourceRequirementsType,
@@ -185,21 +185,18 @@ impl<CL, CR, ML, MR> ResourceRequirementsBuilder<CL, CR, ML, MR> {
 
         let resource = resource.to_string();
 
-        match self.other.get_mut(&resource) {
-            Some(types) => {
-                if types.contains_key(&rr_type) {
-                    warn!(
-                        "resource {} for '{}' already set, not overwriting",
-                        rr_type, resource
-                    );
-                }
-
-                types.insert(rr_type, Quantity(quantity.into()));
-            }
-            None => {
-                let types = BTreeMap::from([(rr_type, Quantity(quantity.into()))]);
-                self.other.insert(resource, types);
+        if let Some(types) = self.other.get_mut(&resource) {
+            if types.contains_key(&rr_type) {
+                warn!(
+                    "resource {} for '{}' already set, not overwriting",
+                    rr_type, resource
+                );
             }
+
+            types.insert(rr_type, Quantity(quantity.into()));
+        } else {
+            let types = BTreeMap::from([(rr_type, Quantity(quantity.into()))]);
+            self.other.insert(resource, types);
         }
 
         self
@@ -286,6 +283,6 @@ mod tests {
             .with_resource(ResourceRequirementsType::Requests, "nvidia.com/gpu", "1")
             .build();
 
-        assert_eq!(rr, resources)
+        assert_eq!(rr, resources);
     }
 }

crates/stackable-operator/src/builder/pod/volume.rs

@@ -84,7 +84,7 @@ impl VolumeBuilder {
         quantity: Option<Quantity>,
     ) -> &mut Self {
         self.volume_source = VolumeSource::EmptyDir(EmptyDirVolumeSource {
-            medium: medium.map(|m| m.into()),
+            medium: medium.map(Into::into),
             size_limit: quantity,
         });
         self
@@ -102,7 +102,7 @@ impl VolumeBuilder {
     ) -> &mut Self {
         self.volume_source = VolumeSource::HostPath(HostPathVolumeSource {
             path: path.into(),
-            type_: type_.map(|t| t.into()),
+            type_: type_.map(Into::into),
         });
         self
     }
@@ -362,12 +362,12 @@ impl SecretOperatorVolumeSourceBuilder {
 
         if let Some(password) = &self.tls_pkcs12_password {
             // The `tls_pkcs12_password` is only used for PKCS12 stores.
-            if Some(SecretFormat::TlsPkcs12) != self.format {
-                warn!(format.actual = ?self.format, format.expected = ?Some(SecretFormat::TlsPkcs12), "A TLS PKCS12 password was set but ignored because another format was requested")
-            } else {
+            if Some(SecretFormat::TlsPkcs12) == self.format {
                 annotations.insert(
                     Annotation::tls_pkcs12_password(password).context(ParseAnnotationSnafu)?,
                 );
+            } else {
+                warn!(format.actual = ?self.format, format.expected = ?Some(SecretFormat::TlsPkcs12), "A TLS PKCS12 password was set but ignored because another format was requested");
             }
         }
 
@@ -500,18 +500,6 @@ impl ListenerOperatorVolumeSourceBuilder {
         }
     }
 
-    fn build_spec(&self) -> PersistentVolumeClaimSpec {
-        PersistentVolumeClaimSpec {
-            storage_class_name: Some("listeners.stackable.tech".to_string()),
-            resources: Some(VolumeResourceRequirements {
-                requests: Some([("storage".to_string(), Quantity("1".to_string()))].into()),
-                ..Default::default()
-            }),
-            access_modes: Some(vec!["ReadWriteMany".to_string()]),
-            ..PersistentVolumeClaimSpec::default()
-        }
-    }
-
     #[deprecated(note = "renamed to `build_ephemeral`", since = "0.61.1")]
     pub fn build(&self) -> Result<EphemeralVolumeSource, ListenerOperatorVolumeSourceBuilderError> {
         self.build_ephemeral()
@@ -534,7 +522,7 @@ impl ListenerOperatorVolumeSourceBuilder {
                         .with_labels(self.labels.clone())
                         .build(),
                 ),
-                spec: self.build_spec(),
+                spec: Self::spec(),
             }),
         })
     }
@@ -555,10 +543,22 @@ impl ListenerOperatorVolumeSourceBuilder {
                 .with_annotation(listener_reference_annotation)
                 .with_labels(self.labels.clone())
                 .build(),
-            spec: Some(self.build_spec()),
+            spec: Some(Self::spec()),
             ..Default::default()
         })
     }
+
+    fn spec() -> PersistentVolumeClaimSpec {
+        PersistentVolumeClaimSpec {
+            storage_class_name: Some("listeners.stackable.tech".to_string()),
+            resources: Some(VolumeResourceRequirements {
+                requests: Some([("storage".to_string(), Quantity("1".to_string()))].into()),
+                ..Default::default()
+            }),
+            access_modes: Some(vec!["ReadWriteMany".to_string()]),
+            ..PersistentVolumeClaimSpec::default()
+        }
+    }
 }
 
 #[cfg(test)]

crates/stackable-operator/src/cli/mod.rs

@@ -126,6 +126,6 @@ mod tests {
         RunArguments::command()
             .print_long_help()
             .expect("help message should be printed to stdout");
-        RunArguments::command().debug_assert()
+        RunArguments::command().debug_assert();
     }
 }

crates/stackable-operator/src/cli/product_config.rs

@@ -59,7 +59,7 @@ impl ProductConfigPath {
         let search_paths = if let Some(path) = user_provided_path {
             vec![path]
         } else {
-            default_paths.iter().map(|path| path.as_ref()).collect()
+            default_paths.iter().map(AsRef::as_ref).collect()
         };
         for path in &search_paths {
             if path.exists() {
@@ -148,7 +148,7 @@ mod tests {
     }
 
     #[test]
-    #[should_panic]
+    #[should_panic = "RequiredFileMissing { search_path: [\"user_provided_path_properties.yaml\"] }"]
     fn resolve_path_user_path_not_existing() {
         ProductConfigPath::resolve_path(Some(USER_PROVIDED_PATH.as_ref()), &[DEPLOY_FILE_PATH])
             .unwrap();
@@ -165,7 +165,7 @@ mod tests {
                     PathBuf::from(DEPLOY_FILE_PATH),
                     PathBuf::from(DEFAULT_FILE_PATH)
                 ]
-            )
+            );
         } else {
             panic!("must return RequiredFileMissing when file was not found")
         }