fix(multitenant): filter consumers by multitenant status

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

chore: bump async-nats wasmcloud-control-interface

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

fix missing struct fields

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

Author: brooksmtownsend

Cargo.lock

@@ -24,7 +24,7 @@ _e2e_tests = []
 
 [dependencies]
 anyhow = "1"
-async-nats = "0.30"
+async-nats = "0.31"
 async-trait = "0.1"
 atty = { version = "0.2", optional = true }
 bytes = "1"
@@ -60,7 +60,7 @@ tracing-subscriber = { version = "0.3.7", features = [
 ], optional = true }
 uuid = "1"
 wasmbus-rpc = "0.14"
-wasmcloud-control-interface = "0.27"
+wasmcloud-control-interface = "0.28"
 semver = { version = "1.0.16", features = ["serde"] }
 
 [dev-dependencies]
@@ -69,7 +69,4 @@ serial_test = "1"
 [[bin]]
 name = "wadm"
 path = "bin/main.rs"
-required-features = ["cli"]
-
-[patch.crates-io]
-async-nats = { git = "https://github.com/brooksmtownsend/nats.rs", branch = "fix/jetstream-domain-purge", version = "0.30" }
+required-features = ["cli"]

Cargo.toml

@@ -250,6 +250,7 @@ async fn main() -> anyhow::Result<()> {
         permit_pool.clone(),
         event_stream,
         event_worker_creator.clone(),
+        args.multitenant,
     )
     .await;
 
@@ -260,6 +261,7 @@ async fn main() -> anyhow::Result<()> {
         permit_pool.clone(),
         command_stream,
         command_worker_creator.clone(),
+        args.multitenant,
     )
     .await;
 

bin/main.rs

@@ -111,6 +111,7 @@ impl<C> ConsumerManager<C> {
         permit_pool: Arc<Semaphore>,
         stream: NatsStream,
         worker_generator: F,
+        multitenant: bool,
     ) -> ConsumerManager<C>
     where
         W: Worker + Send + Sync + 'static,
@@ -150,6 +151,13 @@ impl<C> ConsumerManager<C> {
                     (Some(id), prefix) => (id, prefix),
                     (None, _) => return None,
                 };
+
+                // Don't create multitenant consumers if running in single tenant mode, and vice versa
+                if multitenant_prefix.is_some() != multitenant {
+                    trace!(%lattice_id, "Skipping consumer for lattice because multitenant doesn't match");
+                    return None;
+                }
+
                 // NOTE(thomastaylor312): It might be nicer for logs if we add an extra param for a
                 // friendly consumer manager name
                 trace!(%lattice_id, subject = %info.config.filter_subject, "Adding consumer for lattice");

src/consumers/manager.rs

@@ -1241,6 +1241,8 @@ mod test {
             (
                 host1_id.to_string(),
                 HostInventory {
+                    friendly_name: "my-host-1".to_string(),
+                    issuer: "my-issuer-1".to_string(),
                     actors: vec![
                         ActorDescription {
                             id: actor1.public_key.to_string(),
@@ -1306,6 +1308,8 @@ mod test {
             (
                 host2_id.to_string(),
                 HostInventory {
+                    friendly_name: "my-host-2".to_string(),
+                    issuer: "my-issuer-1".to_string(),
                     actors: vec![
                         ActorDescription {
                             id: actor1.public_key.to_string(),
@@ -1545,6 +1549,8 @@ mod test {
             (
                 host1_id.to_string(),
                 HostInventory {
+                    friendly_name: "my-host-3".to_string(),
+                    issuer: "my-issuer-2".to_string(),
                     actors: vec![ActorDescription {
                         id: actor2.public_key.to_string(),
                         image_ref: None,
@@ -1572,6 +1578,8 @@ mod test {
             (
                 host2_id.to_string(),
                 HostInventory {
+                    friendly_name: "my-host-4".to_string(),
+                    issuer: "my-issuer-2".to_string(),
                     actors: vec![ActorDescription {
                         id: actor2.public_key.to_string(),
                         image_ref: None,
@@ -1757,6 +1765,8 @@ mod test {
         *inventory.write().await = HashMap::from_iter([(
             host_id.to_string(),
             HostInventory {
+                friendly_name: "my-host-5".to_string(),
+                issuer: "my-issuer-3".to_string(),
                 actors: vec![
                     ActorDescription {
                         id: actor1_id.to_string(),
@@ -2021,6 +2031,8 @@ mod test {
         *inventory.write().await = HashMap::from_iter([(
             host_id.to_string(),
             HostInventory {
+                friendly_name: "my-host-6".to_string(),
+                issuer: "my-issuer-4".to_string(),
                 actors: vec![],
                 labels: HashMap::new(),
                 host_id: host_id.to_string(),
@@ -2137,6 +2149,8 @@ mod test {
         *inventory.write().await = HashMap::from_iter([(
             host_id.to_string(),
             HostInventory {
+                friendly_name: "my-host-7".to_string(),
+                issuer: "my-issuer-5".to_string(),
                 actors: vec![ActorDescription {
                     id: "jabba".to_string(),
                     image_ref: None,