Skip to content

Commit

Permalink
[spr] initial version
Browse files Browse the repository at this point in the history 
Created using spr 1.3.6-beta.1
  • Loading branch information
@sunshowers
sunshowers committed Jan 10, 2025
1 parent d9a6a8b commit 801f230
Show file tree
Hide file tree
Showing 8 changed files with 367 additions and 246 deletions.
541 changes: 328 additions & 213 deletions Cargo.lock
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ cookie = "0.18"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
crossterm = { version = "0.28.1", features = ["event-stream"] }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c9d31d2f84ff5b59dfb1cf5358d8af657ab9b5e9" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c9d31d2f84ff5b59dfb1cf5358d8af657ab9b5e9" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "c9d31d2f84ff5b59dfb1cf5358d8af657ab9b5e9" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "c9d31d2f84ff5b59dfb1cf5358d8af657ab9b5e9" }
csv = "1.3.0"
curve25519-dalek = "4"
datatest-stable = "0.2.9"
Expand Down Expand Up @@ -546,12 +546,12 @@ pretty_assertions = "1.4.1"
pretty-hex = "0.4.1"
prettyplease = { version = "0.2.25", features = ["verbatim"] }
proc-macro2 = "1.0"
progenitor = "0.8.0"
progenitor-client = "0.8.0"
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
progenitor = "0.9.1"
progenitor-client = "0.9.1"
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "188fabe15db3e8db8095db55388f47f9c696f3c6" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "188fabe15db3e8db8095db55388f47f9c696f3c6" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "188fabe15db3e8db8095db55388f47f9c696f3c6" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "188fabe15db3e8db8095db55388f47f9c696f3c6" }
proptest = "1.5.0"
qorb = "0.2.1"
quote = "1.0"
Expand Down
3 changes: 2 additions & 1 deletion clients/dns-service-client/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ pub fn is_retryable(error: &DnsError) -> bool {
| DnsError::UnexpectedResponse(_)
| DnsError::InvalidUpgrade(_)
| DnsError::ResponseBodyError(_)
| DnsError::PreHookError(_) => return false,
| DnsError::PreHookError(_)
| DnsError::PostHookError(_) => return false,
DnsError::ErrorResponse(response_value) => response_value,
};

Expand Down
2 changes: 2 additions & 0 deletions clients/dpd-client/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// That test passes for code that lives in omicron, but fails for code imported
// by omicron.
#![allow(rustdoc::broken_intra_doc_links)]
// Temporary workaround while Rust is being updated to 1.84.
#![allow(unknown_lints)]

use std::net::IpAddr;

