Skip to content

Commit

Permalink
Update propolis, simulated pantry
Browse files Browse the repository at this point in the history
Update propolis rev in Cargo.toml.
Update simulated pantry endpoints to match updated real pantry
  • Loading branch information
Alan Hanson committed Dec 1, 2023
1 parent eec28af commit 9cfdbcb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
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
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

0 comments on commit 9cfdbcb

Please sign in to comment.