From bc8897fa6c37dd2fa378bb07f90938b2dba008b0 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 | 61 +++++++++++---------------- 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 | 6 +-- 5 files changed, 33 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c97fe37de5b..2b6fe1b39ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -655,7 +655,7 @@ dependencies = [ "omicron-common", "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", @@ -1946,7 +1946,7 @@ dependencies = [ "progenitor-client 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "quote", "rand 0.8.5", - "regress 0.8.0", + "regress", "reqwest", "rustfmt-wrapper", "schemars", @@ -3368,7 +3368,7 @@ dependencies = [ "opte-ioctl", "oxide-vpc", "oxlog", - "regress 0.8.0", + "regress", "schemars", "serde", "serde_json", @@ -3504,7 +3504,7 @@ dependencies = [ "installinator-common", "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", @@ -4302,7 +4302,7 @@ dependencies = [ "omicron-passwords", "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", @@ -4872,7 +4872,7 @@ dependencies = [ "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "proptest", "rand 0.8.5", - "regress 0.8.0", + "regress", "reqwest", "schemars", "semver 1.0.21", @@ -5366,7 +5366,6 @@ dependencies = [ "generic-array", "getrandom 0.2.10", "group", - "hashbrown 0.13.2", "hashbrown 0.14.3", "hex", "hmac", @@ -5648,7 +5647,7 @@ dependencies = [ "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", "rand 0.8.5", - "regress 0.8.0", + "regress", "reqwest", "serde", "serde_json", @@ -6501,7 +6500,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 +6511,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 +6522,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 +6536,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,7 +6550,7 @@ 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", @@ -6573,7 +6572,7 @@ 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", @@ -6595,7 +6594,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 +6611,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", @@ -7052,16 +7051,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "regress" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed9969cad8051328011596bf549629f1b800cf1731e7964b1eef8dfc480d2c2" -dependencies = [ - "hashbrown 0.13.2", - "memchr", -] - [[package]] name = "regress" version = "0.8.0" @@ -8147,7 +8136,7 @@ dependencies = [ "omicron-common", "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", @@ -9010,18 +8999,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", @@ -9717,7 +9706,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "typify" version = "0.0.15" -source = "git+https://github.com/oxidecomputer/typify#1f97f167923f001818d461b1286f8a5242abf8b1" +source = "git+https://github.com/oxidecomputer/typify#ce009d6f83b620cbd0e3acdd9b9ea071018471d8" dependencies = [ "typify-impl", "typify-macro", @@ -9726,13 +9715,13 @@ dependencies = [ [[package]] name = "typify-impl" version = "0.0.15" -source = "git+https://github.com/oxidecomputer/typify#1f97f167923f001818d461b1286f8a5242abf8b1" +source = "git+https://github.com/oxidecomputer/typify#ce009d6f83b620cbd0e3acdd9b9ea071018471d8" dependencies = [ "heck 0.4.1", "log", "proc-macro2", "quote", - "regress 0.7.1", + "regress", "schemars", "serde_json", "syn 2.0.48", @@ -9743,7 +9732,7 @@ dependencies = [ [[package]] name = "typify-macro" version = "0.0.15" -source = "git+https://github.com/oxidecomputer/typify#1f97f167923f001818d461b1286f8a5242abf8b1" +source = "git+https://github.com/oxidecomputer/typify#ce009d6f83b620cbd0e3acdd9b9ea071018471d8" dependencies = [ "proc-macro2", "quote", @@ -10467,7 +10456,7 @@ dependencies = [ "ipnetwork", "omicron-workspace-hack", "progenitor 0.5.0 (git+https://github.com/oxidecomputer/progenitor?branch=main)", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", 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 1fdc47f94e9..b6bd11867f9 100644 --- a/sled-agent/src/instance.rs +++ b/sled-agent/src/instance.rs @@ -509,7 +509,8 @@ impl InstanceRunner { | 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 a52f63fec18..ecea09cbd1e 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -54,8 +54,7 @@ gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway- generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths", "zeroize"] } getrandom = { version = "0.2.10", default-features = false, features = ["js", "rdrand", "std"] } group = { version = "0.13.0", default-features = false, features = ["alloc"] } -hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.3", features = ["raw"] } -hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13.2" } +hashbrown = { version = "0.14.3", features = ["raw"] } hex = { version = "0.4.3", features = ["serde"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "0.14.27", features = ["full"] } @@ -161,8 +160,7 @@ gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway- generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths", "zeroize"] } getrandom = { version = "0.2.10", default-features = false, features = ["js", "rdrand", "std"] } group = { version = "0.13.0", default-features = false, features = ["alloc"] } -hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14.3", features = ["raw"] } -hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13.2" } +hashbrown = { version = "0.14.3", features = ["raw"] } hex = { version = "0.4.3", features = ["serde"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "0.14.27", features = ["full"] }