small refactorings

Author: xeniape

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

@@ -19,7 +19,6 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 pub mod versioned {
     /// The DruidConnection resource can be used to automatically deploy a Druid datasource in Superset.
     /// Learn more about it in the [Superset operator usage guide](DOCS_BASE_URL_PLACEHOLDER/superset/usage-guide/connecting-druid).
-    #[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
     #[versioned(k8s(
         group = "superset.stackable.tech",
         plural = "druidconnections",
@@ -31,6 +30,7 @@ pub mod versioned {
             schemars = "stackable_operator::schemars"
         )
     ))]
+    #[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct DruidConnectionSpec {
         /// The Superset to connect.

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

@@ -102,7 +102,6 @@ pub mod versioned {
     /// A Superset cluster stacklet. This resource is managed by the Stackable operator for Apache Superset.
     /// Find more information on how to use it and the resources that the operator generates in the
     /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/superset/).
-    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
     #[versioned(k8s(
         group = "superset.stackable.tech",
         plural = "supersetclusters",
@@ -115,6 +114,7 @@ pub mod versioned {
             schemars = "stackable_operator::schemars"
         )
     ))]
+    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct SupersetClusterSpec {
         // no doc - docs in the struct.

rust/operator-binary/src/main.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use clap::{crate_description, crate_version, Parser};
-use crd::druidconnection::DruidConnection;
 use futures::{pin_mut, StreamExt};
 use stackable_operator::{
     cli::{Command, ProductOperatorRun},
@@ -26,7 +25,10 @@ use stackable_operator::{
 };
 
 use crate::{
-    crd::{druidconnection, v1alpha1, SupersetCluster, APP_NAME},
+    crd::{
+        druidconnection::{self, DruidConnection},
+        v1alpha1, SupersetCluster, APP_NAME,
+    },
     druid_connection_controller::DRUID_CONNECTION_FULL_CONTROLLER_NAME,
     superset_controller::SUPERSET_FULL_CONTROLLER_NAME,
 };