Merge remote-tracking branch 'origin/main' into refactor/remove-product-config

Author: maltesander

Cargo.nix

@@ -6,7 +6,7 @@ resolver = "2"
 version = "0.0.0-dev"
 authors = ["Stackable GmbH <info@stackable.tech>"]
 license = "OSL-3.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/stackabletech/druid-operator"
 
 [workspace.dependencies]

Cargo.toml

@@ -418,40 +418,40 @@ pub async fn reconcile_druid(
             );
         }
 
-        if let Some(listener_class) = druid_role.listener_class_name(druid) {
-            if let Some(listener_group_name) = group_listener_name(druid, druid_role) {
-                let role_group_listener = build_group_listener(
+        if let Some(listener_class) = druid_role.listener_class_name(druid)
+            && let Some(listener_group_name) = group_listener_name(druid, druid_role)
+        {
+            let role_group_listener = build_group_listener(
+                druid,
+                build_recommended_labels(
                     druid,
-                    build_recommended_labels(
-                        druid,
-                        DRUID_CONTROLLER_NAME,
-                        &validated_cluster.image.app_version_label_value,
-                        &role_name,
-                        "none",
-                    ),
-                    listener_class.to_string(),
-                    listener_group_name,
-                    druid_role,
-                    &validated_cluster.cluster_config.druid_tls_security,
-                )
-                .context(ListenerConfigurationSnafu)?;
-
-                let listener = cluster_resources
-                    .add(client, role_group_listener)
-                    .await
-                    .context(ApplyGroupListenerSnafu)?;
+                    DRUID_CONTROLLER_NAME,
+                    &validated_cluster.image.app_version_label_value,
+                    &role_name,
+                    "none",
+                ),
+                listener_class.to_string(),
+                listener_group_name,
+                druid_role,
+                &validated_cluster.cluster_config.druid_tls_security,
+            )
+            .context(ListenerConfigurationSnafu)?;
 
-                if *druid_role == DruidRole::Router {
-                    // discovery
-                    for discovery_cm in build_discovery_configmaps(&validated_cluster, listener)
+            let listener = cluster_resources
+                .add(client, role_group_listener)
+                .await
+                .context(ApplyGroupListenerSnafu)?;
+
+            if *druid_role == DruidRole::Router {
+                // discovery
+                for discovery_cm in build_discovery_configmaps(&validated_cluster, listener)
+                    .await
+                    .context(BuildDiscoveryConfigSnafu)?
+                {
+                    cluster_resources
+                        .add(client, discovery_cm)
                         .await
-                        .context(BuildDiscoveryConfigSnafu)?
-                    {
-                        cluster_resources
-                            .add(client, discovery_cm)
-                            .await
-                            .context(ApplyDiscoveryConfigSnafu)?;
-                    }
+                        .context(ApplyDiscoveryConfigSnafu)?;
                 }
             }
         }

rust/operator-binary/src/controller.rs

@@ -139,10 +139,9 @@ impl AuthenticationClassesResolved {
                         Some(server_and_internal_secret_class) => {
                             if let Some(auth_class_secret_class) =
                                 &provider.client_cert_secret_class
+                                && auth_class_secret_class != server_and_internal_secret_class
                             {
-                                if auth_class_secret_class != server_and_internal_secret_class {
-                                    return TlsAuthenticationClassSecretClassDiffersFromDruidServerTlsSnafu { auth_class_name: auth_class_name.to_string(), server_and_internal_secret_class: server_and_internal_secret_class.clone() }.fail()?;
-                                }
+                                return TlsAuthenticationClassSecretClassDiffersFromDruidServerTlsSnafu { auth_class_name: auth_class_name.to_string(), server_and_internal_secret_class: server_and_internal_secret_class.clone() }.fail()?;
                             }
                         }
                         None => {
@@ -231,10 +230,10 @@ impl AuthenticationClassesResolved {
     }
 
     pub fn tls_authentication_enabled(&self) -> bool {
-        if !self.auth_classes.is_empty() {
-            if let Some(AuthenticationClassResolved::Tls { .. }) = self.auth_classes.first() {
-                return true;
-            }
+        if !self.auth_classes.is_empty()
+            && let Some(AuthenticationClassResolved::Tls { .. }) = self.auth_classes.first()
+        {
+            return true;
         }
         false
     }

rust/operator-binary/src/crd/authentication.rs

@@ -679,10 +679,10 @@ impl DruidRole {
     ) -> Vec<String> {
         let mut commands = vec![];
 
-        if let Some(s3) = s3 {
-            if let Some(ca_cert_file) = s3.tls.tls_ca_cert_mount_path() {
-                commands.extend(add_cert_to_jvm_trust_store_cmd(&ca_cert_file));
-            }
+        if let Some(s3) = s3
+            && let Some(ca_cert_file) = s3.tls.tls_ca_cert_mount_path()
+        {
+            commands.extend(add_cert_to_jvm_trust_store_cmd(&ca_cert_file));
         }
 
         // copy druid config to rw config

rust/operator-binary/src/crd/mod.rs

@@ -39,7 +39,7 @@ pub async fn create_webhook_server(
         field_manager: FIELD_MANAGER.to_owned(),
     };
 
-    let (conversion_webhook, _initial_reconcile_rx) =
+    let (conversion_webhook, _) =
         ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
 
     let webhook_server_options = WebhookServerOptions {