diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml index d171ac15b7..92f7af36d5 100644 --- a/.github/workflows/hakari.yml +++ b/.github/workflows/hakari.yml @@ -24,7 +24,7 @@ jobs: with: toolchain: stable - name: Install cargo-hakari - uses: taiki-e/install-action@af393be830303534bd94d7b3249fb7ed7792e7ad # v2 + uses: taiki-e/install-action@e17a4e247d4a36441181d7758c499d97e1e006bd # v2 with: tool: cargo-hakari - name: Check workspace-hack Cargo.toml is up-to-date diff --git a/Cargo.lock b/Cargo.lock index 423b93c8dc..4a90a9dce9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom 0.2.10", @@ -860,11 +860,11 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ - "smallvec 1.11.2", + "smallvec 1.13.1", "target-lexicon", ] @@ -2750,9 +2750,9 @@ dependencies = [ [[package]] name = "guppy" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114a100a9aa9f4c468a7b9e96626cdab267bb652660d8408e8f6d56d4c310edd" +checksum = "34e99a7734579b834a076ef11789783c153c6eb5fb3520ed15bc41f483f0f317" dependencies = [ "ahash", "camino", @@ -2770,7 +2770,7 @@ dependencies = [ "semver 1.0.21", "serde", "serde_json", - "smallvec 1.11.2", + "smallvec 1.13.1", "static_assertions", "target-spec", ] @@ -4577,7 +4577,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "smallvec 1.11.2", + "smallvec 1.13.1", ] [[package]] @@ -4674,7 +4674,7 @@ dependencies = [ "num-traits", "rand 0.8.5", "serde", - "smallvec 1.11.2", + "smallvec 1.13.1", "zeroize", ] @@ -5951,7 +5951,7 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.16", - "smallvec 1.11.2", + "smallvec 1.13.1", "winapi", ] @@ -5964,7 +5964,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall 0.3.5", - "smallvec 1.11.2", + "smallvec 1.13.1", "windows-targets 0.48.5", ] @@ -7805,9 +7805,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] @@ -7843,9 +7843,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -7959,9 +7959,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.5.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c" +checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" dependencies = [ "base64", "chrono", @@ -7976,9 +7976,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.5.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298" +checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15" dependencies = [ "darling 0.20.3", "proc-macro2", @@ -8359,9 +8359,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smawk" @@ -8863,15 +8863,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "target-spec" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b81540ee78bd9de9f7dca2378f264cf1f4193da6e2d09b54c0d595131a48f1" +checksum = "36a8e795b1824524d13cdf04f73cf8b4f244ce86c96b4d2a83a6ca1a753d2752" dependencies = [ "cfg-expr", "guppy-workspace-hack", @@ -9158,9 +9158,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -9499,7 +9499,7 @@ dependencies = [ "ipnet", "lazy_static", "rand 0.8.5", - "smallvec 1.11.2", + "smallvec 1.13.1", "thiserror", "tinyvec", "tokio", @@ -9520,7 +9520,7 @@ dependencies = [ "lru-cache", "parking_lot 0.12.1", "resolv-conf", - "smallvec 1.11.2", + "smallvec 1.13.1", "thiserror", "tokio", "tracing", diff --git a/Cargo.toml b/Cargo.toml index ca13ed82b0..8bb96afdea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -216,7 +216,7 @@ gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway- gateway-test-utils = { path = "gateway-test-utils" } gethostname = "0.4.3" glob = "0.3.1" -guppy = "0.17.4" +guppy = "0.17.5" headers = "0.3.9" heck = "0.4" hex = "0.4.3" @@ -345,7 +345,7 @@ serde_json = "1.0.113" serde_path_to_error = "0.1.15" serde_tokenstream = "0.2" serde_urlencoded = "0.7.1" -serde_with = "3.5.1" +serde_with = "3.6.0" sha2 = "0.10.8" sha3 = "0.10.8" shell-words = "1.1.0" @@ -390,7 +390,7 @@ textwrap = "0.16.0" test-strategy = "0.3.1" thiserror = "1.0" tofino = { git = "http://github.com/oxidecomputer/tofino", branch = "main" } -tokio = "1.35.1" +tokio = "1.36.0" tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] } tokio-stream = "0.1.14" tokio-tungstenite = "0.20" diff --git a/bootstore/src/schemes/v0/peer.rs b/bootstore/src/schemes/v0/peer.rs index 3d273e60eb..5290e64672 100644 --- a/bootstore/src/schemes/v0/peer.rs +++ b/bootstore/src/schemes/v0/peer.rs @@ -15,7 +15,7 @@ use crate::trust_quorum::RackSecret; use camino::Utf8PathBuf; use derive_more::From; use sled_hardware::Baseboard; -use slog::{debug, error, info, o, warn, Logger}; +use slog::{error, info, o, warn, Logger}; use std::collections::{BTreeMap, BTreeSet}; use std::net::{SocketAddr, SocketAddrV6}; use std::time::Duration; @@ -647,7 +647,7 @@ impl Node { .iter() .filter(|(id, _)| Some(*id) != excluded_peer) { - debug!( + info!( self.log, "Sending network config with generation {} to {id}", network_config.generation @@ -684,7 +684,7 @@ impl Node { if let Some(conn_handle) = self.established_connections.get(&envelope.to) { - debug!( + info!( self.log, "Sending {:?} to {}", envelope.msg, envelope.to ); @@ -924,6 +924,7 @@ impl Node { self.fsm.on_disconnected(&peer_id); } ConnToMainMsgInner::Received { from, msg } => { + info!(self.log, "Received {msg:?} from {from}"); match self.fsm.handle_msg(Instant::now().into(), from, msg) { Ok(None) => (), Ok(Some(api_output)) => { diff --git a/clients/ddm-admin-client/src/lib.rs b/clients/ddm-admin-client/src/lib.rs index c32345d1dc..c9dea15964 100644 --- a/clients/ddm-admin-client/src/lib.rs +++ b/clients/ddm-admin-client/src/lib.rs @@ -132,7 +132,6 @@ impl Client { interfaces: &'a [BootstrapInterface], ) -> Result + 'a, DdmError> { let prefixes = self.inner.get_prefixes().await?.into_inner(); - info!(self.log, "Received prefixes from ddmd"; "prefixes" => ?prefixes); Ok(prefixes.into_iter().flat_map(|(_, prefixes)| { prefixes.into_iter().flat_map(|prefix| { let mut segments = prefix.destination.addr.segments(); diff --git a/nexus/authz-macros/src/lib.rs b/nexus/authz-macros/src/lib.rs index 69e76833f0..0548113339 100644 --- a/nexus/authz-macros/src/lib.rs +++ b/nexus/authz-macros/src/lib.rs @@ -221,9 +221,9 @@ impl<'de> serde::Deserialize<'de> for InputPrimaryKeyType { { let mut elements = vec![]; while let Some(element) = - seq.next_element::()? + seq.next_element::>()? { - elements.push(element.0.into_external()); + elements.push(element.into_inner()); } Ok(PrimaryKeyType::Standard(parse_quote!((#(#elements,)*)))) } @@ -251,26 +251,6 @@ impl<'de> serde::Deserialize<'de> for InputPrimaryKeyType { } } -// impl syn::parse::Parse for PrimaryKey { -// fn parse(input: syn::parse::ParseStream) -> syn::Result { -// let lookahead = input.lookahead1(); -// // If the first element is a {, then this must be a uuid_kind. -// if lookahead.peek(syn::token::Brace) { -// let content; -// syn::braced!(content in input); -// // Once we have the content, we can parse it as a uuid_kind. -// let parsed = serde_tokenstream::from_tokenstream::( -// &content.cursor().token_stream(), -// )?; -// let kind_param = parsed.uuid_kind.into_inner(); -// let full_ty = parse_quote!(::newtype_uuid::TypedUuid::<::omicron_uuid_kinds::#kind_param>); -// Ok(Self::UuidKind { full_ty }) -// } else { -// Ok(Self::Standard(input.parse()?)) -// } -// } -// } - /// How to generate the Polar snippet for this resource #[derive(serde::Deserialize, Debug)] enum PolarSnippet { diff --git a/nexus/db-queries/src/authz/api_resources.rs b/nexus/db-queries/src/authz/api_resources.rs index 8249a1392e..70bc9ab2eb 100644 --- a/nexus/db-queries/src/authz/api_resources.rs +++ b/nexus/db-queries/src/authz/api_resources.rs @@ -869,7 +869,6 @@ authz_resource! { authz_resource! { name = "LoopbackAddress", parent = "Fleet", - // TODO: make it easier to specify the typed UUID kind primary_key = { uuid_kind = LoopbackAddressKind }, roles_allowed = false, polar_snippet = FleetChild, diff --git a/tools/console_version b/tools/console_version index e81fb1c03e..7f80546553 100644 --- a/tools/console_version +++ b/tools/console_version @@ -1,2 +1,2 @@ -COMMIT="5bee1f5b468b17b579a0dc0c5aee6a3056146b79" -SHA2="66e73112327db5f80e32d6865cf150320ae508985cef421459107713287ed4b8" +COMMIT="e5a1f804faa913de3be5b4cddac2011247a99774" +SHA2="54ff1026062fc1a3f0de86aa558d051b8ad6248d458c1767b9e926f2606e75f5" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index e606a19dd3..4e62ba13e3 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -14,7 +14,7 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] -ahash = { version = "0.8.6" } +ahash = { version = "0.8.7" } aho-corasick = { version = "1.0.4" } anyhow = { version = "1.0.75", features = ["backtrace"] } base16ct = { version = "0.2.0", default-features = false, features = ["alloc"] } @@ -90,7 +90,7 @@ reqwest = { version = "0.11.22", features = ["blocking", "json", "rustls-tls", " ring = { version = "0.17.7", features = ["std"] } schemars = { version = "0.8.16", features = ["bytes", "chrono", "uuid1"] } semver = { version = "1.0.21", features = ["serde"] } -serde = { version = "1.0.195", features = ["alloc", "derive", "rc"] } +serde = { version = "1.0.196", features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.113", features = ["raw_value", "unbounded_depth"] } sha2 = { version = "0.10.8", features = ["oid"] } similar = { version = "2.3.0", features = ["inline", "unicode"] } @@ -102,7 +102,7 @@ subtle = { version = "2.5.0" } syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.48", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3.27", features = ["formatting", "local-offset", "macros", "parsing"] } -tokio = { version = "1.35.1", features = ["full", "test-util"] } +tokio = { version = "1.36.0", features = ["full", "test-util"] } tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } tokio-stream = { version = "0.1.14", features = ["net"] } tokio-util = { version = "0.7.10", features = ["codec", "io-util"] } @@ -121,7 +121,7 @@ zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] } zip = { version = "0.6.6", default-features = false, features = ["bzip2", "deflate"] } [build-dependencies] -ahash = { version = "0.8.6" } +ahash = { version = "0.8.7" } aho-corasick = { version = "1.0.4" } anyhow = { version = "1.0.75", features = ["backtrace"] } base16ct = { version = "0.2.0", default-features = false, features = ["alloc"] } @@ -197,7 +197,7 @@ reqwest = { version = "0.11.22", features = ["blocking", "json", "rustls-tls", " ring = { version = "0.17.7", features = ["std"] } schemars = { version = "0.8.16", features = ["bytes", "chrono", "uuid1"] } semver = { version = "1.0.21", features = ["serde"] } -serde = { version = "1.0.195", features = ["alloc", "derive", "rc"] } +serde = { version = "1.0.196", features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.113", features = ["raw_value", "unbounded_depth"] } sha2 = { version = "0.10.8", features = ["oid"] } similar = { version = "2.3.0", features = ["inline", "unicode"] } @@ -210,7 +210,7 @@ syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extr syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.48", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3.27", features = ["formatting", "local-offset", "macros", "parsing"] } time-macros = { version = "0.2.13", default-features = false, features = ["formatting", "parsing"] } -tokio = { version = "1.35.1", features = ["full", "test-util"] } +tokio = { version = "1.36.0", features = ["full", "test-util"] } tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } tokio-stream = { version = "0.1.14", features = ["net"] } tokio-util = { version = "0.7.10", features = ["codec", "io-util"] } @@ -232,42 +232,42 @@ zip = { version = "0.6.6", default-features = false, features = ["bzip2", "defla bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } dof = { version = "0.3.0", default-features = false, features = ["des"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } [target.x86_64-unknown-linux-gnu.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } dof = { version = "0.3.0", default-features = false, features = ["des"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } [target.x86_64-apple-darwin.dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.8", default-features = false, features = ["std"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } [target.x86_64-apple-darwin.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.8", default-features = false, features = ["std"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } [target.aarch64-apple-darwin.dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.8", default-features = false, features = ["std"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } [target.aarch64-apple-darwin.build-dependencies] bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-features = false, features = ["std"] } errno = { version = "0.3.8", default-features = false, features = ["std"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } [target.x86_64-unknown-illumos.dependencies] @@ -275,7 +275,7 @@ bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-f dof = { version = "0.3.0", default-features = false, features = ["des"] } errno = { version = "0.3.8", default-features = false, features = ["std"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } toml_datetime = { version = "0.6.5", default-features = false, features = ["serde"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] } @@ -285,7 +285,7 @@ bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.4.0", default-f dof = { version = "0.3.0", default-features = false, features = ["des"] } errno = { version = "0.3.8", default-features = false, features = ["std"] } mio = { version = "0.8.9", features = ["net", "os-ext"] } -once_cell = { version = "1.19.0", features = ["unstable"] } +once_cell = { version = "1.19.0" } rustix = { version = "0.38.30", features = ["fs", "termios"] } toml_datetime = { version = "0.6.5", default-features = false, features = ["serde"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }