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/s3 | |
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/s3')
-rw-r--r-- | src/garage/tests/s3/multipart.rs | 4 | ||||
-rw-r--r-- | src/garage/tests/s3/objects.rs | 4 | ||||
-rw-r--r-- | src/garage/tests/s3/simple.rs | 2 | ||||
-rw-r--r-- | src/garage/tests/s3/website.rs | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/garage/tests/s3/multipart.rs b/src/garage/tests/s3/multipart.rs index 895a2993..aeff94b4 100644 --- a/src/garage/tests/s3/multipart.rs +++ b/src/garage/tests/s3/multipart.rs @@ -1,6 +1,6 @@ use crate::common; -use aws_sdk_s3::model::{CompletedMultipartUpload, CompletedPart}; -use aws_sdk_s3::types::ByteStream; +use aws_sdk_s3::primitives::ByteStream; +use aws_sdk_s3::types::{CompletedMultipartUpload, CompletedPart}; const SZ_5MB: usize = 5 * 1024 * 1024; const SZ_10MB: usize = 10 * 1024 * 1024; diff --git a/src/garage/tests/s3/objects.rs b/src/garage/tests/s3/objects.rs index 65f9e867..27697d45 100644 --- a/src/garage/tests/s3/objects.rs +++ b/src/garage/tests/s3/objects.rs @@ -1,6 +1,6 @@ use crate::common; -use aws_sdk_s3::model::{Delete, ObjectIdentifier}; -use aws_sdk_s3::types::ByteStream; +use aws_sdk_s3::primitives::ByteStream; +use aws_sdk_s3::types::{Delete, ObjectIdentifier}; const STD_KEY: &str = "hello world"; const CTRL_KEY: &str = "\x00\x01\x02\x00"; diff --git a/src/garage/tests/s3/simple.rs b/src/garage/tests/s3/simple.rs index f54ae9ac..41ec44c6 100644 --- a/src/garage/tests/s3/simple.rs +++ b/src/garage/tests/s3/simple.rs @@ -2,7 +2,7 @@ use crate::common; #[tokio::test] async fn test_simple() { - use aws_sdk_s3::types::ByteStream; + use aws_sdk_s3::primitives::ByteStream; let ctx = common::context(); let bucket = ctx.create_bucket("test-simple"); diff --git a/src/garage/tests/s3/website.rs b/src/garage/tests/s3/website.rs index f61838e4..ab9b12b9 100644 --- a/src/garage/tests/s3/website.rs +++ b/src/garage/tests/s3/website.rs @@ -4,8 +4,8 @@ use crate::k2v::json_body; use assert_json_diff::assert_json_eq; use aws_sdk_s3::{ - model::{CorsConfiguration, CorsRule, ErrorDocument, IndexDocument, WebsiteConfiguration}, - types::ByteStream, + primitives::ByteStream, + types::{CorsConfiguration, CorsRule, ErrorDocument, IndexDocument, WebsiteConfiguration}, }; use http::{Request, StatusCode}; use hyper::{ |