diff --git a/Cargo.lock b/Cargo.lock index d21ff3cab3a..56557aed6f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -620,7 +620,7 @@ dependencies = [ [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=dc6f870f893a3da1b47877143e2bc9e3aef8113a#dc6f870f893a3da1b47877143e2bc9e3aef8113a" dependencies = [ "aes-gcm-siv", "anyhow", @@ -653,7 +653,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=dc6f870f893a3da1b47877143e2bc9e3aef8113a#dc6f870f893a3da1b47877143e2bc9e3aef8113a" dependencies = [ "anyhow", "chrono", @@ -668,7 +668,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=dc6f870f893a3da1b47877143e2bc9e3aef8113a#dc6f870f893a3da1b47877143e2bc9e3aef8113a" dependencies = [ "anyhow", "rusqlite", @@ -686,7 +686,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=dc6f870f893a3da1b47877143e2bc9e3aef8113a#dc6f870f893a3da1b47877143e2bc9e3aef8113a" dependencies = [ "anyhow", "bincode", @@ -700,7 +700,7 @@ dependencies = [ [[package]] name = "crucible-scope" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=257032d1e842901d427f344a396d78b9b85b183f#257032d1e842901d427f344a396d78b9b85b183f" +source = "git+https://github.com/oxidecomputer/crucible?rev=dc6f870f893a3da1b47877143e2bc9e3aef8113a#dc6f870f893a3da1b47877143e2bc9e3aef8113a" dependencies = [ "anyhow", "futures", @@ -3343,7 +3343,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=ec4f3a41a638ea6c3316a86f30f1895f4877f2ef#ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" +source = "git+https://github.com/oxidecomputer/propolis?rev=de0ac67e5e1e19a905e9a6e02da342dbbabf2d09#de0ac67e5e1e19a905e9a6e02da342dbbabf2d09" dependencies = [ "crucible", "reqwest", diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 95957b98ab0..23c512abf23 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -15,7 +15,7 @@ authz-macros = { path = "src/authz/authz-macros" } base64 = "0.13.0" bb8 = "0.8.0" cookie = "0.16" -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "dc6f870f893a3da1b47877143e2bc9e3aef8113a" } # Tracking pending 2.0 version. diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] } fatfs = "0.3.5" diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json index 36e51a24083..125b8697a80 100644 --- a/openapi/sled-agent.json +++ b/openapi/sled-agent.json @@ -1101,6 +1101,30 @@ "opts", "type" ] + }, + { + "type": "object", + "properties": { + "block_size": { + "type": "integer", + "format": "uint64", + "minimum": 0 + }, + "path": { + "type": "string" + }, + "type": { + "type": "string", + "enum": [ + "File" + ] + } + }, + "required": [ + "block_size", + "path", + "type" + ] } ] } diff --git a/package-manifest.toml b/package-manifest.toml index f67e4802fda..476147df524 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -84,10 +84,10 @@ zone = true # 3. Use type = "manual" instead of the "prebuilt" type = "prebuilt" repo = "crucible" -commit = "257032d1e842901d427f344a396d78b9b85b183f" +commit = "dc6f870f893a3da1b47877143e2bc9e3aef8113a" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -sha256 = "9f73687e4d883a7277af6655e77026188144ada144e4243c90cc139a9a9df6d7" +sha256 = "610f4dbe6f38c4f3bf2394a07ab05d5680d95d1528a19b796d21a91f748db06a" # Refer to # https://github.com/oxidecomputer/propolis/blob/master/package/README.md @@ -98,7 +98,7 @@ zone = true [external_package.propolis-server.source] type = "prebuilt" repo = "propolis" -commit = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" +commit = "de0ac67e5e1e19a905e9a6e02da342dbbabf2d09" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -sha256 = "fd3ac7cfa6659033051bb29ecc297240c519c5db339045f17ecccf594a266811" +sha256 = "65ee923b9b774089a346cd32f5b1c9fbe140b49d0d2da6febd7e238d9c8dccd7" diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 6848b96991b..9a3a6988787 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1.1" cfg-if = "1.0" chrono = { version = "0.4", features = [ "serde" ] } # Only used by the simulated sled agent. -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "257032d1e842901d427f344a396d78b9b85b183f" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "dc6f870f893a3da1b47877143e2bc9e3aef8113a" } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } futures = "0.3.21" ipnetwork = "0.18" @@ -23,7 +23,7 @@ omicron-common = { path = "../common" } p256 = "0.9.0" percent-encoding = "2.1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ec4f3a41a638ea6c3316a86f30f1895f4877f2ef" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "de0ac67e5e1e19a905e9a6e02da342dbbabf2d09" } rand = { version = "0.8.5", features = ["getrandom"] } reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] } schemars = { version = "0.8", features = [ "chrono", "uuid" ] }