dedup progenitor, and update crucible and propolis revs (#2005)

sunshowers · web-flow · commit 2ceaf76c1a8d · 2022-12-05T14:38:29.000-08:00
This is PR 3 of N in this series. For the earlier ones, see: * oxidecomputer/crucible#552 * oxidecomputer/propolis#262 Currently, we specify the progenitor dependency as both: ```toml progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } ``` And ```toml progenitor-client = { git = "https://github.com/oxidecomputer/progenitor" } ``` Cargo (due to rust-lang/cargo#7497) doesn't dedup these dependencies even though they resolve to the same branch and hash. This causes issues with `cargo doc` colliding with itself, as it tries to document both: ``` Documenting progenitor-impl v0.2.1-dev (https://github.com/oxidecomputer/progenitor#4b5cef4b) Documenting progenitor-impl v0.2.1-dev (https://github.com/oxidecomputer/progenitor?branch=main#4b5cef4b) ``` Fix this by always using the branch name. (We choose this option over not specifying the branch so to maintain uniformity in cases where a non-default branch must be used.) This also requires a crucible update, since that didn't specify a branch either. And the crucible update necessitates a propolis update to get the versions aligned. In the future it would be nice to have a lint which ensures that git dependencies always have the branch name in them.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ members = [
     "test-utils",
     "wicket",
     "wicketd",
-    "wicketd-client"
+    "wicketd-client",
 ]
 
 default-members = [
@@ -116,7 +116,8 @@ panic = "abort"
 #[patch."https://github.com/oxidecomputer/propolis"]
 #propolis-client = { path = "../propolis/lib/propolis-client" }
 #[patch."https://github.com/oxidecomputer/crucible"]
-#crucible-client-typess = { path = "../crucible/crucible-client-typess" }
+#crucible-agent-client = { path = "../crucible/agent-client" }
+#crucible-client-types = { path = "../crucible/crucible-client-types" }
 
 #
 # Local client generation during development.
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -32,7 +32,7 @@ tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1
 toml = "0.5.9"
 uuid = { version = "1.2.2", features = [ "serde", "v4" ] }
 parse-display = "0.6.0"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 
 [dev-dependencies]
 expectorate = "1.0.5"
diff --git a/ddm-admin-client/Cargo.toml b/ddm-admin-client/Cargo.toml
@@ -4,15 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-progenitor-client = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 reqwest = { version = "0.11.13", features = ["json", "stream", "rustls-tls"] }
 serde = { version = "1.0", features = ["derive"] }
 slog = "2.7"
 
 [build-dependencies]
 anyhow = "1.0"
 omicron-zone-package = "0.5.1"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 quote = "1.0"
 serde_json = "1.0"
 toml = "0.5"
diff --git a/gateway-client/Cargo.toml b/gateway-client/Cargo.toml
@@ -6,7 +6,7 @@ license = "MPL-2.0"
 
 [dependencies]
 futures = "0.3.25"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] }
 schemars = "0.8"
 serde_json = "1.0"
diff --git a/internal-dns-client/Cargo.toml b/internal-dns-client/Cargo.toml
@@ -7,7 +7,7 @@ license = "MPL-2.0"
 [dependencies]
 futures = "0.3.25"
 omicron-common = { path = "../common" }
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 reqwest = { version = "0.11.13", features = ["json", "rustls-tls", "stream"] }
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
diff --git a/nexus-client/Cargo.toml b/nexus-client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] }
 serde_json = "1.0"
 
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
@@ -15,7 +15,7 @@ base64 = "0.13.1"
 bb8 = "0.8.0"
 clap = { version = "4.0", features = ["derive"] }
 cookie = "0.16"
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "144d8dafa41715e00b08a5929cc62140ff0eb561" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "861a09c350fd0e127b6105c8099e31a0bc3b711a" }
 diesel = { version = "2.0.2", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", rev = "18748d9f76c94e1f4400fbec0859b3e77a221a8d" }
 # TODO(luqman): Update once merged & new release is cut
@@ -47,7 +47,7 @@ oximeter-db = { path = "../oximeter/db/" }
 parse-display = "0.6.0"
 # See omicron-rpaths for more about the "pq-sys" dependency.
 pq-sys = "*"
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "e58937fea67aca6bc2d37a3cc50a72291328ae0e", features = [ "generated" ] }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "b596e72b6b93bc412d675358f782ae7d53f8bf7a", features = [ "generated" ] }
 rand = "0.8.5"
 ref-cast = "1.0"
 reqwest = { version = "0.11.13", features = [ "json" ] }
