refactor: Move create_webhook_and_maintainer function

Author: Techassi

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

@@ -1,16 +1,8 @@
 use std::{fmt::Display, ops::Deref};
 
 use serde::{Deserialize, Serialize};
-use snafu::{ResultExt, Snafu};
-use stackable_operator::{
-    cli::{MaintenanceOptions, OperatorEnvironmentOptions},
-    kube::{Client, core::crd::MergeError},
-    schemars::{self, JsonSchema},
-    webhook::{
-        maintainer::CustomResourceDefinitionMaintainer,
-        servers::{ConversionWebhookError, ConversionWebhookServer},
-    },
-};
+use snafu::Snafu;
+use stackable_operator::schemars::{self, JsonSchema};
 
 mod secret_class;
 mod trust_store;
@@ -26,11 +18,8 @@ pub mod v1alpha2 {
     pub use crate::crd::secret_class::v1alpha2::*;
 }
 
-use tokio::sync::oneshot;
 pub use trust_store::{TrustStore, TrustStoreVersion};
 
-use crate::FIELD_MANAGER;
-
 #[derive(Debug, Snafu)]
 #[snafu(module)]
 pub enum InvalidKerberosPrincipal {
@@ -87,50 +76,3 @@ impl Deref for KerberosPrincipal {
         &self.0
     }
 }
-
-/// Contains errors which can be encountered when creating the conversion webhook server and the
-/// CRD maintainer.
-#[derive(Debug, Snafu)]
-pub enum Error {
-    #[snafu(display("failed to merge CRD"))]
-    MergeCrd { source: MergeError },
-
-    #[snafu(display("failed to create conversion webhook server"))]
-    CreateConversionWebhook { source: ConversionWebhookError },
-}
-
-/// Creates and returns a [`ConversionWebhookServer`] and a [`CustomResourceDefinitionMaintainer`].
-pub async fn create_conversion_webhook_and_maintainer<'a>(
-    operator_environment: &'a OperatorEnvironmentOptions,
-    maintenance: &MaintenanceOptions,
-    client: Client,
-) -> Result<
-    (
-        ConversionWebhookServer,
-        CustomResourceDefinitionMaintainer<'a>,
-        oneshot::Receiver<()>,
-    ),
-    Error,
-> {
-    let crds_and_handlers = [
-        (
-            SecretClass::merged_crd(SecretClassVersion::V1Alpha2).context(MergeCrdSnafu)?,
-            SecretClass::try_convert as fn(_) -> _,
-        ),
-        (
-            TrustStore::merged_crd(TrustStoreVersion::V1Alpha1).context(MergeCrdSnafu)?,
-            TrustStore::try_convert as fn(_) -> _,
-        ),
-    ];
-
-    ConversionWebhookServer::with_maintainer(
-        crds_and_handlers,
-        &operator_environment.operator_service_name,
-        &operator_environment.operator_namespace,
-        FIELD_MANAGER,
-        maintenance.disable_crd_maintenance,
-        client,
-    )
-    .await
-    .context(CreateConversionWebhookSnafu)
-}

rust/operator-binary/src/main.rs

@@ -30,9 +30,9 @@ use tokio_stream::wrappers::UnixListenerStream;
 use tonic::transport::Server;
 use utils::{TonicUnixStream, uds_bind_private};
 
-use crate::crd::{
-    SecretClass, SecretClassVersion, TrustStore, TrustStoreVersion,
-    create_conversion_webhook_and_maintainer, v1alpha2,
+use crate::{
+    crd::{SecretClass, SecretClassVersion, TrustStore, TrustStoreVersion, v1alpha2},
+    webhooks::conversion::create_webhook_and_maintainer,
 };
 
 mod backend;
@@ -43,6 +43,7 @@ mod format;
 mod grpc;
 mod truststore_controller;
 mod utils;
+mod webhooks;
 
 pub const OPERATOR_NAME: &str = "secrets.stackable.tech";
 pub const FIELD_MANAGER: &str = "secret-operator";
@@ -139,7 +140,7 @@ async fn main() -> anyhow::Result<()> {
             }
 
             let (conversion_webhook, crd_maintainer, initial_reconcile_rx) =
-                create_conversion_webhook_and_maintainer(
+                create_webhook_and_maintainer(
                     &operator_environment,
                     &maintenance,
                     client.as_kube_client(),

rust/operator-binary/src/webhooks/conversion.rs

@@ -0,0 +1,62 @@
+use snafu::{ResultExt, Snafu};
+use stackable_operator::{
+    cli::{MaintenanceOptions, OperatorEnvironmentOptions},
+    kube::{Client, core::crd::MergeError},
+    webhook::{
+        maintainer::CustomResourceDefinitionMaintainer,
+        servers::{ConversionWebhookError, ConversionWebhookServer},
+    },
+};
+use tokio::sync::oneshot;
+
+use crate::{
+    FIELD_MANAGER,
+    crd::{SecretClass, SecretClassVersion, TrustStore, TrustStoreVersion},
+};
+
+/// Contains errors which can be encountered when creating the conversion webhook server and the
+/// CRD maintainer.
+#[derive(Debug, Snafu)]
+pub enum Error {
+    #[snafu(display("failed to merge CRD"))]
+    MergeCrd { source: MergeError },
+
+    #[snafu(display("failed to create conversion webhook server"))]
+    CreateConversionWebhook { source: ConversionWebhookError },
+}
+
+/// Creates and returns a [`ConversionWebhookServer`] and a [`CustomResourceDefinitionMaintainer`].
+pub async fn create_webhook_and_maintainer<'a>(
+    operator_environment: &'a OperatorEnvironmentOptions,
+    maintenance: &MaintenanceOptions,
+    client: Client,
+) -> Result<
+    (
+        ConversionWebhookServer,
+        CustomResourceDefinitionMaintainer<'a>,
+        oneshot::Receiver<()>,
+    ),
+    Error,
+> {
+    let crds_and_handlers = [
+        (
+            SecretClass::merged_crd(SecretClassVersion::V1Alpha2).context(MergeCrdSnafu)?,
+            SecretClass::try_convert as fn(_) -> _,
+        ),
+        (
+            TrustStore::merged_crd(TrustStoreVersion::V1Alpha1).context(MergeCrdSnafu)?,
+            TrustStore::try_convert as fn(_) -> _,
+        ),
+    ];
+
+    ConversionWebhookServer::with_maintainer(
+        crds_and_handlers,
+        &operator_environment.operator_service_name,
+        &operator_environment.operator_namespace,
+        FIELD_MANAGER,
+        maintenance.disable_crd_maintenance,
+        client,
+    )
+    .await
+    .context(CreateConversionWebhookSnafu)
+}

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

@@ -0,0 +1 @@
+pub mod conversion;