Bump dependencies version to match Fedora. (#10)

This PR bumps the following dependencies in order to match Fedora's packaged ones as they're way newer than the current ones in docker_credential. - base64: v0.21.7 - rstest: v0.18.2 It also changes deprecated base64 functions. Signed-off-by: Daniel Mellado <[email protected]>
keirlawson · Feb 27, 2024 · 789d5ef · 789d5ef
1 parent 45f1f50
commit 789d5ef
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ travis-ci = { repository = "keirlawson/docker_credential" }
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-base64 = "0.10.1"
+base64 = "0.21.7"
 
 [dev-dependencies]
-rstest = "0.15.0"
+rstest = "0.18.2"
diff --git a/src/lib.rs b/src/lib.rs
@@ -6,6 +6,8 @@ use std::error::Error;
 use std::fmt;
 use std::path::{Path, PathBuf};
 use std::str;
+use base64::Engine;
+use base64::engine::general_purpose;
 
 type Result<T> = std::result::Result<T, CredentialRetrievalError>;
 
@@ -67,7 +69,7 @@ fn config_dir() -> Option<PathBuf> {
 }
 
 fn decode_auth(encoded_auth: &str) -> Result<DockerCredential> {
-    let decoded = base64::decode(encoded_auth)
+    let decoded = general_purpose::STANDARD_NO_PAD.decode(encoded_auth)
         .map_err(|_| CredentialRetrievalError::CredentialDecodingError)?;
     let decoded =
         str::from_utf8(&decoded).map_err(|_| CredentialRetrievalError::CredentialDecodingError)?;
@@ -149,7 +151,7 @@ mod tests {
 
     #[test]
     fn decodes_auth_when_no_helpers() {
-        let encoded_auth = base64::encode("some_user:some_password");
+        let encoded_auth = general_purpose::STANDARD_NO_PAD.encode("some_user:some_password");
         let mut auths = HashMap::new();
         auths.insert(
             String::from("some server"),