diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-06-13 17:02:42 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-06-13 17:14:11 +0200 |
| commit | 90b2d43eb49d49c3aef4f501a30cf2f181adb183 (patch) | |
| tree | f7f7c15547e2f2072a1841fcb2350c272faf3c9d /src/garage/tests/common | |
| parent | bf19a44fd93584d5250a2e98e5b1d3a2de6d59d1 (diff) | |
| parent | 01346143ca09eab262f0d8f8a0a744c2f6d667cc (diff) | |
| download | garage-90b2d43eb49d49c3aef4f501a30cf2f181adb183.tar.gz garage-90b2d43eb49d49c3aef4f501a30cf2f181adb183.zip | |
Merge branch 'main' into next
Diffstat (limited to 'src/garage/tests/common')
| -rw-r--r-- | src/garage/tests/common/custom_requester.rs | 1 | ||||
| -rw-r--r-- | src/garage/tests/common/mod.rs | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/garage/tests/common/custom_requester.rs b/src/garage/tests/common/custom_requester.rs index 609eda97..4133bb8b 100644 --- a/src/garage/tests/common/custom_requester.rs +++ b/src/garage/tests/common/custom_requester.rs @@ -209,6 +209,7 @@ impl<'a> RequestBuilder<'a> { all_headers.extend(self.unsigned_headers.clone()); let canonical_request = signature::payload::canonical_request( + self.service, &self.method, &Uri::try_from(&uri).unwrap(), &all_headers, diff --git a/src/garage/tests/common/mod.rs b/src/garage/tests/common/mod.rs index eca3e42b..0b8c6755 100644 --- a/src/garage/tests/common/mod.rs +++ b/src/garage/tests/common/mod.rs @@ -1,5 +1,6 @@ use aws_sdk_s3::{Client, Region}; use ext::*; +use k2v_client::K2vClient; #[macro_use] pub mod macros; @@ -68,6 +69,19 @@ impl Context { bucket_name } + + /// Build a K2vClient for a given bucket + pub fn k2v_client(&self, bucket: &str) -> K2vClient { + let config = k2v_client::K2vClientConfig { + region: REGION.to_string(), + endpoint: self.garage.k2v_uri().to_string(), + aws_access_key_id: self.key.id.clone(), + aws_secret_access_key: self.key.secret.clone(), + bucket: bucket.to_string(), + user_agent: None, + }; + K2vClient::new(config).expect("Could not create K2V client") + } } pub fn context() -> Context { |