diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-08-29 11:32:42 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-08-29 11:32:42 +0200 |
| commit | 2e90e1c124ea298de5e613de5a672f7c90ab6704 (patch) | |
| tree | 76d1b50c353048d36e01ffcc8dda2223c0c4545d /src/garage/tests/common/mod.rs | |
| parent | 8ef42c9609bcefc642cc9739acb921dffba49b89 (diff) | |
| parent | 32e5686ad8354a2b2b37807ba6d7add73a6d23ee (diff) | |
| download | garage-2e90e1c124ea298de5e613de5a672f7c90ab6704.tar.gz garage-2e90e1c124ea298de5e613de5a672f7c90ab6704.zip | |
Merge branch 'main' into nextv0.9.0-beta1
Diffstat (limited to 'src/garage/tests/common/mod.rs')
| -rw-r--r-- | src/garage/tests/common/mod.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/garage/tests/common/mod.rs b/src/garage/tests/common/mod.rs index 0b8c6755..1273bad1 100644 --- a/src/garage/tests/common/mod.rs +++ b/src/garage/tests/common/mod.rs @@ -1,5 +1,7 @@ -use aws_sdk_s3::{Client, Region}; +use aws_sdk_s3::config::Region; +use aws_sdk_s3::Client; use ext::*; +#[cfg(feature = "k2v")] use k2v_client::K2vClient; #[macro_use] @@ -20,6 +22,7 @@ pub struct Context { pub key: garage::Key, pub client: Client, pub custom_request: CustomRequester, + #[cfg(feature = "k2v")] pub k2v: K2VContext, } @@ -32,8 +35,9 @@ impl Context { fn new() -> Self { let garage = garage::instance(); let key = garage.key(None); - let client = client::build_client(garage, &key); + let client = client::build_client(&key); let custom_request = CustomRequester::new_s3(garage, &key); + #[cfg(feature = "k2v")] let k2v_request = CustomRequester::new_k2v(garage, &key); Context { @@ -41,6 +45,7 @@ impl Context { client, key, custom_request, + #[cfg(feature = "k2v")] k2v: K2VContext { request: k2v_request, }, @@ -71,6 +76,7 @@ impl Context { } /// Build a K2vClient for a given bucket + #[cfg(feature = "k2v")] pub fn k2v_client(&self, bucket: &str) -> K2vClient { let config = k2v_client::K2vClientConfig { region: REGION.to_string(), |