aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-07-22 18:55:52 +0200
committerAlex Auvolat <alex@adnab.me>2022-07-29 12:24:48 +0200
commit381eb9a5a1dc530ce864ac2b3dc8eb0d454f1bc9 (patch)
tree504909ea8076c3d8daa1243f2484bf8d68d62d17
parent2cad656a0332b19481ce779f5026b07c6ed8198f (diff)
downloadgarage-381eb9a5a1dc530ce864ac2b3dc8eb0d454f1bc9.tar.gz
garage-381eb9a5a1dc530ce864ac2b3dc8eb0d454f1bc9.zip
Fix tests
-rw-r--r--Cargo.lock22
-rw-r--r--src/garage/Cargo.toml2
-rw-r--r--src/garage/tests/lib.rs3
3 files changed, 5 insertions, 22 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 260ae907..d54cabd0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -620,16 +620,6 @@ dependencies = [
[[package]]
name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "crypto-mac"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
@@ -1006,7 +996,7 @@ dependencies = [
"garage_util 0.7.0",
"garage_web",
"hex",
- "hmac 0.10.1",
+ "hmac 0.12.1",
"http",
"hyper",
"kuska-sodiumoxide",
@@ -1512,16 +1502,6 @@ dependencies = [
[[package]]
name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac 0.10.1",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "hmac"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index 80802a16..2cb8ec46 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -63,7 +63,7 @@ prometheus = "0.13"
aws-sdk-s3 = "0.8"
chrono = "0.4"
http = "0.2"
-hmac = "0.10"
+hmac = "0.12"
hyper = { version = "0.14", features = ["client", "http1", "runtime"] }
sha2 = "0.10"
diff --git a/src/garage/tests/lib.rs b/src/garage/tests/lib.rs
index 0106ad10..99aa1d58 100644
--- a/src/garage/tests/lib.rs
+++ b/src/garage/tests/lib.rs
@@ -3,5 +3,8 @@ mod common;
mod admin;
mod bucket;
+
+#[cfg(feature="k2v")]
mod k2v;
+
mod s3;