Merge branch 'main' into integration

Author: oxide-reflector-bot[bot]

Cargo.lock

@@ -12,7 +12,7 @@ resolver = "2"
 
 [workspace.dependencies]
 anyhow = "1.0.100"
-assert_cmd = "2.0.17"
+assert_cmd = "2.1.1"
 async-trait = "0.1.89"
 base64 = "0.22.1"
 built = { version = "0.8.0", features = ["git2"] }

Cargo.toml

@@ -638,31 +638,6 @@ fn create_private_file(path: &Path) -> Result<File> {
 
 #[cfg(test)]
 mod tests {
-    #[test]
-    fn test_cmd_auth_login() {
-        use assert_cmd::Command;
-        use predicates::str;
-
-        let temp_dir = tempfile::tempdir().unwrap();
-
-        let bad_url = "sys.oxide.invalid";
-
-        // Validate connection error details are printed
-        Command::cargo_bin("oxide")
-            .unwrap()
-            .arg("--config-dir")
-            .arg(temp_dir.path().as_os_str())
-            .arg("auth")
-            .arg("login")
-            .arg("--host")
-            .arg(bad_url)
-            .assert()
-            .failure()
-            .stderr(str::starts_with(
-                "Request failed: client error: error sending request",
-            ));
-    }
-
     #[test]
     fn test_parse_host() {
         use super::parse_host;

cli/src/cmd_auth.rs

@@ -45,25 +45,3 @@ impl RunnableCmd for CmdVersion {
         Ok(())
     }
 }
-
-#[test]
-fn version_success() {
-    use assert_cmd::Command;
-
-    let mut cmd = Command::cargo_bin("oxide").unwrap();
-    let cli_version = built_info::PKG_VERSION;
-    let api_version = Client::api_version();
-
-    cmd.arg("version");
-    cmd.assert().success().stdout(format!(
-        "Oxide CLI {}\nBuilt from commit: {} {}\nOxide API: {}\n",
-        cli_version,
-        built_info::GIT_COMMIT_HASH.unwrap(),
-        if matches!(built_info::GIT_DIRTY, Some(true)) {
-            "(dirty)"
-        } else {
-            ""
-        },
-        api_version,
-    ));
-}

cli/src/cmd_version.rs

@@ -4,7 +4,6 @@
 
 // Copyright 2023 Oxide Computer Company
 
-use assert_cmd::Command;
 use httpmock::prelude::*;
 use predicates::prelude::*;
 use serde::Serialize;
@@ -28,8 +27,7 @@ fn test_simple_api_call() {
             ));
     });
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "fake-token")
         .arg("api")
@@ -38,8 +36,7 @@ fn test_simple_api_call() {
         .success()
         .stdout(predicate::str::diff("{\n  \"a\": \"b\"\n}\n"));
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "fake-token")
         .arg("api")
@@ -141,8 +138,7 @@ fn test_pagination_success() {
     ];
     let output_str = format!("{}\n", serde_json::to_string_pretty(&output).unwrap());
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "fake-token")
         .arg("api")
@@ -211,8 +207,7 @@ fn test_pagination_midway_failure() {
         "HTTP status client error (404 Not Found)",
     );
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "fake-token")
         .arg("api")

cli/tests/test_api.rs

@@ -9,7 +9,6 @@ use std::{
     path::Path,
 };
 
-use assert_cmd::Command;
 use chrono::{DateTime, Utc};
 use expectorate::assert_contents;
 use httpmock::{Method::POST, Mock, MockServer};
