diff --git a/Cargo.lock b/Cargo.lock index 3e2fa7e833..a6ba4882d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7968,7 +7968,7 @@ dependencies = [ "hyper-util", "indexmap 1.9.3", "percent-encoding", - "rustls 0.22.4", + "rustls 0.23.7", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde 1.0.197", diff --git a/Cargo.toml b/Cargo.toml index 605ee094dc..ea34cb1dba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,6 +128,9 @@ conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev http-body-util = "0.1.0" hyper = { version = "1.0.0", features = ["full"] } reqwest = { version = "0.12", features = ["stream", "blocking"] } +# In `rustls` turn off the `aws_lc_rs` default feature and turn on `ring`. +# If both `aws_lc_rs` and `ring` are enabled, a panic at runtime will occur. +rustls = { version = "0.23", default-features = false, features = ["ring", "std", "logging", "tls12"] } test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" } tracing = { version = "0.1", features = ["log"] } diff --git a/crates/factor-key-value/Cargo.toml b/crates/factor-key-value/Cargo.toml index 594a4ec4c9..f9b9e4c9d2 100644 --- a/crates/factor-key-value/Cargo.toml +++ b/crates/factor-key-value/Cargo.toml @@ -18,9 +18,9 @@ toml = "0.8" tracing = { workspace = true } [dev-dependencies] +spin-factors-test = { path = "../factors-test" } spin-key-value-redis = { path = "../key-value-redis" } spin-key-value-spin = { path = "../key-value-spin" } -spin-factors-test = { path = "../factors-test" } tempfile = "3.12.0" tokio = { version = "1", features = ["macros", "rt"] } diff --git a/crates/factor-outbound-http/Cargo.toml b/crates/factor-outbound-http/Cargo.toml index 60ad1f2abb..aea23b6ce7 100644 --- a/crates/factor-outbound-http/Cargo.toml +++ b/crates/factor-outbound-http/Cargo.toml @@ -11,7 +11,7 @@ http-body-util = "0.1" hyper = "1.4.1" ip_network = "0.4" reqwest = { version = "0.12", features = ["gzip"] } -rustls = { version = "0.23", default-features = false, features = ["ring", "std"] } +rustls = { workspace = true } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factors = { path = "../factors" } spin-telemetry = { path = "../telemetry" } diff --git a/crates/factor-outbound-networking/Cargo.toml b/crates/factor-outbound-networking/Cargo.toml index 6c0d3c8b20..5692c70950 100644 --- a/crates/factor-outbound-networking/Cargo.toml +++ b/crates/factor-outbound-networking/Cargo.toml @@ -9,7 +9,7 @@ anyhow = "1" futures-util = "0.3" http = "1.1.0" ipnet = "2.9.0" -rustls = { version = "0.23", default-features = false, features = ["ring", "std", "tls12"] } +rustls = { workspace = true } rustls-pemfile = { version = "2.1.2", optional = true } rustls-pki-types = "1.7.0" serde = { version = "1", features = ["derive"] } diff --git a/crates/loader/Cargo.toml b/crates/loader/Cargo.toml index 329f1c5e5e..9f3e86c363 100644 --- a/crates/loader/Cargo.toml +++ b/crates/loader/Cargo.toml @@ -24,9 +24,9 @@ serde_json = "1.0" sha2 = "0.10.8" shellexpand = "3.1" spin-common = { path = "../common" } +spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-locked-app = { path = "../locked-app" } spin-manifest = { path = "../manifest" } -spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-serde = { path = "../serde" } tempfile = "3.8.0" terminal = { path = "../terminal" } diff --git a/crates/runtime-config/Cargo.toml b/crates/runtime-config/Cargo.toml index f9854fc4b0..e8230cff8f 100644 --- a/crates/runtime-config/Cargo.toml +++ b/crates/runtime-config/Cargo.toml @@ -12,9 +12,6 @@ rust-version.workspace = true anyhow = { workspace = true } spin-common = { path = "../common" } spin-factor-key-value = { path = "../factor-key-value" } -spin-key-value-azure = { path = "../key-value-azure" } -spin-key-value-redis = { path = "../key-value-redis" } -spin-key-value-spin = { path = "../key-value-spin" } spin-factor-llm = { path = "../factor-llm" } spin-factor-outbound-http = { path = "../factor-outbound-http" } spin-factor-outbound-mqtt = { path = "../factor-outbound-mqtt" } @@ -26,6 +23,9 @@ spin-factor-sqlite = { path = "../factor-sqlite" } spin-factor-variables = { path = "../factor-variables" } spin-factor-wasi = { path = "../factor-wasi" } spin-factors = { path = "../factors" } +spin-key-value-azure = { path = "../key-value-azure" } +spin-key-value-redis = { path = "../key-value-redis" } +spin-key-value-spin = { path = "../key-value-spin" } spin-sqlite = { path = "../sqlite" } spin-trigger = { path = "../trigger" } toml = "0.8" diff --git a/crates/trigger-http/Cargo.toml b/crates/trigger-http/Cargo.toml index 5a7d0635e5..d5c79a29c5 100644 --- a/crates/trigger-http/Cargo.toml +++ b/crates/trigger-http/Cargo.toml @@ -19,7 +19,7 @@ hyper = { workspace = true } hyper-util = { version = "0.1.2", features = ["tokio"] } indexmap = "1" percent-encoding = "2" -rustls = { version = "0.22.4" } +rustls = { workspace = true } rustls-pemfile = "2.1.2" rustls-pki-types = "1.7" serde = { version = "1.0", features = ["derive"] } @@ -27,10 +27,10 @@ serde_json = "1" spin-app = { path = "../app" } spin-core = { path = "../core" } spin-factor-outbound-http = { path = "../factor-outbound-http" } +spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factor-wasi = { path = "../factor-wasi" } spin-factors = { path = "../factors" } spin-http = { path = "../http" } -spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-telemetry = { path = "../telemetry" } spin-trigger = { path = "../trigger" } spin-world = { path = "../world" }