Unverified Commit 31c5a91a authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Upgrade min versions of tokio, tracing-subscriber, and criterion (#1662) 

* Upgrade minimum Tokio version to 1.8.4

This addresses RUSTSEC-2021-0072 and RUSTSEC-2021-0124.
The SDK, runtime crates, and server are set to the minimum secure
version of Tokio to allow a larger range of versions to be used by
consumers of those libraries. The tools and the Python server are
both set to the latest Tokio version since they are not intended
to be consumed as a libraries.

* Upgrade `tracing-subscriber` to 0.3.15

* Upgrade `criterion` to 0.3.6

This addresses RUSTSEC-2021-0093 by upgrading `criterion`, which
upgrades `rayon`, which upgrades `crossbeam-deque`.
parent a0f67c37

aws/rust-runtime/aws-config/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ aws-smithy-client = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-client", de 
aws-smithy-types = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-types" }

aws-types = { path = "../../sdk/build/aws-sdk/sdk/aws-types" }

time = { version = "0.3.4", features = ["parsing"] }

tokio = { version = "1", features = ["sync"] }

tokio = { version = "1.8.4", features = ["sync"] }

tracing = { version = "0.1" }

hyper = { version = "0.14.12", default-features = false }
@@ -46,7 +46,7 @@ tower = { version = "0.4.8" } 
futures-util = "0.3.16"

tracing-test = "0.2.1"



tokio = { version = "1", features = ["full", "test-util"] }

tokio = { version = "1.8.4", features = ["full", "test-util"] }

# used to test compatibility

async-trait = "0.1.51"

env_logger = "0.9.0"

aws/rust-runtime/aws-http/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ aws-smithy-protocol-test = { path = "../../../rust-runtime/aws-smithy-protocol-t 
bytes-utils = "0.1.2"

env_logger = "0.9"

http = "0.2.3"

tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "test-util", "time"] }

tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }

tokio = { version = "1.8.4", features = ["macros", "rt", "rt-multi-thread", "test-util", "time"] }

tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }

proptest = "1"

serde = { version = "1", features = ["derive"]}

serde_json = "1"

aws/rust-runtime/aws-inlineable/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ http = "0.2.4" 
http-body = "0.4.5"

md-5 = "0.10.1"

ring = "0.16"

tokio = { version = "1", features = ["full"] }

tokio = { version = "1.8.4", features = ["full"] }

tokio-stream = "0.1.5"

tower = { version = "0.4", default-features = false }

tracing = "0.1"
@@ -37,7 +37,7 @@ tracing = "0.1" 
aws-smithy-client = { path = "../../../rust-runtime/aws-smithy-client", features = ["test-util"] }

aws-smithy-http = { path = "../../../rust-runtime/aws-smithy-http", features = ["rt-tokio"] }

tempfile = "3.2.0"

tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }

tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }



[package.metadata.docs.rs]

all-features = true

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/IntegrationTestDependencies.kt

+3 −3
Original line number Diff line number Diff line
@@ -116,12 +116,12 @@ class S3TestDependencies( 


private val AsyncStd = CargoDependency("async-std", CratesIo("1.12.0"), scope = DependencyScope.Dev)

private val AsyncStream = CargoDependency("async-stream", CratesIo("0.3.0"), DependencyScope.Dev)

private val Criterion = CargoDependency("criterion", CratesIo("0.3.0"), scope = DependencyScope.Dev)

private val Criterion = CargoDependency("criterion", CratesIo("0.3.6"), scope = DependencyScope.Dev)

private val FuturesCore = CargoDependency("futures-core", CratesIo("0.3.0"), DependencyScope.Dev)

private val FuturesUtil = CargoDependency("futures-util", CratesIo("0.3.0"), scope = DependencyScope.Dev)

private val Hound = CargoDependency("hound", CratesIo("3.4.0"), DependencyScope.Dev)

private val SerdeJson = CargoDependency("serde_json", CratesIo("1.0.0"), features = emptySet(), scope = DependencyScope.Dev)

private val Smol = CargoDependency("smol", CratesIo("1.2.0"), scope = DependencyScope.Dev)

private val Tokio = CargoDependency("tokio", CratesIo("1.0.0"), features = setOf("macros", "test-util"), scope = DependencyScope.Dev)

private val Tokio = CargoDependency("tokio", CratesIo("1.8.4"), features = setOf("macros", "test-util"), scope = DependencyScope.Dev)

private val Tracing = CargoDependency("tracing", CratesIo("0.1.0"), scope = DependencyScope.Dev)

private val TracingSubscriber = CargoDependency("tracing-subscriber", CratesIo("0.3.5"), scope = DependencyScope.Dev, features = setOf("env-filter"))
 
private val TracingSubscriber = CargoDependency("tracing-subscriber", CratesIo("0.3.15"), scope = DependencyScope.Dev, features = setOf("env-filter"))

aws/sdk/integration-tests/dynamodb/Cargo.toml

+4 −4
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ aws-smithy-protocol-test = { path = "../../build/aws-sdk/sdk/aws-smithy-protocol 
aws-smithy-async = { path = "../../build/aws-sdk/sdk/aws-smithy-async" }

aws-types = { path = "../../build/aws-sdk/sdk/aws-types" }

bytes = "1.0.0"

# TODO(https://github.com/awslabs/smithy-rs/issues/1044) v3.5 has an unmaintained dependency, upgrade this when possible

criterion = { version = "0.3.5" }

# TODO(https://github.com/awslabs/smithy-rs/issues/1044) v3.6 has an unmaintained dependency, upgrade this when possible

criterion = { version = "0.3.6" }

futures-util = "0.3.16"

http = "0.2.0"

serde_json = "1.0.0"

tokio = { version = "1.0.0", features = ["full", "test-util"] }

tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }

tokio = { version = "1.8.4", features = ["full", "test-util"] }

tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }

tokio-stream = "0.1.5"



[[bench]]