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

Update to handle new conformance tests #93

Merged
merged 1 commit into from
Jun 17, 2024
Merged

Update to handle new conformance tests #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

336 changes: 35 additions & 301 deletions conformance-tests/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,316 +1,50 @@
use std::collections::HashMap;
mod runtime;

use anyhow::anyhow;
use anyhow::Context as _;
use bindings::{exports::wasi::http::types::HeaderError, VirtualizedApp};
use test_environment::http::Response;
use runtime::SpinTest;

mod bindings {
wasmtime::component::bindgen!({
world: "virtualized-app",
path: "../host-wit",
with: {
"wasi:io": wasmtime_wasi::bindings::io,
"wasi:clocks": wasmtime_wasi::bindings::clocks,
}
});
}
// We don't use port 80 because URL parsing treats port 80 special
// and will not include it in the URL string representation which breaks the test
Comment on lines +5 to +6
Copy link

@lann lann Jun 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this be fixed by bytecodealliance/wasmtime#8563 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll still run into because we're parsing the URL in the test component.

const HTTP_PORT: u16 = 1234;

fn main() -> anyhow::Result<()> {
let tests_dir = conformance_tests::download_tests()?;

for test in conformance_tests::tests(&tests_dir)? {
let engine = wasmtime::Engine::default();
let manifest = String::from_utf8(std::fs::read(test.manifest)?)?;
let mut store = wasmtime::Store::new(&engine, StoreData::new(manifest));
let mut linker = wasmtime::component::Linker::new(&engine);
let component = spin_test::Component::from_file(test.component)?;
let component = spin_test::virtualize_app(component).context("failed to virtualize app")?;

let component = wasmtime::component::Component::new(&engine, component)?;
wasmtime_wasi::add_to_linker_sync(&mut linker)?;
bindings::VirtualizedApp::add_to_linker(&mut linker, |x| x)?;

let (instance, _) = bindings::VirtualizedApp::instantiate(&mut store, &component, &linker)?;
println!("Test: {}", test.name);
let mut manifest =
test_environment::manifest_template::EnvTemplate::from_file(&test.manifest).unwrap();
let env_config = test_environment::TestEnvironmentConfig {
create_runtime: Box::new(|_env| {
manifest.substitute_value("port", |port| {
(port == "80").then(|| HTTP_PORT.to_string())
})?;
SpinTest::new(manifest.into_contents(), test.component)
}),
// Services are not needed in `spin-test` since everything stays in the guest
services_config: test_environment::services::ServicesConfig::none(),
};
let mut env = test_environment::TestEnvironment::up(env_config, |_| Ok(())).unwrap();
if test.config.services.iter().any(|s| s == "http-echo") {
env.runtime_mut()
.set_echo_response(format!("http://localhost:{HTTP_PORT}").as_str())?;
}
for invocation in test.config.invocations {
let conformance_tests::config::Invocation::Http(invocation) = invocation;
invocation.run(|request| {
let request = to_outgoing_request(&instance, &mut store, request)?;
let response = to_incoming_response(&instance, &mut store, request)?;
from_incoming_response(&mut store, response)
})?;
let conformance_tests::config::Invocation::Http(mut invocation) = invocation;
invocation
.request
.substitute(|key, value| {
Ok(match (key, value) {
("port", "80") => Some(HTTP_PORT.to_string()),
_ => None,
})
})
.unwrap();
invocation.run(|request| env.runtime_mut().make_http_request(request))?;
}
}
Ok(())
}

/// Convert a test_environment::http::Request into a wasi::http::types::IncomingRequest
fn to_outgoing_request<'a>(
instance: &'a VirtualizedApp,
store: &mut wasmtime::Store<StoreData>,
request: test_environment::http::Request<String>,
) -> anyhow::Result<IncomingRequest<'a>> {
let fields = Fields::new(instance, store)?;
for (n, v) in request.headers {
fields.append(store, &(*n).to_owned(), &(*v).to_owned().into_bytes())??;
}
let outgoing_request = OutgoingRequest::new(instance, store, fields)?;
let method = match request.method {
test_environment::http::Method::Get => bindings::exports::wasi::http::types::Method::Get,
test_environment::http::Method::Post => bindings::exports::wasi::http::types::Method::Post,
test_environment::http::Method::Put => bindings::exports::wasi::http::types::Method::Put,
test_environment::http::Method::Patch => {
bindings::exports::wasi::http::types::Method::Patch
}
test_environment::http::Method::Delete => {
bindings::exports::wasi::http::types::Method::Delete
}
};
outgoing_request
.set_method(store, &method)?
.map_err(|_| anyhow!("invalid request method"))?;
outgoing_request
.set_path_with_query(store, Some(request.path))?
.map_err(|_| anyhow!("invalid request path"))?;
// TODO: set the body
IncomingRequest::new(instance, store, outgoing_request)
}

