From 83932a0d6faa20fb5f69a9c53b003185f9f93bb9 Mon Sep 17 00:00:00 2001
From: Alan Hanson <alan@oxide.computer>
Date: Sat, 15 Jul 2023 14:54:17 +0000
Subject: [PATCH] Update Crucible and Propolis to latest

Crucible:
Add quota to agent created datasets (#835)
Switch to building on heliosv2 (#830)
Minor clippy cleanup (#832)
Update to latest dropshot (#829)

Propolis:
The above crucible changes
Switch to building on heliosv2 (#461)
clean up cargo check/clippy errors when built with Rust 1.71 (#462)
Add some VMM_DESTROY_VM polish to bhyve-api
---
 Cargo.lock            | 44 ++++++++++++++++---------------------------
 Cargo.toml            | 15 ++++++++-------
 package-manifest.toml | 12 ++++++------
 3 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa134a78ea..db88af63b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -448,7 +448,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "bhyve_api_sys",
  "libc",
@@ -458,7 +458,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "libc",
  "num_enum",
@@ -1338,7 +1338,7 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=c574ff1232aa66eb60069795fe45f0c47f5da51d#c574ff1232aa66eb60069795fe45f0c47f5da51d"
+source = "git+https://github.com/oxidecomputer/crucible?rev=179e68b8718d24673893dac46a8ab4a9249ec318#179e68b8718d24673893dac46a8ab4a9249ec318"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1353,19 +1353,7 @@ dependencies = [
 [[package]]
 name = "crucible-client-types"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=c574ff1232aa66eb60069795fe45f0c47f5da51d#c574ff1232aa66eb60069795fe45f0c47f5da51d"
-dependencies = [
- "base64 0.21.2",
- "schemars",
- "serde",
- "serde_json",
- "uuid",
-]
-
-[[package]]
-name = "crucible-client-types"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=f78832dc7ca48bce53f23de00d557bc9320a933f#f78832dc7ca48bce53f23de00d557bc9320a933f"
+source = "git+https://github.com/oxidecomputer/crucible?rev=179e68b8718d24673893dac46a8ab4a9249ec318#179e68b8718d24673893dac46a8ab4a9249ec318"
 dependencies = [
  "base64 0.21.2",
  "schemars",
@@ -1377,7 +1365,7 @@ dependencies = [
 [[package]]
 name = "crucible-pantry-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=c574ff1232aa66eb60069795fe45f0c47f5da51d#c574ff1232aa66eb60069795fe45f0c47f5da51d"
+source = "git+https://github.com/oxidecomputer/crucible?rev=179e68b8718d24673893dac46a8ab4a9249ec318#179e68b8718d24673893dac46a8ab4a9249ec318"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1393,7 +1381,7 @@ dependencies = [
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=c574ff1232aa66eb60069795fe45f0c47f5da51d#c574ff1232aa66eb60069795fe45f0c47f5da51d"
+source = "git+https://github.com/oxidecomputer/crucible?rev=179e68b8718d24673893dac46a8ab4a9249ec318#179e68b8718d24673893dac46a8ab4a9249ec318"
 dependencies = [
  "libc",
  "num-derive",
@@ -1878,7 +1866,7 @@ checksum = "7e1a8646b2c125eeb9a84ef0faa6d2d102ea0d5da60b824ade2743263117b848"
 [[package]]
 name = "dladm"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "libc",
  "num_enum",
@@ -4878,7 +4866,7 @@ dependencies = [
  "chrono",
  "clap 4.3.8",
  "crucible-agent-client",
- "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=c574ff1232aa66eb60069795fe45f0c47f5da51d)",
+ "crucible-client-types",
  "ddm-admin-client",
  "dns-server",
  "dns-service-client 0.1.0",
@@ -6049,7 +6037,7 @@ dependencies = [
 [[package]]
 name = "propolis"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "anyhow",
  "bhyve_api",
@@ -6079,11 +6067,11 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "async-trait",
  "base64 0.21.2",
- "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=f78832dc7ca48bce53f23de00d557bc9320a933f)",
+ "crucible-client-types",
  "futures",
  "progenitor",
  "propolis_types",
@@ -6103,7 +6091,7 @@ dependencies = [
 [[package]]
 name = "propolis-server"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6155,7 +6143,7 @@ dependencies = [
 [[package]]
 name = "propolis-server-config"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "serde",
  "serde_derive",
@@ -6166,7 +6154,7 @@ dependencies = [
 [[package]]
 name = "propolis_types"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "schemars",
  "serde",
@@ -9032,7 +9020,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viona_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "libc",
  "num_enum",
@@ -9042,7 +9030,7 @@ dependencies = [
 [[package]]
 name = "viona_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=9e12522341048d7b8c38394f0ddeb18083685c2f#9e12522341048d7b8c38394f0ddeb18083685c2f"
+source = "git+https://github.com/oxidecomputer/propolis?rev=eeb63abee5a84da54bebed061a87fafbd66c1f12#eeb63abee5a84da54bebed061a87fafbd66c1f12"
 dependencies = [
  "libc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 8fd9f87283..6f9d2abe54 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -151,10 +151,10 @@ cookie = "0.16"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
 crossterm = { version = "0.26.1", features = ["event-stream"] }
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
-crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
-crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
-crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
+crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
+crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
+crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
 curve25519-dalek = "3"
 datatest-stable = "0.1.3"
 display-error-chain = "0.1.1"
@@ -264,9 +264,9 @@ pretty-hex = "0.3.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 = "9e12522341048d7b8c38394f0ddeb18083685c2f" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f", features = [ "generated-migration" ] }
-propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f", default-features = false, features = ["mock-only"] }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12", features = [ "generated-migration" ] }
+propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12", default-features = false, features = ["mock-only"] }
 #propolis-server = { path = "../propolis/bin/propolis-server" }
 proptest = "1.2.0"
 quote = "1.0"
@@ -515,6 +515,7 @@ opt-level = 3
 #crucible-agent-client = { path = "../crucible/agent-client" }
 #crucible-client-types = { path = "../crucible/crucible-client-types" }
 #crucible-pantry-client = { path = "../crucible/pantry-client" }
+#crucible-smf = { path = "../crucible/smf" }
 
 #
 # Local client generation during development.
diff --git a/package-manifest.toml b/package-manifest.toml
index 25a6b9af4d..f987e760f6 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -242,10 +242,10 @@ only_for_targets.image = "standard"
 # 3. Use source.type = "manual" instead of "prebuilt"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "c574ff1232aa66eb60069795fe45f0c47f5da51d"
+source.commit = "179e68b8718d24673893dac46a8ab4a9249ec318"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
-source.sha256 = "72363fbbfde15689bdbafee53e415ca994903644a9fdbb33ca0bc72d65927f0f"
+source.sha256 = "92d83450a48c3bca7775a8b00b453dfb48d1c6a3519bc1a4a75c9f9c46543e8f"
 output.type = "zone"
 
 [package.crucible-pantry]
@@ -253,10 +253,10 @@ service_name = "crucible_pantry"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "c574ff1232aa66eb60069795fe45f0c47f5da51d"
+source.commit = "179e68b8718d24673893dac46a8ab4a9249ec318"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
-source.sha256 = "4645454e3af72ee68bc3916042f78deaac44a8c07bb6c1a1e5766b83f5326e07"
+source.sha256 = "88d86e90f1c0e45eb371b57ecf05f15ac869d642adf343b76217bb2cdb7a928d"
 output.type = "zone"
 
 # Refer to
@@ -267,10 +267,10 @@ service_name = "propolis-server"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "propolis"
-source.commit = "9e12522341048d7b8c38394f0ddeb18083685c2f"
+source.commit = "eeb63abee5a84da54bebed061a87fafbd66c1f12"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
-source.sha256 = "084df2cf5866a17b5467dccdaddef5088cc021a1ee0eb3bea99472bcf67ea7fa"
+source.sha256 = "866be7208bfd4a235d1babd28e346bbc0164d5922bdc108ded32841ac8cbfe27"
 output.type = "zone"
 
 [package.maghemite]