diff options
author | Alex Auvolat <alex@adnab.me> | 2023-05-16 18:34:46 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-05-16 19:46:56 +0200 |
commit | e4f955d672af99d1bf25e6a0bb038d116f8bca0c (patch) | |
tree | 162fe0927e1edbd168d5f06e4c2396dbcd0be6f1 /src/k2v-client/bin/k2v-cli.rs | |
parent | ea9b15f669703eb74e340599dd1fbc216bb38df8 (diff) | |
download | garage-e4f955d672af99d1bf25e6a0bb038d116f8bca0c.tar.gz garage-e4f955d672af99d1bf25e6a0bb038d116f8bca0c.zip |
fix base64 uses
Diffstat (limited to 'src/k2v-client/bin/k2v-cli.rs')
-rw-r--r-- | src/k2v-client/bin/k2v-cli.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/k2v-client/bin/k2v-cli.rs b/src/k2v-client/bin/k2v-cli.rs index cdd63cce..c8418e0d 100644 --- a/src/k2v-client/bin/k2v-cli.rs +++ b/src/k2v-client/bin/k2v-cli.rs @@ -2,6 +2,8 @@ use std::collections::BTreeMap; use std::process::exit; use std::time::Duration; +use base64::prelude::*; + use k2v_client::*; use garage_util::formater::format_table; @@ -155,7 +157,7 @@ impl Value { if let Some(ref text) = self.text { Ok(text.as_bytes().to_vec()) } else if let Some(ref b64) = self.b64 { - base64::decode(b64).map_err(|_| Error::Message("invalid base64 input".into())) + BASE64_STANDARD.decode(b64).map_err(|_| Error::Message("invalid base64 input".into())) } else if let Some(ref path) = self.file { use tokio::io::AsyncReadExt; if path == "-" { @@ -230,7 +232,7 @@ impl ReadOutputKind { for val in val.value { match val { K2vValue::Value(v) => { - println!("{}", base64::encode(&v)) + println!("{}", BASE64_STANDARD.encode(&v)) } K2vValue::Tombstone => { println!(); @@ -249,7 +251,7 @@ impl ReadOutputKind { if let Ok(string) = std::str::from_utf8(&v) { println!(" utf-8: {}", string); } else { - println!(" base64: {}", base64::encode(&v)); + println!(" base64: {}", BASE64_STANDARD.encode(&v)); } } K2vValue::Tombstone => { @@ -284,7 +286,7 @@ impl BatchOutputKind { if let Ok(string) = std::str::from_utf8(&v) { println!(" value(utf-8): {}", string); } else { - println!(" value(base64): {}", base64::encode(&v)); + println!(" value(base64): {}", BASE64_STANDARD.encode(&v)); } } K2vValue::Tombstone => { |