/// Call the incoming handler with the request and return the response
fn to_incoming_response<'a>(
instance: &'a VirtualizedApp,
store: &mut wasmtime::Store<StoreData>,
request: IncomingRequest<'a>,
) -> anyhow::Result<IncomingResponse<'a>> {
let (out, rx) = new_response(instance, &mut *store)?;
instance
.wasi_http_incoming_handler()
.call_handle(&mut *store, request.resource, out)?;
rx.get(&mut *store)?.context("no response found")
}

/// Convert a wasi::http::types::IncomingResponse into a test_environment::http::Response
fn from_incoming_response(
store: &mut wasmtime::Store<StoreData>,
response: IncomingResponse,
) -> anyhow::Result<Response> {
let status = response.status(store)?;
let headers = response
.headers(store)?
.entries(store)?
.into_iter()
.map(|(k, v)| Ok((k, String::from_utf8(v)?)))
.collect::<anyhow::Result<HashMap<_, _>>>()?;
let body = response
.consume(store)?
.map_err(|_| anyhow!("response body already consumed"))?
.stream(store)?
.map_err(|_| anyhow!("response body stream already consumed"))?
.blocking_read(store, u64::MAX)??;
Ok(Response::full(status, headers, body))
}

struct Fields<'a> {
guest: bindings::exports::wasi::http::types::GuestFields<'a>,
resource: wasmtime::component::ResourceAny,
}

impl<'a> Fields<'a> {
pub fn new<T>(
instance: &'a VirtualizedApp,
store: &mut wasmtime::Store<T>,
) -> anyhow::Result<Self> {
let guest = instance.wasi_http_types().fields();
let resource = guest.call_constructor(store)?;
Ok(Self { guest, resource })
}

pub fn append<T>(
&self,
store: &mut wasmtime::Store<T>,
name: &String,
value: &Vec<u8>,
) -> anyhow::Result<Result<(), HeaderError>> {
self.guest.call_append(store, self.resource, name, value)
}

fn entries(
&self,
store: &mut wasmtime::Store<StoreData>,
) -> wasmtime::Result<Vec<(String, Vec<u8>)>> {
self.guest.call_entries(store, self.resource)
}
}

struct OutgoingRequest<'a> {
guest: bindings::exports::wasi::http::types::GuestOutgoingRequest<'a>,
resource: wasmtime::component::ResourceAny,
}

impl<'a> OutgoingRequest<'a> {
pub fn new<T>(
instance: &'a VirtualizedApp,
store: &mut wasmtime::Store<T>,
fields: Fields,
) -> anyhow::Result<Self> {
let guest = instance.wasi_http_types().outgoing_request();
let resource = guest.call_constructor(store, fields.resource)?;
Ok(Self { guest, resource })
}

pub fn set_method<T>(
&self,
store: &mut wasmtime::Store<T>,
method: &bindings::exports::wasi::http::types::Method,
) -> anyhow::Result<Result<(), ()>> {
self.guest.call_set_method(store, self.resource, method)
}

pub fn set_path_with_query<T>(
&self,
store: &mut wasmtime::Store<T>,
path: Option<&str>,
) -> anyhow::Result<Result<(), ()>> {
self.guest
.call_set_path_with_query(store, self.resource, path)
}
}

struct IncomingRequest<'a> {
#[allow(dead_code)]
guest: bindings::exports::wasi::http::types::GuestIncomingRequest<'a>,
resource: wasmtime::component::ResourceAny,
}

