diff --git a/Cargo.lock b/Cargo.lock index 7b3490a2dec..64c14e2be62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1358,9 +1358,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -5861,29 +5861,29 @@ dependencies = [ [[package]] name = "trust-dns-client" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d9ba1c6079f6f9b4664e482db1700bd53d2ee77b1c9752c1d7a66c0c8bda99" +checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" dependencies = [ "cfg-if 1.0.0", "data-encoding", "futures-channel", "futures-util", "lazy_static", - "log", "radix_trie", "rand 0.8.5", "thiserror", "time 0.3.9", "tokio", + "tracing", "trust-dns-proto", ] [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -5895,54 +5895,53 @@ dependencies = [ "idna", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", "thiserror", "tinyvec", "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if 1.0.0", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", "tokio", + "tracing", "trust-dns-proto", ] [[package]] name = "trust-dns-server" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a395a2e0fd8aac9b4613767a5b4ba4b2040de1b767fa03ace8c9d6f351d60b2d" +checksum = "1583cf9f8a359c9f16fdf760b79cb2be3f261b98db8027f81959c7a4f6645e2c" dependencies = [ "async-trait", "bytes", "cfg-if 1.0.0", "enum-as-inner", - "env_logger", "futures-executor", "futures-util", - "log", "serde", "thiserror", "time 0.3.9", "tokio", "toml", + "tracing", "trust-dns-client", "trust-dns-proto", ] diff --git a/internal-dns-client/Cargo.toml b/internal-dns-client/Cargo.toml index ff9bbcc6476..9340c4cffd8 100644 --- a/internal-dns-client/Cargo.toml +++ b/internal-dns-client/Cargo.toml @@ -13,8 +13,8 @@ serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" slog = { version = "2.5.0", features = [ "max_level_trace", "release_max_level_debug" ] } thiserror = "1.0" -trust-dns-proto = "0.21" -trust-dns-resolver = "0.21" +trust-dns-proto = "0.22" +trust-dns-resolver = "0.22" uuid = { version = "1.1.0", features = [ "v4", "serde" ] } [dev-dependencies] diff --git a/internal-dns/Cargo.toml b/internal-dns/Cargo.toml index e16ef4fef5f..c0c57844918 100644 --- a/internal-dns/Cargo.toml +++ b/internal-dns/Cargo.toml @@ -21,9 +21,9 @@ slog-envlogger = "2.2" tempdir = "0.3" tokio = { version = "1.20", features = [ "full" ] } toml = "0.5" -trust-dns-proto = "0.21" -trust-dns-server = "0.21" -trust-dns-client = "0.21" +trust-dns-proto = "0.22" +trust-dns-server = "0.22" +trust-dns-client = "0.22" [dev-dependencies] expectorate = "1.0.5" @@ -32,4 +32,4 @@ openapiv3 = "1.0" openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" } serde_json = "1.0" subprocess = "0.2.9" -trust-dns-resolver = "0.21" +trust-dns-resolver = "0.22" diff --git a/internal-dns/tests/basic_test.rs b/internal-dns/tests/basic_test.rs index 26410cad90b..6a919eea630 100644 --- a/internal-dns/tests/basic_test.rs +++ b/internal-dns/tests/basic_test.rs @@ -12,12 +12,12 @@ use internal_dns_client::{ Client, }; use omicron_test_utils::dev::test_setup_log; -use trust_dns_proto::op::response_code::ResponseCode; -use trust_dns_resolver::config::{ - NameServerConfig, Protocol, ResolverConfig, ResolverOpts, -}; use trust_dns_resolver::error::ResolveErrorKind; use trust_dns_resolver::TokioAsyncResolver; +use trust_dns_resolver::{ + config::{NameServerConfig, Protocol, ResolverConfig, ResolverOpts}, + proto::op::ResponseCode, +}; #[tokio::test] pub async fn aaaa_crud() -> Result<(), anyhow::Error> {