Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump aws-smithy-runtime from 1.4.0 to 1.5.0 in /quickwit #4954

Merged
merged 3 commits into from
May 13, 2024
Merged

Bump aws-smithy-runtime from 1.4.0 to 1.5.0 in /quickwit #4954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e678331
Bump aws-smithy-runtime from 1.4.0 to 1.5.0 in /quickwit
dependabot[bot] May 11, 2024
276a003
upgade aws BehaviorVersion
trinity-1686a May 13, 2024
007eb89
Merge branch 'main' into dependabot/cargo/quickwit/aws-smithy-runtime…
trinity-1686a May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions quickwit/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion quickwit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ aws-credential-types = { version = "1.2", features = ["hardcoded-credentials"] }
aws-sdk-kinesis = "1.21"
aws-sdk-s3 = "1.24"
aws-smithy-async = "1.2"
aws-smithy-runtime = "1.3"
aws-smithy-runtime = "1.5"
aws-smithy-types = { version = "1.1", features = ["byte-stream-poll-next"] }
aws-types = "1.2"

Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-aws/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub async fn get_aws_config() -> &'static aws_config::SdkConfig {
.hyper_builder(hyper_client_builder)
.build(https_connector);

aws_config::defaults(BehaviorVersion::v2023_11_09())
aws_config::defaults(BehaviorVersion::v2024_03_28())
.http_client(hyper_client)
// Currently handle this ourselves so probably best for now to leave it as is.
.retry_config(RetryConfig::disabled())
Expand Down
10 changes: 5 additions & 5 deletions quickwit/quickwit-storage/src/object_storage/s3_compatible_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ async fn create_s3_client(s3_storage_config: &S3StorageConfig) -> S3Client {
get_credentials_provider(s3_storage_config).or(aws_config.credentials_provider());
let region = get_region(s3_storage_config).or(aws_config.region().cloned());
let mut s3_config = aws_sdk_s3::Config::builder()
.behavior_version(BehaviorVersion::v2023_11_09())
.behavior_version(BehaviorVersion::v2024_03_28())
.region(region);

if let Some(identity_cache) = aws_config.identity_cache() {
Expand Down Expand Up @@ -943,7 +943,7 @@ mod tests {

#[tokio::test]
async fn test_s3_compatible_storage_relative_path() {
let sdk_config = aws_config::defaults(aws_config::BehaviorVersion::v2023_11_09())
let sdk_config = aws_config::defaults(aws_config::BehaviorVersion::v2024_03_28())
.load()
.await;
let s3_client = S3Client::new(&sdk_config);
Expand Down Expand Up @@ -996,7 +996,7 @@ mod tests {
]);
let credentials = Credentials::new("mock_key", "mock_secret", None, None, "mock_provider");
let config = aws_sdk_s3::Config::builder()
.behavior_version(BehaviorVersion::v2023_11_09())
.behavior_version(BehaviorVersion::v2024_03_28())
.region(Some(Region::new("Foo")))
.http_client(client.clone())
.credentials_provider(credentials)
Expand Down Expand Up @@ -1037,7 +1037,7 @@ mod tests {
)]);
let credentials = Credentials::new("mock_key", "mock_secret", None, None, "mock_provider");
let config = aws_sdk_s3::Config::builder()
.behavior_version(BehaviorVersion::v2023_11_09())
.behavior_version(BehaviorVersion::v2024_03_28())
.region(Some(Region::new("Foo")))
.http_client(client.clone())
.credentials_provider(credentials)
Expand Down Expand Up @@ -1119,7 +1119,7 @@ mod tests {
]);
let credentials = Credentials::new("mock_key", "mock_secret", None, None, "mock_provider");
let config = aws_sdk_s3::Config::builder()
.behavior_version(BehaviorVersion::v2023_11_09())
.behavior_version(BehaviorVersion::v2024_03_28())
.region(Some(Region::new("Foo")))
.http_client(client)
.credentials_provider(credentials)
Expand Down