Skip to content
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

Update Cargo.toml to match package-manifest for crucible #4597

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Update Cargo.toml to match package-manifest for crucible #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eec28af
Update Cargo.toml to match package-manifest for crucible
Dec 1, 2023
9cfdbcb
Update propolis, simulated pantry
Dec 1, 2023
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
16 changes: 8 additions & 8 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.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ cookie = "0.18"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
crossterm = { version = "0.27.0", features = ["event-stream"] }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "51a3121c8318fc7ac97d74f917ce1d37962e785f" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "51a3121c8318fc7ac97d74f917ce1d37962e785f" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "51a3121c8318fc7ac97d74f917ce1d37962e785f" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
curve25519-dalek = "4"
datatest-stable = "0.2.3"
display-error-chain = "0.2.0"
Expand Down Expand Up @@ -292,9 +292,9 @@ pretty-hex = "0.4.0"
proc-macro2 = "1.0"
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "54398875a2125227d13827d4236dce943c019b1c" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "54398875a2125227d13827d4236dce943c019b1c" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "54398875a2125227d13827d4236dce943c019b1c" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "3e1d129151c3621d28ead5c6e5760693ba6e7fec" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "3e1d129151c3621d28ead5c6e5760693ba6e7fec" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "3e1d129151c3621d28ead5c6e5760693ba6e7fec" }
proptest = "1.4.0"
quote = "1.0"
rand = "0.8.5"
Expand Down
7 changes: 4 additions & 3 deletions sled-agent/src/sim/http_entrypoints_pantry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct JobPollResponse {
/// Poll to see if a Pantry background job is done
#[endpoint {
method = GET,
path = "/crucible/pantry/0/job/{id}/is_finished",
path = "/crucible/pantry/0/job/{id}/is-finished",
}]
async fn is_job_finished(
rc: RequestContext<Arc<Pantry>>,
Expand Down Expand Up @@ -139,6 +139,7 @@ async fn job_result_ok(
}

#[derive(Debug, Deserialize, JsonSchema)]
#[serde(rename_all = "snake_case")]
pub enum ExpectedDigest {
Sha256(String),
}
Expand All @@ -157,7 +158,7 @@ struct ImportFromUrlResponse {
/// Import data from a URL into a volume
#[endpoint {
method = POST,
path = "/crucible/pantry/0/volume/{id}/import_from_url",
path = "/crucible/pantry/0/volume/{id}/import-from-url",
}]
async fn import_from_url(
rc: RequestContext<Arc<Pantry>>,
Expand Down Expand Up @@ -213,7 +214,7 @@ struct BulkWriteRequest {
/// Bulk write data into a volume at a specified offset
#[endpoint {
method = POST,
path = "/crucible/pantry/0/volume/{id}/bulk_write",
path = "/crucible/pantry/0/volume/{id}/bulk-write",
}]
async fn bulk_write(
rc: RequestContext<Arc<Pantry>>,
Expand Down
Loading