rename FileTransfer error variant

Author: labrenbe

rust/stackable-cockpit/src/utils/yaml.rs

@@ -21,7 +21,7 @@ pub fn merged_values_for_operator(operator_values: &Mapping, operator_name: &str
 /// Deep merges `overlay` into `base`. Overlay values take precedence.
 /// When both values are mappings, their contents are merged recursively.
 /// Non-mapping values (including sequences) are replaced entirely, not merged.
-pub fn deep_merge(mut base: Mapping, overlay: Mapping) -> Mapping {
+fn deep_merge(mut base: Mapping, overlay: Mapping) -> Mapping {
     for (k, v) in overlay {
         match base.get_mut(&k) {
             Some(base_v) => merge_value(base_v, v),

rust/stackablectl/src/cmds/demo.rs

@@ -162,7 +162,7 @@ pub enum CmdError {
     KubeClientCreate { source: k8s::Error },
 
     #[snafu(display("failed to load operator values"))]
-    FileTransfer { source: crate::utils::Error },
+    LoadOperatorValues { source: crate::utils::Error },
 }
 
 impl DemoArgs {
@@ -385,7 +385,7 @@ async fn install_cmd(
     let values_file = cli.get_values_file().context(PathOrUrlParseSnafu)?;
     let operator_values = load_operator_values(values_file.as_ref(), transfer_client)
         .await
-        .context(FileTransferSnafu)?;
+        .context(LoadOperatorValuesSnafu)?;
 
     let install_parameters = DemoInstallParameters {
         operator_namespace: args.namespaces.operator_namespace.clone(),

rust/stackablectl/src/cmds/operator.rs

@@ -177,7 +177,7 @@ pub enum CmdError {
     PathOrUrlParse { source: PathOrUrlParseError },
 
     #[snafu(display("failed to load operator values"))]
-    FileTransfer { source: crate::utils::Error },
+    LoadOperatorValues { source: crate::utils::Error },
 }
 
 /// This list contains a list of operator version grouped by stable, test and
@@ -348,7 +348,7 @@ async fn install_cmd(
     let values_file = cli.get_values_file().context(PathOrUrlParseSnafu)?;
     let operator_values = load_operator_values(values_file.as_ref(), &transfer_client)
         .await
-        .context(FileTransferSnafu)?;
+        .context(LoadOperatorValuesSnafu)?;
 
     for operator in &args.operators {
         let merged_values = merged_values_for_operator(&operator_values, &operator.name);

rust/stackablectl/src/cmds/release.rs

@@ -168,7 +168,7 @@ pub enum CmdError {
     },
 
     #[snafu(display("failed to load operator values"))]
-    FileTransfer { source: crate::utils::Error },
+    LoadOperatorValues { source: crate::utils::Error },
 }
 
 impl ReleaseArgs {
@@ -354,7 +354,7 @@ async fn install_cmd(
             let values_file = cli.get_values_file().context(PathOrUrlParseSnafu)?;
             let operator_values = load_operator_values(values_file.as_ref(), transfer_client)
                 .await
-                .context(FileTransferSnafu)?;
+                .context(LoadOperatorValuesSnafu)?;
 
             release
                 .install(
@@ -445,7 +445,7 @@ async fn upgrade_cmd(
             let values_file = cli.get_values_file().context(PathOrUrlParseSnafu)?;
             let operator_values = load_operator_values(values_file.as_ref(), transfer_client)
                 .await
-                .context(FileTransferSnafu)?;
+                .context(LoadOperatorValuesSnafu)?;
 
             // Install the new operator release
             release

rust/stackablectl/src/cmds/stack.rs

@@ -153,7 +153,7 @@ pub enum CmdError {
     },
 
     #[snafu(display("failed to load operator values"))]
-    FileTransfer { source: crate::utils::Error },
+    LoadOperatorValues { source: crate::utils::Error },
 }
 
 impl StackArgs {
@@ -356,7 +356,7 @@ async fn install_cmd(
             let values_file = cli.get_values_file().context(PathOrUrlParseSnafu)?;
             let operator_values = load_operator_values(values_file.as_ref(), transfer_client)
                 .await
-                .context(FileTransferSnafu)?;
+                .context(LoadOperatorValuesSnafu)?;
 
             let install_parameters = StackInstallParameters {
                 operator_namespace: args.namespaces.operator_namespace.clone(),