chore(deps): Update Rust dependencies

Signed-off-by: Rene Leonhardt <65483435+reneleonhardt@users.noreply.github.com>
getsops · Jun 16, 2024 · 3a7284c · 3a7284c
1 parent 67aab01
commit 3a7284c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -2,7 +2,7 @@ version: 2
 
 updates:
   - package-ecosystem: "docker"
-    directory: "/"
+    directory: "/.release"
     labels: ["dependencies"]
     schedule:
       # By default, this will be on a Monday.
@@ -39,3 +39,13 @@ updates:
       go:
         patterns:
           - "*"
+
+  - package-ecosystem: "cargo"
+    directory: "/functional-tests"
+    labels: ["area/CI"]
+    schedule:
+      interval: "weekly"
+    groups:
+      ci:
+        patterns:
+          - "*"
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -86,7 +86,7 @@ jobs:
       VAULT_ADDR: "http://127.0.0.1:8200"
     steps:
       - name: Install rustup
-        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.70.0
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain 1.79.0
 
       - name: Check out code
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

diff --git a/functional-tests/Cargo.toml b/functional-tests/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2021"
 authors = ["Adrian Utrilla <adrianutrilla@gmail.com>"]
 
 [dependencies]
-tempdir = "0.3.5"
+tempfile = "3"
 serde = "1.0"
-serde_json = "1.0.99"
-serde_yaml = "0.9.22"
+serde_json = "1.0"
+serde_yaml = "0.9"
 serde_derive = "1.0"
-lazy_static = "1.4.0"
+lazy_static = "1.4"
diff --git a/functional-tests/src/lib.rs b/functional-tests/src/lib.rs
@@ -1,11 +1,9 @@
 extern crate serde;
 extern crate serde_json;
 extern crate serde_yaml;
-extern crate tempdir;
-#[macro_use]
+extern crate tempfile;
+#[cfg_attr(test, macro_use)]
 extern crate lazy_static;
-#[macro_use]
-extern crate serde_derive;
 
 #[cfg(test)]
 mod tests {
@@ -19,7 +17,8 @@ mod tests {
     use std::io::{Read, Write};
     use std::path::Path;
     use std::process::Command;
-    use tempdir::TempDir;
+    use tempfile::Builder;
+    use tempfile::TempDir;
     const SOPS_BINARY_PATH: &'static str = "./sops";
     const KMS_KEY: &'static str = "FUNCTIONAL_TEST_KMS_ARN";
 
@@ -37,7 +36,7 @@ mod tests {
 
     lazy_static! {
         static ref TMP_DIR: TempDir =
-            TempDir::new("sops-functional-tests").expect("Unable to create temporary directory");
+            Builder::new().prefix("sops-functional-tests").tempdir().expect("Unable to create temporary directory");
     }
 
     fn prepare_temp_file(name: &str, contents: &[u8]) -> String {
@@ -584,7 +583,7 @@ b: ba"#
         let file_path = "res/comments.yaml";
         let output = Command::new(SOPS_BINARY_PATH)
             .arg("encrypt")
-            .arg(file_path.clone())
+            .arg(file_path)
             .output()
             .expect("Error running sops");
         assert!(output.status.success(), "SOPS didn't return successfully");
@@ -603,7 +602,7 @@ b: ba"#
         let file_path = "res/comments_list.yaml";
         let output = Command::new(SOPS_BINARY_PATH)
             .arg("encrypt")
-            .arg(file_path.clone())
+            .arg(file_path)
             .output()
             .expect("Error running sops");
         assert!(output.status.success(), "SOPS didn't return successfully");
@@ -622,7 +621,7 @@ b: ba"#
         let file_path = "res/comments.enc.yaml";
         let output = Command::new(SOPS_BINARY_PATH)
             .arg("decrypt")
-            .arg(file_path.clone())
+            .arg(file_path)
             .output()
             .expect("Error running sops");
         assert!(output.status.success(), "SOPS didn't return successfully");
@@ -641,7 +640,7 @@ b: ba"#
         let file_path = "res/comments_unencrypted_comments.yaml";
         let output = Command::new(SOPS_BINARY_PATH)
             .arg("decrypt")
-            .arg(file_path.clone())
+            .arg(file_path)
             .output()
             .expect("Error running sops");
         assert!(output.status.success(), "SOPS didn't return successfully");