From 8b897cc8868e57204c0f0ee299b098b72f1f7a72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 11:43:09 +0000 Subject: [PATCH 1/2] Bump trust-dns-resolver from 0.21.2 to 0.22.0 Bumps [trust-dns-resolver](https://github.com/bluejekyll/trust-dns) from 0.21.2 to 0.22.0. - [Release notes](https://github.com/bluejekyll/trust-dns/releases) - [Changelog](https://github.com/bluejekyll/trust-dns/blob/main/CHANGELOG.md) - [Commits](https://github.com/bluejekyll/trust-dns/compare/v0.21.2...v0.22.0) --- updated-dependencies: - dependency-name: trust-dns-resolver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 57 ++++++++++++++++++++++++++++------ internal-dns-client/Cargo.toml | 2 +- internal-dns/Cargo.toml | 2 +- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7b3490a2dec..c73f4e0c9d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1368,6 +1368,18 @@ dependencies = [ "syn", ] +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "env_logger" version = "0.9.0" @@ -2238,7 +2250,7 @@ dependencies = [ "tokio", "toml", "trust-dns-client", - "trust-dns-proto", + "trust-dns-proto 0.21.2", "trust-dns-resolver", "trust-dns-server", ] @@ -2261,7 +2273,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.21.2", "trust-dns-resolver", "uuid", ] @@ -5876,7 +5888,7 @@ dependencies = [ "thiserror", "time 0.3.9", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.21.2", ] [[package]] @@ -5888,7 +5900,7 @@ dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.4.0", "futures-channel", "futures-io", "futures-util", @@ -5904,24 +5916,49 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner 0.5.1", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "lazy_static", + "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", - "trust-dns-proto", + "tracing", + "trust-dns-proto 0.22.0", ] [[package]] @@ -5933,7 +5970,7 @@ dependencies = [ "async-trait", "bytes", "cfg-if 1.0.0", - "enum-as-inner", + "enum-as-inner 0.4.0", "env_logger", "futures-executor", "futures-util", @@ -5944,7 +5981,7 @@ dependencies = [ "tokio", "toml", "trust-dns-client", - "trust-dns-proto", + "trust-dns-proto 0.21.2", ] [[package]] diff --git a/internal-dns-client/Cargo.toml b/internal-dns-client/Cargo.toml index ff9bbcc6476..5652cae30b5 100644 --- a/internal-dns-client/Cargo.toml +++ b/internal-dns-client/Cargo.toml @@ -14,7 +14,7 @@ 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-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..1199a61a858 100644 --- a/internal-dns/Cargo.toml +++ b/internal-dns/Cargo.toml @@ -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" From 9fb8318780c0a3ece31e1ddae124cfd939d199e9 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 6 Sep 2022 12:07:08 -0700 Subject: [PATCH 2/2] update all trust-dns-* --- Cargo.lock | 64 +++++++------------------------- internal-dns-client/Cargo.toml | 2 +- internal-dns/Cargo.toml | 6 +-- internal-dns/tests/basic_test.rs | 8 ++-- 4 files changed, 21 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c73f4e0c9d5..64c14e2be62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1356,18 +1356,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" -[[package]] -name = "enum-as-inner" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" -dependencies = [ - "heck 0.4.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "enum-as-inner" version = "0.5.1" @@ -2250,7 +2238,7 @@ dependencies = [ "tokio", "toml", "trust-dns-client", - "trust-dns-proto 0.21.2", + "trust-dns-proto", "trust-dns-resolver", "trust-dns-server", ] @@ -2273,7 +2261,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "trust-dns-proto 0.21.2", + "trust-dns-proto", "trust-dns-resolver", "uuid", ] @@ -5873,47 +5861,22 @@ 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", - "trust-dns-proto 0.21.2", -] - -[[package]] -name = "trust-dns-proto" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "data-encoding", - "enum-as-inner 0.4.0", - "futures-channel", - "futures-io", - "futures-util", - "idna", - "ipnet", - "lazy_static", - "log", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "url", + "tracing", + "trust-dns-proto", ] [[package]] @@ -5925,7 +5888,7 @@ dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner 0.5.1", + "enum-as-inner", "futures-channel", "futures-io", "futures-util", @@ -5958,30 +5921,29 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto 0.22.0", + "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 0.4.0", - "env_logger", + "enum-as-inner", "futures-executor", "futures-util", - "log", "serde", "thiserror", "time 0.3.9", "tokio", "toml", + "tracing", "trust-dns-client", - "trust-dns-proto 0.21.2", + "trust-dns-proto", ] [[package]] diff --git a/internal-dns-client/Cargo.toml b/internal-dns-client/Cargo.toml index 5652cae30b5..9340c4cffd8 100644 --- a/internal-dns-client/Cargo.toml +++ b/internal-dns-client/Cargo.toml @@ -13,7 +13,7 @@ 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-proto = "0.22" trust-dns-resolver = "0.22" uuid = { version = "1.1.0", features = [ "v4", "serde" ] } diff --git a/internal-dns/Cargo.toml b/internal-dns/Cargo.toml index 1199a61a858..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" 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> {