From ffe8a32ed1d1b4751a82a11ba29ae00c4e5ab30e Mon Sep 17 00:00:00 2001 From: Roman Valls Guimera Date: Thu, 4 May 2023 15:35:04 +1000 Subject: [PATCH] Bump s3s* crates to 0.5.x --- Cargo.lock | 52 +++++------------------ htsget-actix/src/handlers/get.rs | 2 - htsget-actix/src/handlers/post.rs | 2 - htsget-actix/src/handlers/service_info.rs | 1 - htsget-search/Cargo.toml | 6 +-- 5 files changed, 14 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6512937a..ae168147a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -485,39 +485,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-sdk-s3" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b64fc8b7d76d09e53f4a64ebe2cd44894adb902011a26878aebd0576234d41" -dependencies = [ - "aws-credential-types", - "aws-endpoint", - "aws-http", - "aws-sig-auth", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-checksums", - "aws-smithy-client", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "bytes", - "http", - "http-body", - "once_cell", - "percent-encoding", - "regex", - "tokio-stream", - "tower", - "tracing", - "url", -] - [[package]] name = "aws-sdk-s3" version = "0.27.0" @@ -1795,7 +1762,7 @@ dependencies = [ "async-trait", "aws-config", "aws-credential-types", - "aws-sdk-s3 0.27.0", + "aws-sdk-s3", "axum", "axum-extra", "base64 0.21.0", @@ -3065,8 +3032,9 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "s3s" -version = "0.5.0-dev" -source = "git+https://github.com/Nugine/s3s#2124b50def2f558ed5a9fbc9cfa3bee986b34f0a" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3167b9fe816cc2c2155bebc43b6434cd1f0420722f293400cbfbedc0f978337e" dependencies = [ "arrayvec", "ascii", @@ -3103,11 +3071,12 @@ dependencies = [ [[package]] name = "s3s-aws" -version = "0.5.0-dev" -source = "git+https://github.com/Nugine/s3s#2124b50def2f558ed5a9fbc9cfa3bee986b34f0a" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0201e5aa8efcdade53dc80f053e38d8b88621a608cf048779e72469e80433b4" dependencies = [ "async-trait", - "aws-sdk-s3 0.26.0", + "aws-sdk-s3", "aws-smithy-http", "aws-smithy-types", "aws-smithy-types-convert", @@ -3122,8 +3091,9 @@ dependencies = [ [[package]] name = "s3s-fs" -version = "0.5.0-dev" -source = "git+https://github.com/Nugine/s3s#2124b50def2f558ed5a9fbc9cfa3bee986b34f0a" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9df08c839de8e9939c2909a30227ad0414cb9a900c4c662b8fcff59537e8d54" dependencies = [ "async-trait", "base64-simd", diff --git a/htsget-actix/src/handlers/get.rs b/htsget-actix/src/handlers/get.rs index 720d2f4c6..f0b8f82e8 100644 --- a/htsget-actix/src/handlers/get.rs +++ b/htsget-actix/src/handlers/get.rs @@ -15,7 +15,6 @@ use crate::AppState; use super::handle_response; /// GET request reads endpoint -#[allow(clippy::let_with_type_underscore)] #[instrument(skip(app_state))] pub async fn reads( request: Query>, @@ -37,7 +36,6 @@ pub async fn reads( } /// GET request variants endpoint -#[allow(clippy::let_with_type_underscore)] #[instrument(skip(app_state))] pub async fn variants( request: Query>, diff --git a/htsget-actix/src/handlers/post.rs b/htsget-actix/src/handlers/post.rs index d238a4f92..287f1dd16 100644 --- a/htsget-actix/src/handlers/post.rs +++ b/htsget-actix/src/handlers/post.rs @@ -13,7 +13,6 @@ use crate::AppState; use super::handle_response; /// POST request reads endpoint -#[allow(clippy::let_with_type_underscore)] #[instrument(skip(app_state))] pub async fn reads( request: Json, @@ -33,7 +32,6 @@ pub async fn reads( } /// POST request variants endpoint -#[allow(clippy::let_with_type_underscore)] #[instrument(skip(app_state))] pub async fn variants( request: Json, diff --git a/htsget-actix/src/handlers/service_info.rs b/htsget-actix/src/handlers/service_info.rs index b27250e92..11a20cd7f 100644 --- a/htsget-actix/src/handlers/service_info.rs +++ b/htsget-actix/src/handlers/service_info.rs @@ -11,7 +11,6 @@ use crate::handlers::pretty_json::PrettyJson; use crate::AppState; /// Gets the JSON to return for a service-info endpoint -#[allow(clippy::let_with_type_underscore)] #[instrument(skip(app_state))] pub fn get_service_info_json( app_state: &AppState, diff --git a/htsget-search/Cargo.toml b/htsget-search/Cargo.toml index a8e9638bf..42e63d532 100644 --- a/htsget-search/Cargo.toml +++ b/htsget-search/Cargo.toml @@ -54,9 +54,9 @@ tempfile = "3.3" data-url = "0.2" # S3 storage testing -s3s = { git="https://github.com/Nugine/s3s", version = "0.5.0-dev" } -s3s-fs = { git="https://github.com/Nugine/s3s", version = "0.5.0-dev" } -s3s-aws = { git="https://github.com/Nugine/s3s", version = "0.5.0-dev" } +s3s = { version = "0.5" } +s3s-fs = { version = "0.5" } +s3s-aws = { version = "0.5" } # Axum server reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }