Merge pull request #534 from fastly/dgohman-fastly/update

Update to the latest WITs and adapter.

Author: dgohman-fastly

src/component.rs

@@ -10,20 +10,24 @@ pub(crate) mod bindings {
         imports: {
             default: tracing,
 
-            "fastly:compute/backend/[constructor]dynamic-backend-options": trappable,
+            "fastly:compute/backend/[constructor]dynamic-backend-options": tracing | trappable,
+            "fastly:compute/shielding/[constructor]shield-backend-options": tracing | trappable,
+            "fastly:compute/cache/[constructor]extra-lookup-options": tracing | trappable,
+            "fastly:compute/cache/[constructor]extra-replace-options": tracing | trappable,
+            "fastly:compute/cache/[constructor]extra-write-options": tracing | trappable,
 
             // The trap-test test depends on being able to induce an artificial
             // trap in `get-header-values`.
-            "fastly:compute/http-resp/[method]response.get-header-values": trappable,
+            "fastly:compute/http-resp/[method]response.get-header-values": tracing | trappable,
 
             "fastly:compute/http-body/append": async | tracing,
             "fastly:compute/kv-store/await-delete": async | tracing,
             "fastly:compute/cache/await-entry": async | tracing,
             "fastly:compute/kv-store/await-insert": async | tracing,
             "fastly:compute/kv-store/await-list": async | tracing,
             "fastly:compute/kv-store/await-lookup": async | tracing | trappable,
-            "fastly:compute/http-downstream/await-next-request": async | tracing,
-            "fastly:compute/http-req/await-request": async | tracing,
+            "fastly:compute/http-downstream/await-request": async | tracing,
+            "fastly:compute/http-req/await-response": async | tracing,
             "fastly:compute/cache/close-entry": async | tracing,
             "fastly:compute/cache/insert": async | tracing,
             "fastly:compute/cache/replace": async | tracing,

src/component/adapter.rs

@@ -1,5 +1,6 @@
 //! Implementations for `fastly:adapter` interfaces.
 
+pub mod cache;
 pub mod http_cache;
 pub mod http_downstream;
 pub mod http_req;

src/component/adapter/cache.rs

@@ -0,0 +1,40 @@
+use crate::component::bindings::fastly::adapter::adapter_cache;
+use crate::component::bindings::fastly::compute::{cache, types};
+use crate::linking::ComponentCtx;
+use crate::Error;
+use wasmtime::component::Resource;
+
+impl adapter_cache::Host for ComponentCtx {
+    fn set_lookup_service_id_deprecated(
+        &mut self,
+        _options: Resource<cache::ExtraLookupOptions>,
+        _service_id: String,
+    ) -> Result<(), types::Error> {
+        Err(Error::Unsupported {
+            msg: "adapter-cache.set-lookup-service-id-deprecated is not supported on Viceroy.",
+        }
+        .into())
+    }
+
+    fn set_write_service_id_deprecated(
+        &mut self,
+        _options: Resource<cache::ExtraWriteOptions>,
+        _service_id: String,
+    ) -> Result<(), types::Error> {
+        Err(Error::Unsupported {
+            msg: "adapter-cache.set-write-service-id-deprecated is not supported on Viceroy.",
+        }
+        .into())
+    }
+
+    fn set_replace_service_id_deprecated(
+        &mut self,
+        _options: Resource<cache::ExtraReplaceOptions>,
+        _service_id: String,
+    ) -> Result<(), types::Error> {
+        Err(Error::Unsupported {
+            msg: "adapter-cache.set-replace-service-id-deprecated is not supported on Viceroy.",
+        }
+        .into())
+    }
+}

src/component/adapter/http_req.rs

@@ -144,4 +144,15 @@ impl adapter_http_req::Host for ComponentCtx {
     fn downstream_tls_ja3_md5(&mut self) -> Result<Option<Vec<u8>>, types::Error> {
         HttpDownstream::downstream_tls_ja3_md5(self, self.ds_req_handle())
     }
+
+    fn on_behalf_of_deprecated(
+        &mut self,
+        _: Resource<http_req::Request>,
+        _: String,
+    ) -> Result<(), types::Error> {
+        Err(Error::Unsupported {
+            msg: "http-req.on-behalf-of is not supported in Viceroy",
+        }
+        .into())
+    }
 }

src/component/compute/cache.rs

@@ -57,13 +57,6 @@ fn load_write_options(options: &api::WriteOptions) -> Result<WriteOptions, Error
     let length = options.length;
     let sensitive_data = options.sensitive_data;
 
-    // SERVICE_ID differences are observable- but we don't implement that behavior. Error explicitly.
-    if options.service_id.is_some() {
-        return Err(Error::Unsupported {
-            msg: "cache on_behalf_of is not supported in Viceroy",
-        });
-    }
-
     let edge_max_age = if let Some(edge_max_age_ns) = options.edge_max_age_ns {
         Duration::from_nanos(edge_max_age_ns)
     } else {
@@ -588,6 +581,10 @@ impl api::HostEntry for ComponentCtx {
 }
 
 impl api::HostExtraReplaceOptions for ComponentCtx {
+    fn new(&mut self) -> wasmtime::Result<Resource<api::ExtraReplaceOptions>> {
+        Ok(Resource::<api::ExtraReplaceOptions>::new_own(0))
+    }
+
     fn drop(&mut self, _options: Resource<api::ExtraReplaceOptions>) -> wasmtime::Result<()> {
         Ok(())
     }
@@ -600,12 +597,20 @@ impl api::HostExtraGetBodyOptions for ComponentCtx {
 }
 
 impl api::HostExtraWriteOptions for ComponentCtx {
+    fn new(&mut self) -> wasmtime::Result<Resource<api::ExtraWriteOptions>> {
+        Ok(Resource::<api::ExtraWriteOptions>::new_own(0))
+    }
+
     fn drop(&mut self, _options: Resource<api::ExtraWriteOptions>) -> wasmtime::Result<()> {
         Ok(())
     }
 }
 
 impl api::HostExtraLookupOptions for ComponentCtx {
+    fn new(&mut self) -> wasmtime::Result<Resource<api::ExtraLookupOptions>> {
+        Ok(Resource::<api::ExtraLookupOptions>::new_own(0))
+    }
+
     fn drop(&mut self, _options: Resource<api::ExtraLookupOptions>) -> wasmtime::Result<()> {
         Ok(())
     }

src/component/compute/http_body.rs

@@ -162,7 +162,7 @@ impl http_body::Host for ComponentCtx {
         h: Resource<http_body::Body>,
         max_len: u64,
         cursor: u32,
-    ) -> Result<(String, Option<u32>), types::Error> {
+    ) -> Result<(String, Option<u32>), http_body::TrailerError> {
         let h = h.into();
 
         // Read operations are not allowed on streaming bodies.
@@ -172,7 +172,7 @@ impl http_body::Host for ComponentCtx {
 
         let body = self.session_mut().body_mut(h)?;
         if !body.trailers_ready {
-            return Err(Error::Again.into());
+            return Err(http_body::TrailerError::NotAvailableYet);
         }
 
         let trailers = &body.trailers;
@@ -186,7 +186,7 @@ impl http_body::Host for ComponentCtx {
         h: Resource<http_body::Body>,
         name: String,
         max_len: u64,
-    ) -> Result<Option<Vec<u8>>, types::Error> {
+    ) -> Result<Option<Vec<u8>>, http_body::TrailerError> {
         let h = h.into();
 
         // Read operations are not allowed on streaming bodies.
@@ -196,7 +196,7 @@ impl http_body::Host for ComponentCtx {
 
         let body = self.session_mut().body_mut(h)?;
         if !body.trailers_ready {
-            return Err(Error::Again.into());
+            return Err(http_body::TrailerError::NotAvailableYet);
         }
 
         let trailers = &mut body.trailers;
@@ -230,17 +230,17 @@ impl http_body::Host for ComponentCtx {
         name: String,
         max_len: u64,
         cursor: u32,
-    ) -> Result<(Vec<u8>, Option<u32>), types::Error> {
+    ) -> Result<(Vec<u8>, Option<u32>), http_body::TrailerError> {
         let h = h.into();
 
         // Read operations are not allowed on streaming bodies.
         if self.session().is_streaming_body(h) {
             return Err(Error::InvalidArgument.into());
         }
 
-        let body = self.session_mut().body_mut(h)?;
+        let body = self.session_mut().body_mut(h).unwrap();
         if !body.trailers_ready {
-            return Err(Error::Again.into());
+            return Err(http_body::TrailerError::NotAvailableYet);
         }
 
         let trailers = &mut body.trailers;
@@ -249,3 +249,9 @@ impl http_body::Host for ComponentCtx {
         Ok((buf, next))
     }
 }
+
+impl<T: Into<types::Error>> From<T> for http_body::TrailerError {
+    fn from(err: T) -> Self {
+        Self::Error(err.into())
+    }
+}

src/component/compute/http_downstream.rs

@@ -12,7 +12,7 @@ impl http_downstream::Host for ComponentCtx {
     async fn next_request(
         &mut self,
         options: http_downstream::NextRequestOptions,
-    ) -> Result<Resource<http_downstream::RequestPromise>, types::Error> {
+    ) -> Result<Resource<http_downstream::PendingRequest>, types::Error> {
         let timeout = options.timeout_ms.map(Duration::from_millis);
         let handle = self
             .session_mut()
@@ -26,16 +26,16 @@ impl http_downstream::Host for ComponentCtx {
 
     fn next_request_abandon(
         &mut self,
-        handle: Resource<http_downstream::RequestPromise>,
+        handle: Resource<http_downstream::PendingRequest>,
     ) -> Result<(), types::Error> {
         let handle = RequestPromiseHandle::from(handle).into();
         self.session_mut().abandon_pending_downstream_req(handle)?;
         Ok(())
     }
 
-    async fn await_next_request(
+    async fn await_request(
         &mut self,
-        handle: Resource<http_downstream::RequestPromise>,
+        handle: Resource<http_downstream::PendingRequest>,
     ) -> Result<Option<(Resource<http_req::Request>, Resource<http_body::Body>)>, types::Error>
     {
         let handle = RequestPromiseHandle::from(handle).into();

src/component/compute/http_req.rs

@@ -148,7 +148,7 @@ impl http_req::Host for ComponentCtx {
         Ok(self.session.insert_pending_request(task).into())
     }
 
-    async fn await_request(
+    async fn await_response(
         &mut self,
         h: Resource<http_req::PendingRequest>,
     ) -> Result<http_resp::ResponseWithBody, http_req::ErrorWithDetail> {
@@ -474,17 +474,6 @@ impl http_req::HostRequest for ComponentCtx {
         Ok(())
     }
 
-    fn on_behalf_of(
-        &mut self,
-        _: Resource<http_req::Request>,
-        _: String,
-    ) -> Result<(), types::Error> {
-        Err(Error::Unsupported {
-            msg: "http-req.on-behalf-of is not supported in Viceroy",
-        }
-        .into())
-    }
-
     fn drop(&mut self, _request: Resource<http_req::Request>) -> wasmtime::Result<()> {
         Ok(())
     }

src/component/compute/secret_store.rs

@@ -46,7 +46,7 @@ impl secret_store::HostSecret for ComponentCtx {
         &mut self,
         secret: Resource<secret_store::Secret>,
         max_len: u64,
-    ) -> Result<Option<Vec<u8>>, types::Error> {
+    ) -> Result<Vec<u8>, types::Error> {
         let secret = secret.into();
         let lookup = self
             .session()
@@ -83,7 +83,7 @@ impl secret_store::HostSecret for ComponentCtx {
             .into());
         }
 
-        Ok(Some(plaintext.to_owned()))
+        Ok(plaintext.to_owned())
     }
 
     fn from_bytes(

src/component/compute/shielding.rs

@@ -50,7 +50,7 @@ impl shielding::Host for ComponentCtx {
     fn backend_for_shield(
         &mut self,
         name: String,
-        _options: shielding::ShieldBackendOptions,
+        _options: Option<Resource<shielding::ShieldBackendOptions>>,
         max_len: u64,
     ) -> Result<String, types::Error> {
         let shield_uri = name;
@@ -88,10 +88,31 @@ impl shielding::Host for ComponentCtx {
     }
 }
 
-impl shielding::HostExtraShieldBackendOptions for ComponentCtx {
+impl shielding::HostShieldBackendOptions for ComponentCtx {
+    fn set_first_byte_timeout(
+        &mut self,
+        _resource: Resource<shielding::ShieldBackendOptions>,
+        _timeout_ms: u32,
+    ) {
+    }
+
+    fn set_cache_key(
+        &mut self,
+        _resource: Resource<shielding::ShieldBackendOptions>,
+        _cache_key: String,
+    ) {
+    }
+
+    fn new(&mut self) -> Result<Resource<shielding::ShieldBackendOptions>, anyhow::Error> {
+        Err(Error::Unsupported {
+            msg: "Shield backend options not yet supported in Viceroy",
+        }
+        .into())
+    }
+
     fn drop(
         &mut self,
-        _options: Resource<shielding::ExtraShieldBackendOptions>,
+        _options: Resource<shielding::ShieldBackendOptions>,
     ) -> wasmtime::Result<()> {
         Ok(())
     }