Skip to content

[20/n] [wicketd] make GetInventoryError::InvalidSpIdentifier carry the id #10885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunshowers merged 3 commits into from
Jul 23, 2026
+36 −20
Merged

[20/n] [wicketd] make GetInventoryError::InvalidSpIdentifier carry the id #10885

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe84bd2
[spr] changes to main this commit is based on
sunshowers Jul 21, 2026
61cb302
[spr] initial version
sunshowers Jul 21, 2026
7963884
rebase on main
sunshowers Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 75 additions & 52 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ members = [
"trust-quorum/types/versions",
"typed-rng",
"update-common",
"update-engine",
"uuid-kinds",
"wicket-common",
"wicket-dbg",
Expand Down Expand Up @@ -371,7 +370,6 @@ default-members = [
"test-utils",
"typed-rng",
"update-common",
"update-engine",
"uuid-kinds",
"wicket-common",
"wicket-dbg",
Expand Down Expand Up @@ -690,6 +688,9 @@ omicron-workspace-hack = "0.1.0"
omicron-zone-package = "0.12.3"
oxide-client = { path = "clients/oxide-client" }
oxide-tokio-rt = "0.1.4"
oxide-update-engine = "0.1.2"
oxide-update-engine-types = { version = "0.1.2", features = ["schemars08"] }
oxide-update-engine-display = "0.1.2"
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "ab2941cdf2ab067429a4a68ab2389d2960620b57", features = [ "api", "std" ] }
oxlog = { path = "dev-tools/oxlog" }
oxnet = "0.1.5"
Expand Down Expand Up @@ -883,7 +884,6 @@ typed-rng = { path = "typed-rng" }
typify = "0.3.0"
unicode-width = "0.1.13"
update-common = { path = "update-common" }
update-engine = { path = "update-engine" }
url = "2.5.4"
usdt = "0.5.0"
uuid = { version = "1.17.0", features = ["serde", "v4"] }
Expand Down
2 changes: 1 addition & 1 deletion clients/installinator-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
slog.workspace = true
update-engine.workspace = true
oxide-update-engine-types.workspace = true
omicron-workspace-hack.workspace = true
6 changes: 3 additions & 3 deletions clients/installinator-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ progenitor::generate_api!(
},
replace = {
Duration = std::time::Duration,
EventReportForGenericSpec = update_engine::events::EventReport<update_engine::NestedSpec>,
EventReportForGenericSpec = oxide_update_engine_types::events::EventReport<oxide_update_engine_types::spec::GenericSpec>,
M2Slot = omicron_common::disk::M2Slot,
ProgressEventForGenericSpec = update_engine::events::ProgressEvent<update_engine::NestedSpec>,
StepEventForGenericSpec = update_engine::events::StepEvent<update_engine::NestedSpec>,
ProgressEventForGenericSpec = oxide_update_engine_types::events::ProgressEvent<oxide_update_engine_types::spec::GenericSpec>,
StepEventForGenericSpec = oxide_update_engine_types::events::StepEvent<oxide_update_engine_types::spec::GenericSpec>,
}
);

Expand Down
2 changes: 1 addition & 1 deletion clients/wicketd-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ serde_json.workspace = true
sled-agent-types.workspace = true
sled-hardware-types.workspace = true
slog.workspace = true
update-engine.workspace = true
oxide-update-engine-types.workspace = true
uuid.workspace = true
wicket-common.workspace = true
wicketd-commission-types-versions.workspace = true
Loading
Loading