Merge pull request #1887 from fermyon/rust-sdk-improvements

Rust SDK http handler macro improvements

Author: rylev

Cargo.lock

@@ -12,7 +12,7 @@ const RUST_HTTP_INTEGRATION_ENV_TEST: &str = "tests/http/headers-env-routes-test
 const RUST_HTTP_VAULT_CONFIG_TEST: &str = "tests/http/vault-config-test";
 const RUST_OUTBOUND_REDIS_INTEGRATION_TEST: &str = "tests/outbound-redis/http-rust-outbound-redis";
 const TIMER_TRIGGER_INTEGRATION_TEST: &str = "examples/spin-timer/app-example";
-const WASI_HTTP_INTEGRATION_TEST: &str = "examples/wasi-http-rust-async";
+const WASI_HTTP_INTEGRATION_TEST: &str = "examples/wasi-http-rust-streaming-outgoing-body";
 
 fn main() {
     // Extract environment information to be passed to plugins.

build.rs

@@ -4,15 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-crate-type = [ "cdylib" ]
+crate-type = ["cdylib"]
 
 [dependencies]
 # Useful crate to handle errors.
 anyhow = "1"
-# Crate to simplify working with bytes.
-bytes = "1"
-# General-purpose crate with common HTTP types.
-http = "0.2"
 # The Spin SDK.
 spin-sdk = { path = "../../sdk/rust" }
-[workspace]
+[workspace]

examples/config-rust/Cargo.lock

@@ -1,4 +1,3 @@
-use anyhow::Result;
 use spin_sdk::{
     config,
     http::{Request, Response},
@@ -7,17 +6,11 @@ use spin_sdk::{
 
 /// This endpoint returns the config value specified by key.
 #[http_component]
-fn get(req: Request) -> Result<Response> {
-    let path = req.uri().path();
-
-    if path.contains("dotenv") {
+fn get(req: Request) -> anyhow::Result<Response> {
+    if req.uri.contains("dotenv") {
         let val = config::get("dotenv").expect("Failed to acquire dotenv from spin.toml");
-        return Ok(http::Response::builder()
-            .status(200)
-            .body(Some(val.into()))?);
+        return Ok(Response::new(200, val));
     }
     let val = format!("message: {}", config::get("message")?);
-    Ok(http::Response::builder()
-        .status(200)
-        .body(Some(val.into()))?)
+    Ok(Response::new(200, val))
 }

examples/config-rust/Cargo.toml

@@ -9,8 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 # Useful crate to handle errors.
 anyhow = "1"
-# Crate to simplify working with bytes.
-bytes = "1"
 # General-purpose crate with common HTTP types.
 http = "0.2"
 # The Spin SDK.

examples/config-rust/src/lib.rs

@@ -1,14 +1,10 @@
 use anyhow::Result;
-use spin_sdk::{
-    http::{Request, Response},
-    http_component,
-};
+use spin_sdk::http_component;
 
 /// A simple Spin HTTP component.
 #[http_component]
-fn hello_world(_req: Request) -> Result<Response> {
+fn hello_world(_req: http::Request<()>) -> Result<http::Response<&'static str>> {
     Ok(http::Response::builder()
         .status(200)
-        .header("foo", "bar")
-        .body(Some("Hello, Fermyon!\n".into()))?)
+        .body("Hello, Fermyon!\n")?)
 }

examples/http-rust-outbound-http/http-hello/Cargo.lock

@@ -10,8 +10,6 @@ crate-type = ["cdylib"]
 # Useful crate to handle errors.
 anyhow = "1"
 # Crate to simplify working with bytes.
-bytes = "1"
-# General-purpose crate with common HTTP types.
 http = "0.2"
 # The Spin SDK.
 spin-sdk = { path = "../../../sdk/rust" }