refactor: extract update_status step

Author: adwk67

rust/operator-binary/src/airflow_controller.rs

@@ -16,19 +16,16 @@ use stackable_operator::{
     },
     logging::controller::ReconcilerError,
     shared::time::Duration,
-    status::condition::{
-        compute_conditions, operations::ClusterOperationsConditionBuilder,
-        statefulset::StatefulSetConditionBuilder,
-    },
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
     controller::{
         apply::{self, Applier, ensure_random_secrets},
         build,
+        update_status::{self, update_status},
     },
-    crd::{AirflowClusterStatus, OPERATOR_NAME, v1alpha2},
+    crd::{OPERATOR_NAME, v1alpha2},
 };
 
 pub const AIRFLOW_CONTROLLER_NAME: &str = "airflowcluster";
@@ -55,10 +52,8 @@ pub enum Error {
     #[snafu(display("failed to ensure the shared random Secrets exist"))]
     EnsureSecrets { source: apply::Error },
 
-    #[snafu(display("failed to update status"))]
-    ApplyStatus {
-        source: stackable_operator::client::Error,
-    },
+    #[snafu(display("failed to update the cluster status"))]
+    UpdateStatus { source: update_status::Error },
 
     #[snafu(display("failed to dereference cluster resources"))]
     Dereference {
@@ -102,9 +97,6 @@ pub async fn reconcile_airflow(
         .await
         .context(DereferenceSnafu)?;
 
-    let cluster_operation_cond_builder =
-        ClusterOperationsConditionBuilder::new(&airflow.spec.cluster_operation);
-
     let validated_cluster = crate::controller::validate::validate_cluster(
         airflow,
         &ctx.operator_environment.image_repository,
@@ -127,22 +119,9 @@ pub async fn reconcile_airflow(
     .await
     .context(ApplyResourcesSnafu)?;
 
-    let mut ss_cond_builder = StatefulSetConditionBuilder::default();
-    for statefulset in applied.stateful_sets {
-        ss_cond_builder.add(statefulset);
-    }
-
-    let status = AirflowClusterStatus {
-        conditions: compute_conditions(
-            airflow,
-            &[&ss_cond_builder, &cluster_operation_cond_builder],
-        ),
-    };
-
-    client
-        .apply_patch_status(OPERATOR_NAME, airflow, &status)
+    update_status(client, airflow, &applied)
         .await
-        .context(ApplyStatusSnafu)?;
+        .context(UpdateStatusSnafu)?;
 
     Ok(Action::await_change())
 }

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

@@ -65,6 +65,7 @@ use crate::{
 pub mod apply;
 pub mod build;
 pub mod dereference;
+pub mod update_status;
 pub mod validate;
 
 // Placeholder version label value for resources whose labels must not change after deployment.

rust/operator-binary/src/controller/update_status.rs

@@ -0,0 +1,58 @@
+//! The update_status step in the AirflowCluster controller.
+
+use snafu::{ResultExt, Snafu};
+use stackable_operator::{
+    client::Client,
+    status::condition::{
+        compute_conditions, operations::ClusterOperationsConditionBuilder,
+        statefulset::StatefulSetConditionBuilder,
+    },
+};
+use strum::{EnumDiscriminants, IntoStaticStr};
+
+use crate::{
+    controller::{Applied, KubernetesResources},
+    crd::{AirflowClusterStatus, OPERATOR_NAME, v1alpha2},
+};
+
+#[derive(Snafu, Debug, EnumDiscriminants)]
+#[strum_discriminants(derive(IntoStaticStr))]
+pub enum Error {
+    #[snafu(display("failed to update status"))]
+    ApplyStatus {
+        source: stackable_operator::client::Error,
+    },
+}
+
+type Result<T, E = Error> = std::result::Result<T, E>;
+
+/// Computes the cluster status from the applied resources and patches it onto the
+/// [`v1alpha2::AirflowCluster`]. Takes [`KubernetesResources<Applied>`] so the type system
+/// proves the status derives from applied resources, not merely built ones.
+pub async fn update_status(
+    client: &Client,
+    airflow: &v1alpha2::AirflowCluster,
+    applied: &KubernetesResources<Applied>,
+) -> Result<()> {
+    let mut ss_cond_builder = StatefulSetConditionBuilder::default();
+    for stateful_set in &applied.stateful_sets {
+        ss_cond_builder.add(stateful_set.clone());
+    }
+
+    let cluster_operation_cond_builder =
+        ClusterOperationsConditionBuilder::new(&airflow.spec.cluster_operation);
+
+    let status = AirflowClusterStatus {
+        conditions: compute_conditions(
+            airflow,
+            &[&ss_cond_builder, &cluster_operation_cond_builder],
+        ),
+    };
+
+    client
+        .apply_patch_status(OPERATOR_NAME, airflow, &status)
+        .await
+        .context(ApplyStatusSnafu)?;
+
+    Ok(())
+}