From bbd08b5bbe972a8f816056f287748651d4162123 Mon Sep 17 00:00:00 2001 From: Benjamin Naecker Date: Thu, 15 Feb 2024 00:54:58 +0000 Subject: [PATCH] Update progenitor to bc0bb4b --- Cargo.lock | 52 +++++++++++++-------------- clients/dns-service-client/src/lib.rs | 3 +- common/src/api/external/error.rs | 3 +- sled-agent/src/instance.rs | 3 +- workspace-hack/Cargo.toml | 4 +-- 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e326abb2ac6..369f589d076 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1975,7 +1975,7 @@ dependencies = [ "hostname", "http 0.2.11", "hyper 0.14.27", - "indexmap 2.2.2", + "indexmap 2.2.3", "multer", "openapiv3", "paste", @@ -2778,7 +2778,7 @@ dependencies = [ "debug-ignore", "fixedbitset", "guppy-workspace-hack", - "indexmap 2.2.2", + "indexmap 2.2.3", "itertools 0.12.1", "nested", "once_cell", @@ -2810,7 +2810,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.11", - "indexmap 2.2.2", + "indexmap 2.2.3", "slab", "tokio", "tokio-util", @@ -3405,9 +3405,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -5370,7 +5370,7 @@ dependencies = [ "hex", "hmac", "hyper 0.14.27", - "indexmap 2.2.2", + "indexmap 2.2.3", "inout", "ipnetwork", "itertools 0.10.5", @@ -5495,7 +5495,7 @@ version = "0.4.0" source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#ef442ee4343e97b6d9c217d3e7533962fe7d7236" dependencies = [ "heck 0.4.1", - "indexmap 2.2.2", + "indexmap 2.2.3", "lazy_static", "openapiv3", "regex", @@ -5507,7 +5507,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "serde", "serde_json", ] @@ -5764,7 +5764,7 @@ dependencies = [ "expectorate", "futures", "highway", - "indexmap 2.2.2", + "indexmap 2.2.3", "itertools 0.12.1", "omicron-common", "omicron-test-utils", @@ -6139,7 +6139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.2", + "indexmap 2.2.3", "serde", "serde_derive", ] @@ -6501,7 +6501,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "progenitor-impl 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", @@ -6512,7 +6512,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", "progenitor-impl 0.5.0 (git+https://github.com/oxidecomputer/progenitor)", @@ -6523,7 +6523,7 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "bytes", "futures-core", @@ -6537,7 +6537,7 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "bytes", "futures-core", @@ -6551,12 +6551,12 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "getopts", "heck 0.4.1", "http 0.2.11", - "indexmap 2.2.2", + "indexmap 2.2.3", "openapiv3", "proc-macro2", "quote", @@ -6573,12 +6573,12 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "getopts", "heck 0.4.1", "http 0.2.11", - "indexmap 2.2.2", + "indexmap 2.2.3", "openapiv3", "proc-macro2", "quote", @@ -6595,7 +6595,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "openapiv3", "proc-macro2", @@ -6612,7 +6612,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.5.0" -source = "git+https://github.com/oxidecomputer/progenitor#86b60220b88a2ca3629fb87acf8f83ff35f63aaa" +source = "git+https://github.com/oxidecomputer/progenitor#bc0bb4b0fb40084f189eb1a8807b17fbd0ce0b64" dependencies = [ "openapiv3", "proc-macro2", @@ -7941,7 +7941,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.2", + "indexmap 2.2.3", "serde", "serde_json", "serde_with_macros", @@ -7966,7 +7966,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "itoa", "ryu", "serde", @@ -9347,7 +9347,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", @@ -9360,7 +9360,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", @@ -9879,7 +9879,7 @@ dependencies = [ "derive-where", "either", "futures", - "indexmap 2.2.2", + "indexmap 2.2.3", "indicatif", "libsw", "linear-map", @@ -10292,7 +10292,7 @@ dependencies = [ "crossterm", "futures", "humantime", - "indexmap 2.2.2", + "indexmap 2.2.3", "indicatif", "itertools 0.12.1", "omicron-common", diff --git a/clients/dns-service-client/src/lib.rs b/clients/dns-service-client/src/lib.rs index e437f1a7f63..52c2b8bcd20 100644 --- a/clients/dns-service-client/src/lib.rs +++ b/clients/dns-service-client/src/lib.rs @@ -32,7 +32,8 @@ pub fn is_retryable(error: &DnsConfigError) -> bool { | DnsConfigError::InvalidResponsePayload(_, _) | DnsConfigError::UnexpectedResponse(_) | DnsConfigError::InvalidUpgrade(_) - | DnsConfigError::ResponseBodyError(_) => return false, + | DnsConfigError::ResponseBodyError(_) + | DnsConfigError::PreHookError(_) => return false, DnsConfigError::ErrorResponse(response_value) => response_value, }; diff --git a/common/src/api/external/error.rs b/common/src/api/external/error.rs index d2e062f2e15..f7eb257e8f2 100644 --- a/common/src/api/external/error.rs +++ b/common/src/api/external/error.rs @@ -496,7 +496,8 @@ impl From> for Error { ) | progenitor::progenitor_client::Error::UnexpectedResponse(_) | progenitor::progenitor_client::Error::InvalidUpgrade(_) - | progenitor::progenitor_client::Error::ResponseBodyError(_) => { + | progenitor::progenitor_client::Error::ResponseBodyError(_) + | progenitor::progenitor_client::Error::PreHookError(_) => { Error::internal_error(&e.to_string()) } // This error represents an expected error from the remote service. diff --git a/sled-agent/src/instance.rs b/sled-agent/src/instance.rs index cb9347446bb..c0a9b152894 100644 --- a/sled-agent/src/instance.rs +++ b/sled-agent/src/instance.rs @@ -282,7 +282,8 @@ impl InstanceInner { | nexus_client::Error::InvalidResponsePayload(..) | nexus_client::Error::UnexpectedResponse(_) | nexus_client::Error::InvalidUpgrade(_) - | nexus_client::Error::ResponseBodyError(_) => { + | nexus_client::Error::ResponseBodyError(_) + | nexus_client::Error::PreHookError(_) => { BackoffError::permanent(Error::Notification( err, )) diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 686cc3f218c..a1f69054218 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -59,7 +59,7 @@ hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13.2" } hex = { version = "0.4.3", features = ["serde"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "0.14.27", features = ["full"] } -indexmap = { version = "2.2.2", features = ["serde"] } +indexmap = { version = "2.2.3", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } itertools = { version = "0.10.5" } @@ -167,7 +167,7 @@ hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13.2" } hex = { version = "0.4.3", features = ["serde"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "0.14.27", features = ["full"] } -indexmap = { version = "2.2.2", features = ["serde"] } +indexmap = { version = "2.2.3", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } itertools = { version = "0.10.5" }