Last example adjustments

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

examples/config-rust/Cargo.lock

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

examples/config-rust/Cargo.toml

@@ -1,15 +1,16 @@
-use anyhow::Result;
-use spin_sdk::{config, http::IntoResponse, http_component};
+use spin_sdk::{
+    config,
+    http::{Request, Response},
+    http_component,
+};
 
 /// This endpoint returns the config value specified by key.
 #[http_component]
-fn get(req: http::Request<()>) -> Result<impl IntoResponse> {
-    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(val)?);
+        return Ok(Response::new(200, val));
     }
     let val = format!("message: {}", config::get("message")?);
-    Ok(http::Response::builder().status(200).body(val)?)
+    Ok(Response::new(200, val))
 }

examples/config-rust/src/lib.rs

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

examples/rust-outbound-redis/Cargo.lock

@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Context, Result};
 use spin_sdk::{
     http::responses::internal_server_error,
-    http::{IntoResponse, Response},
+    http::{IntoResponse, Request, Response},
     http_component, redis,
 };
 
@@ -19,7 +19,7 @@ const REDIS_CHANNEL_ENV: &str = "REDIS_CHANNEL";
 /// to a Redis channel. The component is triggered by an HTTP
 /// request served on the route configured in the `spin.toml`.
 #[http_component]
-fn publish(_req: http::Request<()>) -> Result<impl IntoResponse> {
+fn publish(_req: Request) -> Result<impl IntoResponse> {
     let address = std::env::var(REDIS_ADDRESS_ENV)?;
     let channel = std::env::var(REDIS_CHANNEL_ENV)?;
 

examples/rust-outbound-redis/Cargo.toml

@@ -18,11 +18,8 @@ use spin_sdk::{
 /// A simple Spin HTTP component.
 #[http_component]
 fn hello_world(req: Request) -> Result<Response> {
-    println!("{:?}", req.headers());
-    Ok(http::Response::builder()
-        .status(200)
-        .header("foo", "bar")
-        .body(Some("Hello, Fermyon!".into()))?)
+    println!("{:?}", req.headers);
+    Ok(Response::new_with_headers(200, &[] "Hello, Fermyon!"))
 }
 ```
 
@@ -31,9 +28,10 @@ The important things to note in the function above:
 - the `spin_sdk::http_component` macro — this marks the function as the
   entrypoint for the Spin component
 - the function signature — `fn hello_world(req: Request) -> Result<Response>` —
-  the Spin HTTP component uses the HTTP objects from the popular Rust crate
-  [`http`](https://crates.io/crates/http), and the request and response bodies
-  are optionally using [`bytes::Bytes`](https://crates.io/crates/bytes)
+`req` can be any number of types including the built in `Request` type or 
+the `http::Request` from the popular `http` crate. Likewise, the response type
+can be many things including the built in `Response` type or the `http::Response` type
+from the `http` crate.
 
 ### Making outbound HTTP requests
 
@@ -43,11 +41,11 @@ server, modifies the result, then returns it:
 ```rust
 #[http_component]
 fn hello_world(_req: Request) -> Result<Response> {
-    let mut res = spin_sdk::http::send(
+    let mut res: http::Response<()> = spin_sdk::http::send(
         http::Request::builder()
             .method("GET")
             .uri("https://fermyon.com")
-            .body(None)?,
+            .body(())?,
     )?;
 
     res.headers_mut()