@@ -147,8 +146,7 @@ fn test_auth_login_first() {
     // Make sure we know how to make non-existent directories.
     let config_dir = temp_dir_path.join(".config").join("oxide");
 
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .arg("--config-dir")
         .arg(config_dir.as_os_str())
@@ -234,8 +232,7 @@ fn test_auth_login_existing_default() {
     write_first_config(temp_dir_path);
     assert_mode(&temp_dir_path.join("config.toml"), 0o644);
 
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .arg("--profile")
         .arg("crystal-palace")
@@ -281,8 +278,7 @@ fn test_auth_login_existing_no_default() {
     write_first_creds(temp_dir_path);
     assert_mode(&temp_dir_path.join("credentials.toml"), 0o600);
 
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .arg("--config-dir")
         .arg(temp_dir_path.as_os_str())
@@ -340,8 +336,7 @@ fn test_auth_credentials_permissions() {
     assert_mode(&cred_path, 0o644);
 
     // Validate authenticated credentials
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .arg("--config-dir")
         .arg(temp_dir_path.as_os_str())
         .arg("auth")
@@ -370,8 +365,7 @@ fn test_auth_login_double() {
     let temp_dir = tempfile::tempdir().unwrap();
     let temp_dir_path = temp_dir.path();
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .arg("--config-dir")
         .arg(temp_dir_path.as_os_str())
@@ -382,8 +376,7 @@ fn test_auth_login_double() {
         .arg(server.url(""))
         .assert()
         .success();
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .arg("--config-dir")
         .arg(temp_dir_path.as_os_str())
@@ -493,8 +486,7 @@ fn test_cmd_auth_status() {
     });
 
     // Validate authenticated credentials
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .arg("--config-dir")
         .arg(temp_dir.path().as_os_str())
         .arg("auth")
@@ -515,8 +507,7 @@ fn test_cmd_auth_status() {
     );
 
     // Validate empty `credentials.toml` does not error.
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .arg("--config-dir")
         .arg(empty_creds_dir.path().as_os_str())
         .arg("auth")
@@ -564,8 +555,7 @@ fn test_cmd_auth_status_env() {
     );
 
     // Validate authenticated credentials
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .arg("auth")
         .arg("status")
         .env("OXIDE_HOST", server.url(""))
@@ -578,8 +568,7 @@ fn test_cmd_auth_status_env() {
         ));
 
     // OXIDE_PROFILE also works, uses creds file
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("OXIDE_PROFILE", "funky-town")
         .arg("--config-dir")
         .arg(temp_dir.path().as_os_str())
@@ -593,8 +582,7 @@ fn test_cmd_auth_status_env() {
         ));
 
     // OXIDE_HOST conflicts with OXIDE_PROFILE
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "oxide-token-good")
         .env("OXIDE_PROFILE", "ignored")
@@ -622,8 +610,7 @@ fn test_cmd_auth_status_env() {
     });
 
     // Try invalid credentials.
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .arg("auth")
         .arg("status")
         .env("OXIDE_HOST", server.url(""))
@@ -655,8 +642,7 @@ fn test_cmd_auth_debug_logging() {
         });
     });
 
-    let cmd = Command::cargo_bin("oxide")
-        .unwrap()
+    let cmd = assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .arg("--debug")
         .arg("auth")
         .arg("status")
@@ -696,3 +682,26 @@ fn test_cmd_auth_debug_logging() {
 
     oxide_mock.assert();
 }
+
+#[test]
+fn test_cmd_auth_login() {
+    use predicates::str;
+
+    let temp_dir = tempfile::tempdir().unwrap();
+
+    let bad_url = "sys.oxide.invalid";
+
+    // Validate connection error details are printed
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
+        .arg("--config-dir")
+        .arg(temp_dir.path().as_os_str())
+        .arg("auth")
+        .arg("login")
+        .arg("--host")
+        .arg(bad_url)
+        .assert()
+        .failure()
+        .stderr(str::starts_with(
+            "Request failed: client error: error sending request",
+        ));
+}

cli/tests/test_auth.rs

@@ -4,7 +4,6 @@
 
 // Copyright 2025 Oxide Computer Company
 
-use assert_cmd::Command;
 use httpmock::MockServer;
 use oxide_httpmock::MockServerExt;
 
@@ -52,8 +51,7 @@ fn test_bundle_download_ranges() {
             .body([1; 1024]);
     });
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "fake-token")
@@ -116,8 +114,7 @@ fn test_bundle_download_range_too_large_response() {
             .body([0; 4096]);
     });
 
-    Command::cargo_bin("oxide")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!("oxide")
         .env("RUST_BACKTRACE", "1")
         .env("OXIDE_HOST", server.url(""))
         .env("OXIDE_TOKEN", "fake-token")