diff --git a/Cargo.lock b/Cargo.lock index a54d03e52a..11ad0bd6a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -569,6 +569,21 @@ dependencies = [ "constant_time_eq 0.2.6", ] +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq 0.3.0", + "memmap2", + "rayon", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -4027,6 +4042,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.7.1" @@ -5370,15 +5394,19 @@ dependencies = [ [[package]] name = "omicron-zone-package" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfd257b7067e7a6aa9fba896a89b0f625bac7660213bb830db36e543bd3cdb8" +checksum = "e75ad9eb79bb6a1ec78d2eecf36c67fffcf56264d779c456c6e2cd4b257ee9fe" dependencies = [ "anyhow", "async-trait", + "blake3", + "camino", + "camino-tempfile", "chrono", "filetime", "flate2", + "futures", "futures-util", "hex", "reqwest", @@ -5386,8 +5414,9 @@ dependencies = [ "semver 1.0.21", "serde", "serde_derive", + "serde_json", + "slog", "tar", - "tempfile", "thiserror", "tokio", "toml 0.7.8", diff --git a/Cargo.toml b/Cargo.toml index 600fbf185c..640a036be4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -269,7 +269,7 @@ omicron-package = { path = "package" } omicron-rpaths = { path = "rpaths" } omicron-sled-agent = { path = "sled-agent" } omicron-test-utils = { path = "test-utils" } -omicron-zone-package = "0.10.1" +omicron-zone-package = "0.11.0" oxide-client = { path = "clients/oxide-client" } oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "1d29ef60a18179babfb44f0f7a3c2fe71034a2c1", features = [ "api", "std" ] } once_cell = "1.19.0"