feat(host): gate messaging@v3 behind feature flag

Signed-off-by: Brooks Townsend <brooksmtownsend@gmail.com>

Author: brooksmtownsend

crates/host/src/wasmbus/experimental.rs

@@ -10,6 +10,8 @@ pub struct Features {
     /// Enable the built-in NATS Messaging capability provider
     /// that can be started with the reference wasmcloud+builtin://messaging-nats
     pub(crate) builtin_messaging_nats: bool,
+    /// Enable the wasmcloud:messaging@v3 interface support in the host
+    pub(crate) wasmcloud_messaging_v3: bool,
 }
 
 impl Features {
@@ -29,6 +31,12 @@ impl Features {
         self.builtin_messaging_nats = true;
         self
     }
+
+    /// Enable the wasmcloud:messaging@v3 interface support in the host
+    pub fn enable_wasmcloud_messaging_v3(mut self) -> Self {
+        self.wasmcloud_messaging_v3 = true;
+        self
+    }
 }
 
 /// This enables unioning feature flags together
@@ -39,6 +47,7 @@ impl std::ops::BitOr for Features {
         Self {
             builtin_http_server: self.builtin_http_server || rhs.builtin_http_server,
             builtin_messaging_nats: self.builtin_messaging_nats || rhs.builtin_messaging_nats,
+            wasmcloud_messaging_v3: self.wasmcloud_messaging_v3 || rhs.wasmcloud_messaging_v3,
         }
     }
 }
@@ -62,6 +71,9 @@ impl From<&str> for Features {
             "builtin-messaging-nats" | "builtin_messaging_nats" => {
                 Self::new().enable_builtin_messaging_nats()
             }
+            "wasmcloud-messaging-v3" | "wasmcloud_messaging_v3" => {
+                Self::new().enable_wasmcloud_messaging_v3()
+            }
             _ => {
                 warn!(%s, "unknown feature flag");
                 Self::new()

crates/host/src/wasmbus/handler.rs

@@ -26,7 +26,7 @@ use wasmcloud_tracing::context::TraceContextInjector;
 use wrpc_transport::InvokeExt as _;
 
 use super::config::ConfigBundle;
-use super::injector_to_headers;
+use super::{injector_to_headers, Features};
 
 #[derive(Clone, Debug)]
 pub struct Handler {
@@ -62,6 +62,8 @@ pub struct Handler {
     pub messaging_links: Arc<RwLock<HashMap<Box<str>, async_nats::Client>>>,
 
     pub invocation_timeout: Duration,
+    /// Experimental features enabled in the host for gating handler functionality
+    pub experimental_features: Features,
 }
 
 impl Handler {
@@ -78,6 +80,7 @@ impl Handler {
             instance_links: self.instance_links.clone(),
             messaging_links: self.messaging_links.clone(),
             invocation_timeout: self.invocation_timeout,
+            experimental_features: self.experimental_features,
         }
     }
 }
@@ -585,23 +588,27 @@ impl MessagingHostMessage0_3 for Message {
 }
 
 impl Messaging0_3 for Handler {
+    #[instrument(level = "debug", skip_all)]
     async fn connect(
         &self,
         name: String,
     ) -> anyhow::Result<
         Result<Box<dyn MessagingClient0_3 + Send + Sync>, messaging0_3_0::types::Error>,
     > {
+        self.ensure_messaging_v3()?;
         Ok(Ok(Box::new(MessagingClient {
             name: name.into_boxed_str(),
         })))
     }
 
+    #[instrument(level = "debug", skip_all)]
     async fn send(
         &self,
         client: &(dyn MessagingClient0_3 + Send + Sync),
         topic: messaging0_3_0::types::Topic,
         message: messaging0_3_0::types::Message,
     ) -> anyhow::Result<Result<(), messaging0_3_0::types::Error>> {
+        self.ensure_messaging_v3()?;
         use wasmcloud_runtime::capability::wrpc::wasmcloud::messaging0_2_0 as messaging;
 
         let MessagingClient { name } = client
@@ -741,6 +748,7 @@ impl Messaging0_3 for Handler {
         }
     }
 
+    #[instrument(level = "debug", skip_all)]
     async fn request(
         &self,
         client: &(dyn MessagingClient0_3 + Send + Sync),
@@ -750,6 +758,7 @@ impl Messaging0_3 for Handler {
     ) -> anyhow::Result<
         Result<Vec<Box<dyn MessagingHostMessage0_3 + Send + Sync>>, messaging0_3_0::types::Error>,
     > {
+        self.ensure_messaging_v3()?;
         if options.is_some() {
             return Ok(Err(messaging0_3_0::types::Error::Other(
                 "`options` not currently supported".into(),
@@ -906,11 +915,13 @@ impl Messaging0_3 for Handler {
         }
     }
 
+    #[instrument(level = "debug", skip_all)]
     async fn reply(
         &self,
         reply_to: &messaging0_3_0::types::Message,
         message: messaging0_3_0::types::Message,
     ) -> anyhow::Result<Result<(), messaging0_3_0::types::Error>> {
+        self.ensure_messaging_v3()?;
         use wasmcloud_runtime::capability::wrpc::wasmcloud::messaging0_2_0 as messaging;
 
         {
@@ -1117,3 +1128,16 @@ impl InvocationErrorIntrospect for Handler {
         InvocationErrorKind::Trap
     }
 }
+
+impl Handler {
+    /// Helper function for our wasmcloud:messaging@v3 invocations to ensure the feature is enabled
+    /// before continuing with an invocation.
+    fn ensure_messaging_v3(&self) -> anyhow::Result<()> {
+        self.experimental_features
+            .wasmcloud_messaging_v3
+            .then(|| ())
+            .ok_or(anyhow!(
+                "wasmcloud-messaging-v3 feature flag is disabled, rejecting invocation"
+            ))
+    }
+}

crates/host/src/wasmbus/mod.rs

@@ -1385,6 +1385,7 @@ impl Host {
                 Arc::clone(links.entry(Arc::clone(&component_id)).or_default())
             },
             invocation_timeout: Duration::from_secs(10), // TODO: Make this configurable
+            experimental_features: self.experimental_features,
         };
         let component = wasmcloud_runtime::Component::new(&self.runtime, &wasm)?;
         let component = self

crates/test-util/src/host.rs

@@ -103,7 +103,8 @@ impl WasmCloudTestHost {
             secrets_topic_prefix,
             experimental_features: Features::new()
                 .enable_builtin_http_server()
-                .enable_builtin_messaging_nats(),
+                .enable_builtin_messaging_nats()
+                .enable_wasmcloud_messaging_v3(),
             ..Default::default()
         };
         if let Some(psc) = policy_service_config {