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/client.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/client.rs')
| -rw-r--r-- | src/garage/tests/common/client.rs | 11 |
1 files changed, 6 insertions, 5 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) |