Skip to content

Commit ac94fc0

Browse files
leftwoAlan Hanson
and
Alan Hanson
authored
Update Cargo.toml to match package-manifest for crucible (#4597)
Co-authored-by: Alan Hanson <[email protected]>
1 parent 92aed1a commit ac94fc0

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ cookie = "0.18"
171171
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
172172
crossbeam = "0.8"
173173
crossterm = { version = "0.27.0", features = ["event-stream"] }
174-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "51a3121c8318fc7ac97d74f917ce1d37962e785f" }
175-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "51a3121c8318fc7ac97d74f917ce1d37962e785f" }
176-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "51a3121c8318fc7ac97d74f917ce1d37962e785f" }
174+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
175+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
176+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
177177
curve25519-dalek = "4"
178178
datatest-stable = "0.2.3"
179179
display-error-chain = "0.2.0"
@@ -292,9 +292,9 @@ pretty-hex = "0.4.0"
292292
proc-macro2 = "1.0"
293293
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
294294
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
295-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "54398875a2125227d13827d4236dce943c019b1c" }
296-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "54398875a2125227d13827d4236dce943c019b1c" }
297-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "54398875a2125227d13827d4236dce943c019b1c" }
295+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "3e1d129151c3621d28ead5c6e5760693ba6e7fec" }
296+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "3e1d129151c3621d28ead5c6e5760693ba6e7fec" }
297+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "3e1d129151c3621d28ead5c6e5760693ba6e7fec" }
298298
proptest = "1.4.0"
299299
quote = "1.0"
300300
rand = "0.8.5"

sled-agent/src/sim/http_entrypoints_pantry.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ struct JobPollResponse {
9696
/// Poll to see if a Pantry background job is done
9797
#[endpoint {
9898
method = GET,
99-
path = "/crucible/pantry/0/job/{id}/is_finished",
99+
path = "/crucible/pantry/0/job/{id}/is-finished",
100100
}]
101101
async fn is_job_finished(
102102
rc: RequestContext<Arc<Pantry>>,
@@ -139,6 +139,7 @@ async fn job_result_ok(
139139
}
140140

141141
#[derive(Debug, Deserialize, JsonSchema)]
142+
#[serde(rename_all = "snake_case")]
142143
pub enum ExpectedDigest {
143144
Sha256(String),
144145
}
@@ -157,7 +158,7 @@ struct ImportFromUrlResponse {
157158
/// Import data from a URL into a volume
158159
#[endpoint {
159160
method = POST,
160-
path = "/crucible/pantry/0/volume/{id}/import_from_url",
161+
path = "/crucible/pantry/0/volume/{id}/import-from-url",
161162
}]
162163
async fn import_from_url(
163164
rc: RequestContext<Arc<Pantry>>,
@@ -213,7 +214,7 @@ struct BulkWriteRequest {
213214
/// Bulk write data into a volume at a specified offset
214215
#[endpoint {
215216
method = POST,
216-
path = "/crucible/pantry/0/volume/{id}/bulk_write",
217+
path = "/crucible/pantry/0/volume/{id}/bulk-write",
217218
}]
218219
async fn bulk_write(
219220
rc: RequestContext<Arc<Pantry>>,

0 commit comments

Comments
 (0)