diff --git a/nexus/src/app/instance.rs b/nexus/src/app/instance.rs
@@ -516,13 +516,11 @@ impl super::Nexus {
         for (i, disk) in disks.iter().enumerate() {
             let volume =
                 self.db_datastore.volume_checkout(disk.volume_id).await?;
-            let gen: i64 = (&disk.runtime_state.gen.0).into();
             disk_reqs.push(sled_agent_client::types::DiskRequest {
                 name: disk.name().to_string(),
                 slot: sled_agent_client::types::Slot(i as u8),
                 read_only: false,
                 device: "nvme".to_string(),
-                gen: gen as u64,
                 volume_construction_request: serde_json::from_str(
                     &volume.data(),
                 )?,
diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json
@@ -613,11 +613,6 @@
           "device": {
             "type": "string"
           },
-          "gen": {
-            "type": "integer",
-            "format": "uint64",
-            "minimum": 0
-          },
           "name": {
             "type": "string"
           },
@@ -633,7 +628,6 @@
         },
         "required": [
           "device",
-          "gen",
           "name",
           "read_only",
           "slot",
diff --git a/oxide-client/Cargo.toml b/oxide-client/Cargo.toml
@@ -6,7 +6,7 @@ license = "MPL-2.0"
 
 [dependencies]
 futures = "0.3.25"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 regress = "0.4.1"
 serde_json = "1.0.89"
 base64 = "0.13"
diff --git a/oximeter-client/Cargo.toml b/oximeter-client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] }
 
 [dependencies.chrono]
diff --git a/package-manifest.toml b/package-manifest.toml
@@ -92,10 +92,10 @@ service_name = "crucible"
 # 3. Use source.type = "manual" instead of "prebuilt"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "144d8dafa41715e00b08a5929cc62140ff0eb561"
+source.commit = "861a09c350fd0e127b6105c8099e31a0bc3b711a"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
-source.sha256 = "2de086b0ba27efc638c88ff46a6d110236c2db92499266eccbd2a3ec28acc693"
+source.sha256 = "f0cefac66b82a377d1460065a838af22aeb0c03c98563f994eca562d2541f551"
 output.type = "zone"
 
 # Refer to
@@ -105,10 +105,10 @@ output.type = "zone"
 service_name = "propolis-server"
 source.type = "prebuilt"
 source.repo = "propolis"
-source.commit = "e58937fea67aca6bc2d37a3cc50a72291328ae0e"
+source.commit = "b596e72b6b93bc412d675358f782ae7d53f8bf7a"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
-source.sha256 = "00d11a6f669e9f7caa03963c3bd345f2f3a2e6b4ec0e713f2e1dbf94177b4fa9"
+source.sha256 = "014f21152629e6ec7a5cfe42f6ad0057279456f191a040a7e4f04d4db74b627c"
 output.type = "zone"
 
 [package.maghemite]
diff --git a/sled-agent-client/Cargo.toml b/sled-agent-client/Cargo.toml
@@ -7,7 +7,7 @@ license = "MPL-2.0"
 [dependencies]
 async-trait = "0.1"
 ipnetwork = "0.20"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 regress = "0.4.1"
 reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] }
 
diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml
@@ -14,8 +14,8 @@ cfg-if = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
 clap = { version = "4.0", features = ["derive"] }
 # Only used by the simulated sled agent.
-crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "144d8dafa41715e00b08a5929cc62140ff0eb561" }
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "144d8dafa41715e00b08a5929cc62140ff0eb561" }
+crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "861a09c350fd0e127b6105c8099e31a0bc3b711a" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "861a09c350fd0e127b6105c8099e31a0bc3b711a" }
 ddm-admin-client = { path = "../ddm-admin-client" }
 dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
 futures = "0.3.25"
@@ -30,8 +30,8 @@ oximeter = { version = "0.1.0", path = "../oximeter/oximeter" }
 oximeter-producer = { version = "0.1.0", path = "../oximeter/producer" }
 p256 = "0.9.0"
 percent-encoding = "2.2.0"
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "e58937fea67aca6bc2d37a3cc50a72291328ae0e", features = [ "generated-migration" ] }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "b596e72b6b93bc412d675358f782ae7d53f8bf7a", features = [ "generated-migration" ] }
 rand = { version = "0.8.5", features = ["getrandom"] }
 reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] }
 schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] }
diff --git a/wicketd-client/Cargo.toml b/wicketd-client/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
+progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] }
 schemars = "0.8"
 
