Merge branch 'master' of github.com:oxidecomputer/qorb

Author: smklein

.github/workflows/rust.yml

@@ -13,21 +13,21 @@ jobs:
   check-style:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
     - name: Report rustfmt version
       run: cargo fmt -- --version
     - name: Check style
       run: cargo fmt -- --check
   build-docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
     - name: Test build documentation
       run: cargo doc
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
     - name: Build
       run: cargo build --workspace --verbose
     - name: Install latest nextest release
@@ -37,6 +37,6 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
     - name: Test Libraries
       run: cargo clippy --workspace --all-targets

Cargo.lock

@@ -21,7 +21,7 @@ serde_json = { version = "1.0" }
 thiserror = "1.0"
 tokio = { version = "1.38"}
 tokio-stream = { version = "0.1", features = [ "sync" ] }
-tokio-tungstenite = "0.23"
+tokio-tungstenite = "0.24"
 tracing = "0.1"
 crossterm = "0.28.1"
 hickory-client = { version = "0.24", default-features = false }

Cargo.toml

@@ -1,3 +1,4 @@
 //! Default implementations of [crate::resolver::Resolver]
 
 pub mod dns;
+pub mod single_host;

src/resolvers/mod.rs

@@ -0,0 +1,63 @@
+//! Implementation of [Resolver] that always returns an explicit address.
+
+use tokio::sync::watch;
+
+use crate::backend;
+use crate::resolver::{AllBackends, Resolver};
+
+use std::collections::BTreeMap;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+/// A [`Resolver`] that always returns a single address.
+#[derive(Clone, Debug)]
+pub struct SingleHostResolver {
+    tx: watch::Sender<AllBackends>,
+}
+
+const SINGLE_HOST_BACKEND_NAME: &str = "singleton";
+
+impl SingleHostResolver {
+    /// Construct a resolver to always return the provided address.
+    pub fn new(address: SocketAddr) -> Self {
+        let backends = Arc::new(BTreeMap::from([(
+            backend::Name::new(SINGLE_HOST_BACKEND_NAME),
+            backend::Backend { address },
+        )]));
+        let (tx, _rx) = watch::channel(backends.clone());
+        Self { tx }
+    }
+}
+
+impl Resolver for SingleHostResolver {
+    fn monitor(&mut self) -> watch::Receiver<AllBackends> {
+        self.tx.subscribe()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+    use crate::{
+        backend::Backend, resolver::Resolver as _, resolvers::single_host::SINGLE_HOST_BACKEND_NAME,
+    };
+
+    use super::SingleHostResolver;
+
+    #[test]
+    fn single_host_resolver_returns_address() {
+        let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 4444);
+        let mut res = SingleHostResolver::new(addr);
+        let rx = res.monitor();
+        let backends = rx.borrow();
+        assert_eq!(backends.len(), 1);
+        let Backend { address } = backends
+            .get(SINGLE_HOST_BACKEND_NAME)
+            .expect("Expected the single host backend name");
+        assert_eq!(
+            address, &addr,
+            "Single host resolver returned wrong address"
+        );
+    }
+}