impl<'a> IncomingRequest<'a> {
fn new<T>(
instance: &'a VirtualizedApp,
store: &mut wasmtime::Store<T>,
outgoing_request: OutgoingRequest,
) -> anyhow::Result<Self> {
let guest = instance.fermyon_spin_wasi_virt_http_helper();
let resource = guest.call_new_request(store, outgoing_request.resource, None)?;
let guest = instance.wasi_http_types().incoming_request();
Ok(Self { guest, resource })
}
}

fn new_response<'a, T>(
instance: &'a VirtualizedApp,
store: &mut wasmtime::Store<T>,
) -> anyhow::Result<(wasmtime::component::ResourceAny, ResponseReceiver<'a>)> {
let guest = instance.fermyon_spin_wasi_virt_http_helper();
let (out_param, rx) = guest.call_new_response(store)?;
let rx_guest = instance
.fermyon_spin_wasi_virt_http_helper()
.response_receiver();

Ok((
out_param,
ResponseReceiver {
instance,
resource: rx,
guest: rx_guest,
},
))
}

struct ResponseReceiver<'a> {
instance: &'a VirtualizedApp,
guest: bindings::exports::fermyon::spin_wasi_virt::http_helper::GuestResponseReceiver<'a>,
resource: wasmtime::component::ResourceAny,
}

impl<'a> ResponseReceiver<'a> {
fn get<T>(
&self,
store: &mut wasmtime::Store<T>,
) -> anyhow::Result<Option<IncomingResponse<'a>>> {
let Some(resource) = self.guest.call_get(store, self.resource)? else {
return Ok(None);
};
Ok(Some(IncomingResponse {
instance: self.instance,
guest: self.instance.wasi_http_types().incoming_response(),
resource,
}))
}
}

struct IncomingResponse<'a> {
instance: &'a VirtualizedApp,
guest: bindings::exports::wasi::http::types::GuestIncomingResponse<'a>,
resource: wasmtime::component::ResourceAny,
}

impl<'a> IncomingResponse<'a> {
fn status<T>(&self, store: &mut wasmtime::Store<T>) -> anyhow::Result<u16> {
self.guest.call_status(store, self.resource)
}

fn headers<T>(&self, store: &mut wasmtime::Store<T>) -> anyhow::Result<Fields> {
let fields = self.guest.call_headers(store, self.resource)?;
Ok(Fields {
guest: self.instance.wasi_http_types().fields(),
resource: fields,
})
}

fn consume<T>(
&self,
store: &mut wasmtime::Store<T>,
) -> wasmtime::Result<Result<IncomingBody<'a>, ()>> {
let Ok(resource) = self.guest.call_consume(store, self.resource)? else {
return Ok(Err(()));
};
let guest = self.instance.wasi_http_types().incoming_body();
Ok(Ok(IncomingBody {
instance: self.instance,
guest,
resource,
}))
}
}

struct IncomingBody<'a> {
instance: &'a VirtualizedApp,
guest: bindings::exports::wasi::http::types::GuestIncomingBody<'a>,
resource: wasmtime::component::ResourceAny,
}

impl<'a> IncomingBody<'a> {
fn stream<T>(
&self,
store: &mut wasmtime::Store<T>,
) -> wasmtime::Result<Result<InputStream, ()>> {
let Ok(resource) = self.guest.call_stream(store, self.resource)? else {
return Ok(Err(()));
};
Ok(Ok(InputStream {
instance: self.instance,
resource,
}))
}
}

struct InputStream<'a> {
instance: &'a VirtualizedApp,
resource: wasmtime::component::ResourceAny,
}

impl<'a> InputStream<'a> {
fn blocking_read<T>(
&self,
store: &mut wasmtime::Store<T>,
max_bytes: u64,
) -> wasmtime::Result<Result<Vec<u8>, bindings::exports::wasi::io::streams::StreamError>> {
self.instance
.wasi_io_streams()
.input_stream()
.call_blocking_read(store, self.resource, max_bytes)
}
}

struct StoreData {
manifest: String,
ctx: wasmtime_wasi::WasiCtx,
Expand Down Expand Up @@ -339,7 +73,7 @@ impl wasmtime_wasi::WasiView for StoreData {
}
}

impl bindings::VirtualizedAppImports for StoreData {
impl runtime::VirtualizedAppImports for StoreData {
fn get_manifest(&mut self) -> String {
self.manifest.clone()
}
Expand Down
Loading