Update Wasmtime to 20.0.2 #2512
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexcrichton
force-pushed
the
update-wasmtime-to-20
branch
2 times, most recently
from
279fe6d to
36f0a0b
Compare
itowlson
reviewed
May 14, 2024
| @@ -21,7 +21,7 @@ concurrency: | |||
|
|
|||
| env: | |||
| CARGO_TERM_COLOR: always | |||
| RUST_VERSION: 1.74 | |||
| RUST_VERSION: 1.75 | |||
There was a problem hiding this comment.
We should bump the MSRV in Cargo.toml if this is now needed.
alexcrichton
force-pushed
the
update-wasmtime-to-20
branch
from
36f0a0b to
c247b69
Compare
rylev
approved these changes
May 15, 2024
| wasi_builder: impl FnOnce(WasiCtxBuilder) -> WasiCtxBuilder, | ||
| ) -> Store<Context> { | ||
| wasi_builder: impl FnOnce(&mut WasiCtxBuilder) -> Result<()>, | ||
| ) -> Result<Store<Context>> { |
There was a problem hiding this comment.
It seems we unwrap this result in the caller. Perhaps we should just keep this infallible and unwrap (or better yet expect) in the closures?
crates/trigger-http/src/lib.rs
Outdated
| @@ -715,7 +723,9 @@ impl OutboundWasiHttpHandler for HttpRuntimeData { | |||
| "self".into() | |||
| }; | |||
| eprintln!("To allow requests, add 'allowed_outbound_hosts = [\"{}\"]' to the manifest component section.", host); | |||
| anyhow::bail!("destination-not-allowed (error 1)") | |||
| return Err(HttpError::trap(anyhow::anyhow!( | |||
There was a problem hiding this comment.
I realize we were trapping before, but I do wonder if we should be returning HTTP-request-denied instead.
This commit updates the Wasmtime version used by Spin from 18.0.4 to 20.0.2. No motivation beyond keeping things up-to-date. This involved a number of minor WASI refactorings such as moving some items around and some refactorings around the `wasmtime-wasi-http` traits-and-types. Notably the chained handler was switched from `anyhow::Result` to `wasmtime_wasi_http::HttpResult` which helps make more explicit which errors are traps and which are normal error codes. Also update the MSRV of Spin to 1.75 as that's what Wasmtime requires Signed-off-by: Alex Crichton <[email protected]>
alexcrichton
force-pushed
the
update-wasmtime-to-20
branch
from
e0a582c to
f973c6d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit updates the Wasmtime version used by Spin from 18.0.4 to 20.0.2. No motivation beyond keeping things up-to-date. This involved a number of minor WASI refactorings such as moving some items around and some refactorings around the
wasmtime-wasi-httptraits-and-types. Notably the chained handler was switched fromanyhow::Resulttowasmtime_wasi_http::HttpResultwhich helps make more explicit which errors are traps and which are normal error codes.