Skip to content

pull in async trait from & account for repo reorg in dice-util #11674

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

Open
flihp wants to merge 6 commits into
base: main
Choose a base branch
from
Open

pull in async trait from & account for repo reorg in dice-util #11674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7824af
sled-agent: Add 2 tests for communication with the RoT API
flihp Oct 10, 2026
90354d6
sled-agent: update dice-util deps to 4a39ef08 to get async Attest trait
flihp Oct 14, 2026
dc3efe2
sled-agent: update dice-utils & account for moved / renamed types
flihp Nov 2, 2026
bd5f39c
Use `const` for params to sprockets_tls_test_utils functions.
flihp Nov 3, 2026
2f2202d
Fix up comment that refers to old / out dated types
flihp Nov 4, 2026
1bdf791
Fix string passed to `test_setup_log` for each rot test
flihp Nov 4, 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
114 changes: 99 additions & 15 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.

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ assert_cmd = "2.0.17"
async-bb8-diesel = "0.2"
async-recursion = "1.1.1"
async-trait = "0.1.89"
attest-mock = { git = "https://github.com/oxidecomputer/dice-util", rev = "4a39ef08d81e5177edee0bddb1146032aa21074d" }
attest-mock = { git = "https://github.com/oxidecomputer/dice-util", rev = "994c3fcdb7e3897283f5082a892b67db397c0738" }
atomicwrites = "0.4.4"
authz-macros = { path = "nexus/authz-macros" }
backoff = { version = "0.4.0", features = [ "tokio" ] }
Expand Down Expand Up @@ -522,7 +522,7 @@ debug-ignore = "1.0.5"
derive_more = "0.99.20"
derive-where = "1.5.0"
dev-tools-common = { path = "dev-tools/common" }
dice-verifier = { git = "https://github.com/oxidecomputer/dice-util", rev = "ff9f27aa0d6ef6fb64c349890b6e3c242ea3d8fc", default-features = false }
dice-verifier = { git = "https://github.com/oxidecomputer/dice-util", rev = "994c3fcdb7e3897283f5082a892b67db397c0738", default-features = false }
# Having the i-implement-... feature here makes diesel go away from the workspace-hack
diesel = { version = "2.3.7", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
diesel-dtrace = "0.5.0"
Expand Down Expand Up @@ -715,6 +715,7 @@ 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-rot = { git = "https://github.com/oxidecomputer/dice-util", rev = "994c3fcdb7e3897283f5082a892b67db397c0738", default-features = false }
oxide-update-engine = "0.1.2"
oxide-update-engine-types = { version = "0.1.2", features = ["schemars08"] }
oxide-update-engine-display = "0.1.2"
Expand Down
5 changes: 4 additions & 1 deletion sled-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ chrono.workspace = true
clap.workspace = true
clickhouse-admin-types.workspace = true
derive_more.workspace = true
dice-verifier = { workspace = true, features = ["ipcc", "mock"] }
display-error-chain.workspace = true
dropshot.workspace = true
flate2.workspace = true
Expand Down Expand Up @@ -63,6 +62,7 @@ omicron-ledger.workspace = true
omicron-ddm-admin-client.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
oxide-rot = { workspace = true, features = ["ipcc", "mock"] }
oxide-tokio-rt.workspace = true
oximeter.workspace = true
oximeter-instruments.workspace = true
Expand Down Expand Up @@ -142,6 +142,8 @@ opte-ioctl.workspace = true

[dev-dependencies]
assert_matches.workspace = true
attest-mock.workspace = true
dice-verifier.workspace = true
expectorate.workspace = true
guppy.workspace = true
hex-literal.workspace = true
Expand All @@ -156,6 +158,7 @@ reqwest = { workspace = true, features = ["blocking"] }
subprocess.workspace = true
slog-async.workspace = true
slog-term.workspace = true
sprockets-tls-test-utils.workspace = true
test-strategy.workspace = true
tokio-stream.workspace = true
tokio-util.workspace = true
Expand Down
Loading
Loading