diff options
author | Jonathan Davies <jpds@protonmail.com> | 2023-05-05 21:18:29 +0100 |
---|---|---|
committer | Jonathan Davies <jpds@protonmail.com> | 2023-06-25 21:31:35 +0100 |
commit | 7f8bf2d801c55e15b5056ae08cd443325f7989b8 (patch) | |
tree | 48f23d2d4e17e5c68820923033699d604ab032aa /src/garage/tests/common | |
parent | 4297233d3e4aea1760d81de747ad3468553be41b (diff) | |
download | garage-7f8bf2d801c55e15b5056ae08cd443325f7989b8.tar.gz garage-7f8bf2d801c55e15b5056ae08cd443325f7989b8.zip |
src/garage/tests: Updated types for aws-sdk-s3 bump.
Diffstat (limited to 'src/garage/tests/common')
-rw-r--r-- | src/garage/tests/common/client.rs | 11 | ||||
-rw-r--r-- | src/garage/tests/common/mod.rs | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/garage/tests/common/client.rs b/src/garage/tests/common/client.rs index e9d4849a..ef4daa5d 100644 --- a/src/garage/tests/common/client.rs +++ b/src/garage/tests/common/client.rs @@ -1,15 +1,16 @@ -use aws_sdk_s3::{Client, Config, Credentials, Endpoint}; +use aws_sdk_s3::config::Credentials; +use aws_sdk_s3::{Client, Config}; -use super::garage::{Instance, Key}; +use super::garage::Key; +use crate::common::garage::DEFAULT_PORT; -pub fn build_client(instance: &Instance, key: &Key) -> Client { +pub fn build_client(key: &Key) -> Client { let credentials = Credentials::new(&key.id, &key.secret, None, None, "garage-integ-test"); - let endpoint = Endpoint::immutable(instance.s3_uri()); let config = Config::builder() + .endpoint_url(format!("http://127.0.0.1:{}", DEFAULT_PORT)) .region(super::REGION) .credentials_provider(credentials) - .endpoint_resolver(endpoint) .build(); Client::from_conf(config) diff --git a/src/garage/tests/common/mod.rs b/src/garage/tests/common/mod.rs index 0b8c6755..54efd1ea 100644 --- a/src/garage/tests/common/mod.rs +++ b/src/garage/tests/common/mod.rs @@ -1,4 +1,5 @@ -use aws_sdk_s3::{Client, Region}; +use aws_sdk_s3::config::Region; +use aws_sdk_s3::Client; use ext::*; use k2v_client::K2vClient; @@ -32,7 +33,7 @@ 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); let k2v_request = CustomRequester::new_k2v(garage, &key); |