Increase rpassword dependency lower bound to 7.2.0

Substitute prompt_password for removed prompt_password. Note that prompt_password prints the prompt string to /dev/tty, while prompt_password_stdout printed the prompt to stdout. Remove test that prints password prompt. Since the prompt goes to tty rather than stdout, the test framework is not able to handle it. This is a know limitation of the framework, see: assert-rs/assert_cmd#138 Signed-off-by: mulhern <[email protected]>
mulkieran · Apr 27, 2023 · 63f36f4 · 63f36f4
1 parent 02bd6e7
commit 63f36f4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -166,7 +166,7 @@ version = "1.3.1"
 optional = true
 
 [dependencies.rpassword]
-version = "5.0.0"
+version = "7.2.0"
 optional = true
 
 [dependencies.serde]

diff --git a/src/jsonrpc/client/key.rs b/src/jsonrpc/client/key.rs
@@ -19,8 +19,7 @@ pub fn key_set(key_desc: KeyDescription, keyfile_path: Option<&str>) -> StratisR
             do_request!(KeySet, key_desc; file.as_raw_fd())
         }
         None => {
-            let password =
-                rpassword::prompt_password_stdout("Enter passphrase followed by return: ")?;
+            let password = rpassword::prompt_password("Enter passphrase followed by return: ")?;
             if password.is_empty() {
                 return Ok(());
             }

diff --git a/src/jsonrpc/client/pool.rs b/src/jsonrpc/client/pool.rs
@@ -29,7 +29,7 @@ pub fn pool_start(
     prompt: bool,
 ) -> StratisResult<()> {
     if prompt {
-        let password = rpassword::prompt_password_stdout("Enter passphrase followed by return: ")?;
+        let password = rpassword::prompt_password("Enter passphrase followed by return: ")?;
         if password.is_empty() {
             return Ok(());
         }

diff --git a/tests/stratis_min.rs b/tests/stratis_min.rs
@@ -248,23 +248,3 @@ fn stratis_min_list_default() {
 fn test_stratis_min_list_defaults() {
     test_with_stratisd_min_sim(stratis_min_list_default);
 }
-
-fn stratis_min_capture_key() {
-    let mut cmd = Command::cargo_bin("stratis-min").unwrap();
-    let key = "akey";
-    cmd.arg("key").arg("set").arg("--capture-key").arg(key);
-    cmd.write_stdin("keyval");
-    cmd.assert().success();
-    let mut cmd = Command::cargo_bin("stratis-min").unwrap();
-    cmd.arg("key")
-        .assert()
-        .success()
-        .stdout(predicate::str::contains(key));
-}
-
-#[test]
-// Verify that adding a key using --capture-key works and
-// lists the new key in the output of 'keys'.
-fn test_stratis_min_capture_key() {
-    test_with_stratisd_min_sim(stratis_min_capture_key);
-}