missing v2::builder::meta::ownerreference_from_resource, clippy warnings

Author: adwk67

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

@@ -10,7 +10,8 @@ use stackable_operator::crd::authentication;
 use crate::crd::authentication::{AuthenticationClassResolved, AuthenticationClassesResolved};
 
 /// Type alias for Druid's OIDC client authentication options, opting in to the
-/// `clientAuthenticationMethod` field via [`oidc::v1alpha1::ClientAuthenticationMethodOption`].
+/// `clientAuthenticationMethod` field via
+/// [`authentication::oidc::v1alpha1::ClientAuthenticationMethodOption`].
 pub type DruidClientAuthenticationOptions =
     authentication::oidc::v1alpha1::ClientAuthenticationOptions<
         authentication::oidc::v1alpha1::ClientAuthenticationMethodOption,

rust/operator-binary/src/controller.rs

@@ -225,7 +225,7 @@ pub async fn reconcile_druid(
 
     // The internal secret is shared across all roles and role groups, so it only needs to be
     // created once per reconcile rather than inside the role loop below.
-    create_shared_internal_secret(druid, client, DRUID_CONTROLLER_NAME)
+    create_shared_internal_secret(&validated_cluster, client, DRUID_CONTROLLER_NAME)
         .await
         .context(FailedInternalSecretCreationSnafu)?;
 

rust/operator-binary/src/controller/build/resource/config_map.rs

@@ -8,8 +8,8 @@
 //! Metadata, owner reference and recommended labels are derived entirely from `ValidatedCluster`
 //! (which carries the validated name/namespace/uid and implements `Resource`).
 //!
-//! The builder does not read the raw [`v1alpha1::DruidCluster`] at all: everything it needs is
-//! carried on `ValidatedCluster` (resolved during the validate step).
+//! The builder does not read the raw [`crate::crd::v1alpha1::DruidCluster`] at all: everything it
+//! needs is carried on `ValidatedCluster` (resolved during the validate step).
 
 use std::collections::BTreeMap;
 

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

@@ -75,7 +75,8 @@ pub struct DereferencedObjects {
     /// and its connection.
     pub s3_deep_storage_bucket: Option<s3::v1alpha1::ResolvedBucket>,
     /// The raw, fetched `AuthenticationClass` objects (in spec order). Validation of these happens
-    /// in the validate step via [`AuthenticationClassesResolved::from_fetched`].
+    /// in the validate step via
+    /// [`crate::crd::authentication::AuthenticationClassesResolved::from_fetched`].
     pub authentication_classes: Vec<core::v1alpha1::AuthenticationClass>,
 }
 

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

@@ -83,9 +83,9 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 ///
 /// This is the upstream [`stackable_operator::v2::role_utils::RoleGroupConfig`] (config plus the
 /// four merged override categories), with the typed per-role config erased to
-/// [`ValidatedDruidConfig`] so that all roles share a single type. The rendered per-file configs
-/// (runtime.properties / security.properties / jvm.config) are produced later, in the config-map
-/// build step.
+/// [`crate::crd::ValidatedDruidConfig`] so that all roles share a single type. The rendered
+/// per-file configs (runtime.properties / security.properties / jvm.config) are produced later, in
+/// the config-map build step.
 ///
 /// Defined in [`crate::crd`] (where it has access to the private typed config fields) and
 /// re-exported here for the build step.

rust/operator-binary/src/internal_secret.rs

@@ -6,9 +6,13 @@ use stackable_operator::{
     client::Client,
     k8s_openapi::api::core::v1::{EnvVar, EnvVarSource, Secret, SecretKeySelector},
     kube::ResourceExt,
+    v2::builder::meta::ownerreference_from_resource,
 };
 
-use crate::crd::{COOKIE_PASSPHRASE_ENV, security::INTERNAL_INITIAL_CLIENT_PASSWORD_ENV, v1alpha1};
+use crate::{
+    controller::validate::ValidatedCluster,
+    crd::{COOKIE_PASSPHRASE_ENV, security::INTERNAL_INITIAL_CLIENT_PASSWORD_ENV},
+};
 
 #[derive(Snafu, Debug)]
 #[allow(clippy::enum_variant_names)]
@@ -30,19 +34,14 @@ pub enum Error {
 
     #[snafu(display("object defines no namespace"))]
     ObjectHasNoNamespace,
-
-    #[snafu(display("object is missing metadata to build owner reference"))]
-    ObjectMissingMetadataForOwnerRef {
-        source: stackable_operator::builder::meta::Error,
-    },
 }
 
 pub async fn create_shared_internal_secret(
-    druid: &v1alpha1::DruidCluster,
+    cluster: &ValidatedCluster,
     client: &Client,
     controller_name: &str,
 ) -> Result<(), Error> {
-    let secret = build_shared_internal_secret(druid)?;
+    let secret = build_shared_internal_secret(cluster);
     let existing_secret = client
         .get_opt::<Secret>(
             &secret.name_any(),
@@ -55,7 +54,7 @@ pub async fn create_shared_internal_secret(
         .context(FailedToRetrieveInternalSecretSnafu)?;
     let existing_immutable_secret = client
         .get_opt::<Secret>(
-            &build_immutable_shared_internal_secret_name(druid),
+            &build_immutable_shared_internal_secret_name(cluster),
             secret
                 .namespace()
                 .as_deref()
@@ -142,28 +141,27 @@ pub async fn create_shared_internal_secret(
     Ok(())
 }
 
-fn build_shared_internal_secret(druid: &v1alpha1::DruidCluster) -> Result<Secret, Error> {
+fn build_shared_internal_secret(cluster: &ValidatedCluster) -> Secret {
     let mut internal_secret = BTreeMap::new();
     internal_secret.insert(
         INTERNAL_INITIAL_CLIENT_PASSWORD_ENV.to_string(),
         get_random_base64(),
     );
     internal_secret.insert(COOKIE_PASSPHRASE_ENV.to_string(), get_random_base64());
 
-    Ok(Secret {
+    Secret {
         metadata: ObjectMetaBuilder::new()
-            .name(build_shared_internal_secret_name(druid))
-            .namespace_opt(druid.namespace())
-            .ownerreference_from_resource(druid, None, Some(true))
-            .context(ObjectMissingMetadataForOwnerRefSnafu)?
+            .name(build_shared_internal_secret_name(cluster))
+            .namespace_opt(cluster.namespace())
+            .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
             .build(),
         string_data: Some(internal_secret),
         ..Secret::default()
-    })
+    }
 }
 
-fn build_immutable_shared_internal_secret_name(druid: &v1alpha1::DruidCluster) -> String {
-    format!("{}-internal-secret", druid.name_any())
+fn build_immutable_shared_internal_secret_name(cluster: &ValidatedCluster) -> String {
+    format!("{}-internal-secret", cluster.name_any())
 }
 
 pub fn build_shared_internal_secret_name<T: ResourceExt>(owner: &T) -> String {