KubernetesClusterInfoCliOpts -> KubernetesClusterInfoOpts

Author: sbernauer

crates/stackable-operator/src/cli.rs

@@ -117,7 +117,7 @@ use snafu::{ResultExt, Snafu};
 
 use crate::{
     logging::TracingTarget, namespace::WatchNamespace,
-    utils::cluster_info::KubernetesClusterInfoCliOpts,
+    utils::cluster_info::KubernetesClusterInfoOpts,
 };
 
 pub const AUTHOR: &str = "Stackable GmbH - [email protected]";
@@ -177,7 +177,7 @@ pub enum Command<Run: Args = ProductOperatorRun> {
 /// use stackable_operator::{
 ///     logging::TracingTarget,
 ///     namespace::WatchNamespace,
-///     utils::cluster_info::KubernetesClusterInfoCliOpts
+///     utils::cluster_info::KubernetesClusterInfoOpts
 /// };
 ///
 /// let opts = Command::<Run>::parse_from(["foobar-operator", "run", "--name", "foo", "--product-config", "bar", "--watch-namespace", "foobar"]);
@@ -187,7 +187,7 @@ pub enum Command<Run: Args = ProductOperatorRun> {
 ///         product_config: ProductConfigPath::from("bar".as_ref()),
 ///         watch_namespace: WatchNamespace::One("foobar".to_string()),
 ///         tracing_target: TracingTarget::None,
-///         cluster_info_opts: KubernetesClusterInfoCliOpts {
+///         cluster_info_opts: KubernetesClusterInfoOpts {
 ///             kubernetes_cluster_domain: None
 ///         }
 ///     },
@@ -225,7 +225,7 @@ pub struct ProductOperatorRun {
     pub tracing_target: TracingTarget,
 
     #[command(flatten)]
-    pub cluster_info_opts: KubernetesClusterInfoCliOpts,
+    pub cluster_info_opts: KubernetesClusterInfoOpts,
 }
 
 /// A path to a [`ProductConfigManager`] spec file
@@ -399,7 +399,7 @@ mod tests {
                 product_config: ProductConfigPath::from("bar".as_ref()),
                 watch_namespace: WatchNamespace::One("foo".to_string()),
                 tracing_target: TracingTarget::None,
-                cluster_info_opts: KubernetesClusterInfoCliOpts {
+                cluster_info_opts: KubernetesClusterInfoOpts {
                     kubernetes_cluster_domain: None
                 }
             }
@@ -413,7 +413,7 @@ mod tests {
                 product_config: ProductConfigPath::from("bar".as_ref()),
                 watch_namespace: WatchNamespace::All,
                 tracing_target: TracingTarget::None,
-                cluster_info_opts: KubernetesClusterInfoCliOpts {
+                cluster_info_opts: KubernetesClusterInfoOpts {
                     kubernetes_cluster_domain: None
                 }
             }
@@ -428,7 +428,7 @@ mod tests {
                 product_config: ProductConfigPath::from("bar".as_ref()),
                 watch_namespace: WatchNamespace::One("foo".to_string()),
                 tracing_target: TracingTarget::None,
-                cluster_info_opts: KubernetesClusterInfoCliOpts {
+                cluster_info_opts: KubernetesClusterInfoOpts {
                     kubernetes_cluster_domain: None
                 }
             }

crates/stackable-operator/src/client.rs

@@ -21,7 +21,7 @@ use tracing::trace;
 
 use crate::{
     kvp::LabelSelectorExt,
-    utils::cluster_info::{KubernetesClusterInfo, KubernetesClusterInfoCliOpts},
+    utils::cluster_info::{KubernetesClusterInfo, KubernetesClusterInfoOpts},
 };
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -523,13 +523,13 @@ impl Client {
     /// use k8s_openapi::api::core::v1::Pod;
     /// use stackable_operator::{
     ///     client::{Client, initialize_operator},
-    ///     utils::cluster_info::KubernetesClusterInfoCliOpts
+    ///     utils::cluster_info::KubernetesClusterInfoOpts
     /// };
     ///
     /// #[tokio::main]
     /// async fn main() {
     ///
-    /// let cluster_info_cli_opts = KubernetesClusterInfoCliOpts {
+    /// let cluster_info_cli_opts = KubernetesClusterInfoOpts {
     ///     kubernetes_cluster_domain: None,
     /// };
     /// let client = initialize_operator(None, &cluster_info_cli_opts)
@@ -643,7 +643,7 @@ where
 
 pub async fn initialize_operator(
     field_manager: Option<String>,
-    cluster_info_cli_opts: &KubernetesClusterInfoCliOpts,
+    cluster_info_cli_opts: &KubernetesClusterInfoOpts,
 ) -> Result<Client> {
     let kubeconfig: Config = kube::Config::infer()
         .await
@@ -676,12 +676,12 @@ mod tests {
     };
     use tokio::time::error::Elapsed;
 
-    use crate::utils::cluster_info::KubernetesClusterInfoCliOpts;
+    use crate::utils::cluster_info::KubernetesClusterInfoOpts;
 
     #[tokio::test]
     #[ignore = "Tests depending on Kubernetes are not ran by default"]
     async fn k8s_test_wait_created() {
-        let cluster_info_cli_opts = KubernetesClusterInfoCliOpts {
+        let cluster_info_cli_opts = KubernetesClusterInfoOpts {
             kubernetes_cluster_domain: None,
         };
         let client = super::initialize_operator(None, &cluster_info_cli_opts)
@@ -762,7 +762,7 @@ mod tests {
     #[tokio::test]
     #[ignore = "Tests depending on Kubernetes are not ran by default"]
     async fn k8s_test_wait_created_timeout() {
-        let cluster_info_cli_opts = KubernetesClusterInfoCliOpts {
+        let cluster_info_cli_opts = KubernetesClusterInfoOpts {
             kubernetes_cluster_domain: None,
         };
         let client = super::initialize_operator(None, &cluster_info_cli_opts)
@@ -785,7 +785,7 @@ mod tests {
     #[tokio::test]
     #[ignore = "Tests depending on Kubernetes are not ran by default"]
     async fn k8s_test_list_with_label_selector() {
-        let cluster_info_cli_opts = KubernetesClusterInfoCliOpts {
+        let cluster_info_cli_opts = KubernetesClusterInfoOpts {
             kubernetes_cluster_domain: None,
         };
         let client = super::initialize_operator(None, &cluster_info_cli_opts)

crates/stackable-operator/src/utils/cluster_info.rs

@@ -10,7 +10,7 @@ pub struct KubernetesClusterInfo {
 }
 
 #[derive(clap::Parser, Debug, PartialEq, Eq)]
-pub struct KubernetesClusterInfoCliOpts {
+pub struct KubernetesClusterInfoOpts {
     /// Kubernetes cluster domain, usually this is `cluster.local`.
     // We are not using a default value here, as operators will probably do an more advanced
     // auto-detection of the cluster domain in case it is not specified in the future.
@@ -19,7 +19,7 @@ pub struct KubernetesClusterInfoCliOpts {
 }
 
 impl KubernetesClusterInfo {
-    pub fn new(cluster_info_cli_opts: &KubernetesClusterInfoCliOpts) -> Self {
+    pub fn new(cluster_info_cli_opts: &KubernetesClusterInfoOpts) -> Self {
         let cluster_domain = match &cluster_info_cli_opts.kubernetes_cluster_domain {
             Some(cluster_domain) => {
                 tracing::info!(%cluster_domain, "Using configured Kubernetes cluster domain");