Expand Down
1 change: 1 addition & 0 deletions clients/oxide-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ hickory-resolver.workspace = true
http.workspace = true
hyper.workspace = true
progenitor.workspace = true
progenitor-client.workspace = true
rand.workspace = true
regress.workspace = true
reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
Expand Down
3 changes: 2 additions & 1 deletion common/src/api/external/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,8 @@ impl<T: ClientError> From<progenitor_client::Error<T>> for Error {
| progenitor_client::Error::UnexpectedResponse(_)
| progenitor_client::Error::InvalidUpgrade(_)
| progenitor_client::Error::ResponseBodyError(_)
| progenitor_client::Error::PreHookError(_) => {
| progenitor_client::Error::PreHookError(_)
| progenitor_client::Error::PostHookError(_) => {
Error::internal_error(&e.to_string())
}
// This error represents an expected error from the remote service.
Expand Down
3 changes: 2 additions & 1 deletion sled-agent/src/instance.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,8 @@ impl InstanceRunner {
| nexus_client::Error::UnexpectedResponse(_)
| nexus_client::Error::InvalidUpgrade(_)
| nexus_client::Error::ResponseBodyError(_)
| nexus_client::Error::PreHookError(_) => {
| nexus_client::Error::PreHookError(_)
| nexus_client::Error::PostHookError(_) => {
BackoffError::permanent(Error::Notification(
err,
))
Expand Down
40 changes: 20 additions & 20 deletions workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1.3.2" }
bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.6.0", default-features = false, features = ["serde", "std"] }
bstr = { version = "1.10.0" }
byteorder = { version = "1.5.0" }
bytes = { version = "1.8.0", features = ["serde"] }
bytes = { version = "1.9.0", features = ["serde"] }
chrono = { version = "0.4.38", features = ["serde"] }
cipher = { version = "0.4.4", default-features = false, features = ["block-padding", "zeroize"] }
clap = { version = "4.5.21", features = ["cargo", "derive", "env", "wrap_help"] }
Expand Down Expand Up @@ -63,14 +63,14 @@ generic-array = { version = "0.14.7", default-features = false, features = ["mor
getrandom = { version = "0.2.15", default-features = false, features = ["js", "rdrand", "std"] }
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
hashbrown = { version = "0.15.1" }
heck = { version = "0.4.1" }
hex = { version = "0.4.3", features = ["serde"] }
hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.5.0", features = ["full"] }
indexmap = { version = "2.6.0", features = ["serde"] }
indexmap = { version = "2.7.0", features = ["serde"] }
inout = { version = "0.1.3", default-features = false, features = ["std"] }
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
itertools = { version = "0.10.5" }
lalrpop-util = { version = "0.19.12" }
lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
libc = { version = "0.2.162", features = ["extra_traits"] }
Expand All @@ -93,9 +93,9 @@ phf_shared = { version = "0.11.2" }
pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption", "pem", "std"] }
postgres-types = { version = "0.2.8", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
predicates = { version = "3.1.2" }
proc-macro2 = { version = "1.0.89" }
proc-macro2 = { version = "1.0.92" }
qorb = { version = "0.2.1", features = ["qtop"] }
quote = { version = "1.0.37" }
quote = { version = "1.0.38" }
rand = { version = "0.8.5", features = ["small_rng"] }
regex = { version = "1.11.1" }
regex-automata = { version = "0.4.8", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
Expand All @@ -106,9 +106,9 @@ rustls = { version = "0.23.19", features = ["ring"] }
rustls-webpki = { version = "0.102.8", default-features = false, features = ["aws_lc_rs", "ring", "std"] }
schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
scopeguard = { version = "1.2.0" }
semver = { version = "1.0.23", features = ["serde"] }
serde = { version = "1.0.215", features = ["alloc", "derive", "rc"] }
serde_json = { version = "1.0.133", features = ["raw_value", "unbounded_depth"] }
semver = { version = "1.0.24", features = ["serde"] }
serde = { version = "1.0.217", features = ["alloc", "derive", "rc"] }
serde_json = { version = "1.0.135", features = ["raw_value", "unbounded_depth"] }
sha1 = { version = "0.10.6", features = ["oid"] }
sha2 = { version = "0.10.8", features = ["oid"] }
similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
Expand All @@ -117,7 +117,7 @@ smallvec = { version = "1.13.2", default-features = false, features = ["const_ne
spin = { version = "0.9.8" }
string_cache = { version = "0.8.7" }
subtle = { version = "2.6.1" }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.87", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.96", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
tokio = { version = "1.40.0", features = ["full", "test-util"] }
tokio-postgres = { version = "0.7.12", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
Expand Down Expand Up @@ -151,7 +151,7 @@ bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1.3.2" }
bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.6.0", default-features = false, features = ["serde", "std"] }
bstr = { version = "1.10.0" }
byteorder = { version = "1.5.0" }
bytes = { version = "1.8.0", features = ["serde"] }
bytes = { version = "1.9.0", features = ["serde"] }
cc = { version = "1.1.30", default-features = false, features = ["parallel"] }
chrono = { version = "0.4.38", features = ["serde"] }
cipher = { version = "0.4.4", default-features = false, features = ["block-padding", "zeroize"] }
Expand Down Expand Up @@ -184,14 +184,14 @@ generic-array = { version = "0.14.7", default-features = false, features = ["mor
getrandom = { version = "0.2.15", default-features = false, features = ["js", "rdrand", "std"] }
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
hashbrown = { version = "0.15.1" }
heck = { version = "0.4.1" }
hex = { version = "0.4.3", features = ["serde"] }
hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.5.0", features = ["full"] }
indexmap = { version = "2.6.0", features = ["serde"] }
indexmap = { version = "2.7.0", features = ["serde"] }
inout = { version = "0.1.3", default-features = false, features = ["std"] }
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
itertools = { version = "0.10.5" }
lalrpop-util = { version = "0.19.12" }
lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
libc = { version = "0.2.162", features = ["extra_traits"] }
Expand All @@ -214,9 +214,9 @@ phf_shared = { version = "0.11.2" }
pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption", "pem", "std"] }
postgres-types = { version = "0.2.8", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
predicates = { version = "3.1.2" }
proc-macro2 = { version = "1.0.89" }
proc-macro2 = { version = "1.0.92" }
qorb = { version = "0.2.1", features = ["qtop"] }
quote = { version = "1.0.37" }
quote = { version = "1.0.38" }
rand = { version = "0.8.5", features = ["small_rng"] }
regex = { version = "1.11.1" }
regex-automata = { version = "0.4.8", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
Expand All @@ -227,9 +227,9 @@ rustls = { version = "0.23.19", features = ["ring"] }
rustls-webpki = { version = "0.102.8", default-features = false, features = ["aws_lc_rs", "ring", "std"] }
schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
scopeguard = { version = "1.2.0" }
semver = { version = "1.0.23", features = ["serde"] }
serde = { version = "1.0.215", features = ["alloc", "derive", "rc"] }
serde_json = { version = "1.0.133", features = ["raw_value", "unbounded_depth"] }
semver = { version = "1.0.24", features = ["serde"] }
serde = { version = "1.0.217", features = ["alloc", "derive", "rc"] }
serde_json = { version = "1.0.135", features = ["raw_value", "unbounded_depth"] }
sha1 = { version = "0.10.6", features = ["oid"] }
sha2 = { version = "0.10.8", features = ["oid"] }
similar = { version = "2.6.0", features = ["bytes", "inline", "unicode"] }
Expand All @@ -239,7 +239,7 @@ spin = { version = "0.9.8" }
string_cache = { version = "0.8.7" }
subtle = { version = "2.6.1" }
syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.87", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.96", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
tokio = { version = "1.40.0", features = ["full", "test-util"] }
Expand Down

0 comments on commit 801f230

Please sign in to comment.