E2E: add (or expand) config/init/add/rename command tests

CHANGELOG.md

@@ -14,6 +14,11 @@ Recommendation: for ease of reading, use the following order:
 ## [Unreleased]
 ### Added
 - Postgres implementation for dataset entry and account Re-BAC repositories
+- Added (or expanded) E2E tests for:
+  - `kamu config` command
+  - `kamu init` command
+  - `kamu add` command
+  - `kamu rename` command
 ### Changed
 - `kamu repo alias list`: added JSON output alongside with other formats mentioned in the command's help
 - Private Datasets, `DatasetEntry` integration that will allow us to build dataset indexing

Cargo.toml

@@ -271,3 +271,4 @@ debug = "line-tables-only"
 # datafusion-odata = { git = 'https://github.com/kamu-data/datafusion-odata.git', branch = '42.0.0-axum-0.6' }
 # datafusion-ethers = { git = "https://github.com/kamu-data/datafusion-ethers.git", tag = "42.0.0" }
 # object_store = { git = 'https://github.com/s373r/arrow-rs', branch = 'add-debug-logs', package = "object_store" }
+assert_cmd = { git = 'https://github.com/kamu-data/assert_cmd', branch = "deactivate-output-truncation" }

src/app/cli/src/commands/add_command.rs

@@ -223,7 +223,8 @@ impl Command for AddCommand {
                 "No manifest references or paths were provided",
             ));
         }
-        if self.name.is_some() && (self.recursive || self.snapshot_refs.len() != 1) {
+        if self.name.is_some() && (self.recursive || !(self.snapshot_refs.len() == 1 || self.stdin))
+        {
             return Err(CLIError::usage_error(
                 "Name override can be used only when adding a single manifest",
             ));

src/app/cli/src/output/interact.rs

@@ -9,6 +9,8 @@
 
 use crate::CLIError;
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 #[derive(Debug, Clone)]
 pub struct Interact {
     /// Don't ask user for confirmation and assume 'yes'
@@ -26,17 +28,21 @@ impl Interact {
     pub fn require_confirmation(&self, prompt: impl std::fmt::Display) -> Result<(), CLIError> {
         use read_input::prelude::*;
 
+        // If there's confirmation, we don't need to ask anything of the user
+        if self.assume_yes {
+            return Ok(());
+        }
+
         let prompt = format!("{prompt}\nDo you wish to continue? [y/N]: ");
 
+        // If no data can be entered, we abort
         if !self.is_tty {
-            return if self.assume_yes {
-                Ok(())
-            } else {
-                eprintln!("{prompt} Assuming 'no' because --yes flag was not provided");
-                Err(CLIError::Aborted)
-            };
+            eprintln!("{prompt} Assuming 'no' because --yes flag was not provided");
+
+            return Err(CLIError::Aborted);
         }
 
+        // In other cases, we ask until we get a valid answer
         let answer: String = input()
             .repeat_msg(prompt)
             .default("n".to_owned())
@@ -50,3 +56,5 @@ impl Interact {
         }
     }
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/app/cli/src/services/config/config_service.rs

@@ -256,6 +256,8 @@ impl ConfigService {
 
     fn path_for_scope(&self, scope: ConfigScope) -> PathBuf {
         match scope {
+            // TODO: Respect `XDG_CONFIG_HOME` when working with configs
+            //       https://github.com/kamu-data/kamu-cli/issues/848
             ConfigScope::User => dirs::home_dir()
                 .expect("Cannot determine user home directory")
                 .join(CONFIG_FILENAME),

src/e2e/app/cli/common/Cargo.toml

@@ -30,6 +30,7 @@ opendatafabric = { workspace = true }
 async-trait = "0.1"
 chrono = { version = "0.4", default-features = false, features = ["now"] }
 indoc = "2"
+lazy_static = { version = "1" }
 pretty_assertions = "1"
 regex = "1"
 reqwest = { version = "0.12", default-features = false, features = ["json"] }

src/e2e/app/cli/common/src/e2e_harness.rs

@@ -34,6 +34,7 @@ pub struct KamuCliApiServerHarnessOptions {
     potential_workspace: PotentialWorkspace,
     env_vars: Vec<(String, String)>,
     frozen_system_time: Option<DateTime<Utc>>,
+    kamu_config: Option<String>,
 }
 
 impl KamuCliApiServerHarnessOptions {
@@ -70,13 +71,18 @@ impl KamuCliApiServerHarnessOptions {
 
         self.with_frozen_system_time(today)
     }
+
+    pub fn with_kamu_config(mut self, content: &str) -> Self {
+        self.kamu_config = Some(content.into());
+
+        self
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 pub struct KamuCliApiServerHarness {
     options: KamuCliApiServerHarnessOptions,
-    kamu_config: Option<String>,
 }
 
 impl KamuCliApiServerHarness {
@@ -174,11 +180,21 @@ impl KamuCliApiServerHarness {
         Self::new(options, Some(kamu_config))
     }
 
-    fn new(options: KamuCliApiServerHarnessOptions, kamu_config: Option<String>) -> Self {
-        Self {
-            options,
-            kamu_config,
+    fn new(
+        mut options: KamuCliApiServerHarnessOptions,
+        generated_kamu_config: Option<String>,
+    ) -> Self {
+        assert!(
+            !(options.kamu_config.is_some() && generated_kamu_config.is_some()),
+            "There can be only one configuration file: either preset from the test options or \
+             generated based on the storage type"
+        );
+
+        if options.kamu_config.is_none() {
+            options.kamu_config = generated_kamu_config;
         }
+
+        Self { options }
     }
 
     pub async fn run_api_server<Fixture, FixtureResult>(self, fixture: Fixture)
@@ -208,7 +224,8 @@ impl KamuCliApiServerHarness {
         let KamuCliApiServerHarnessOptions {
             potential_workspace,
             env_vars,
-            frozen_system_time: freeze_system_time,
+            frozen_system_time,
+            kamu_config,
         } = self.options;
 
         let mut kamu = match potential_workspace {
@@ -218,14 +235,14 @@ impl KamuCliApiServerHarness {
 
                 KamuCliPuppet::new_workspace_tmp_with(NewWorkspaceOptions {
                     is_multi_tenant,
-                    kamu_config: self.kamu_config,
+                    kamu_config,
                     env_vars,
                 })
                 .await
             }
         };
 
-        kamu.set_system_time(freeze_system_time);
+        kamu.set_system_time(frozen_system_time);
 
         kamu
     }