merge main into branch

.envrc

@@ -6,7 +6,7 @@ PATH_add out/clickhouse
 PATH_add out/dendrite-stub/bin
 PATH_add out/mgd/root/opt/oxide/mgd/bin
 
-if nix flake show &> /dev/null
+if [ "$OMICRON_USE_FLAKE" = 1 ] && nix flake show &> /dev/null
 then
     use flake;
-fi
+fi

.github/workflows/rust.yml

@@ -26,10 +26,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-12 ]
+        os: [ ubuntu-22.04, macos-14 ]
     steps:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
+      if: ${{ startsWith(matrix.os, 'ubuntu') }}
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:

.gitignore

@@ -4,8 +4,6 @@ README.html
 TODO.html
 logs
 out
-tools/clickhouse*
-tools/cockroach*
 /clickhouse/
 /cockroachdb/
 smf/nexus/root.json

Cargo.toml

@@ -21,7 +21,6 @@ members = [
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/oxlog",
-    "dev-tools/thing-flinger",
     "dev-tools/xtask",
     "dns-server",
     "end-to-end-tests",
@@ -96,7 +95,6 @@ default-members = [
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/oxlog",
-    "dev-tools/thing-flinger",
     # Do not include xtask in the list of default members, because this causes
     # hakari to not work as well and build times to be longer.
     # See omicron#4392.
@@ -180,9 +178,9 @@ cookie = "0.18"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
 crossterm = { version = "0.27.0", features = ["event-stream"] }
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "2d4bc11232d53f177c286383926fa5f8c1b2a938" }
-crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "2d4bc11232d53f177c286383926fa5f8c1b2a938" }
-crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "2d4bc11232d53f177c286383926fa5f8c1b2a938" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
+crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
+crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "796dce526dd7ed7b52a0429a486ccba4a9da1ce5" }
 csv = "1.3.0"
 curve25519-dalek = "4"
 datatest-stable = "0.2.3"
@@ -311,13 +309,13 @@ prettyplease = { version = "0.2.16", features = ["verbatim"] }
 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 = "ff6c4df2e816eee6e7b2b0488777d30ef35ee217" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ff6c4df2e816eee6e7b2b0488777d30ef35ee217" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "ff6c4df2e816eee6e7b2b0488777d30ef35ee217" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "c7cdaf1875d259e29ca50a14b77b0bfd9dfe443d" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "c7cdaf1875d259e29ca50a14b77b0bfd9dfe443d" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "c7cdaf1875d259e29ca50a14b77b0bfd9dfe443d" }
 proptest = "1.4.0"
 quote = "1.0"
 rand = "0.8.5"
-ratatui = "0.26.0"
+ratatui = "0.26.1"
 rayon = "1.8"
 rcgen = "0.12.1"
 reedline = "0.28.0"
@@ -614,3 +612,8 @@ branch = "oxide/omicron"
 # to it.
 [patch.crates-io.omicron-workspace-hack]
 path = "workspace-hack"
+
+# Pulls in https://github.com/njaremko/samael/pull/41
+[patch.crates-io.samael]
+git = "https://github.com/oxidecomputer/samael"
+branch = "oxide/omicron"

bootstore/src/schemes/v0/peer.rs

@@ -62,6 +62,14 @@ pub enum NodeRequestError {
     },
 }
 
+impl From<NodeRequestError> for omicron_common::api::external::Error {
+    fn from(error: NodeRequestError) -> Self {
+        omicron_common::api::external::Error::internal_error(&format!(
+            "{error}"
+        ))
+    }
+}
+
 /// A request sent to the `Node` task from the `NodeHandle`
 pub enum NodeApiRequest {
     /// Initialize a rack at the behest of RSS running on the same scrimlet as

clients/ddm-admin-client/build.rs

@@ -33,7 +33,9 @@ fn main() -> Result<()> {
             // Report a relatively verbose error if we haven't downloaded the requisite
             // openapi spec.
             let local_path =
-                format!("../../out/downloads/ddm-admin-{commit}.json");
+                env::var("DDM_OPENAPI_PATH").unwrap_or_else(|_| {
+                    format!("../../out/downloads/ddm-admin-{commit}.json")
+                });
             if !Path::new(&local_path).exists() {
                 bail!("{local_path} doesn't exist; rerun `tools/ci_download_maghemite_openapi` (after updating `tools/maghemite_ddm_openapi_version` if the maghemite commit in package-manifest.toml has changed)");
             }

clients/dpd-client/build.rs

@@ -38,7 +38,10 @@ fn main() -> Result<()> {
         PackageSource::Prebuilt { commit, .. } => {
             // Report a relatively verbose error if we haven't downloaded the
             // requisite openapi spec.
-            let local_path = format!("../../out/downloads/dpd-{commit}.json");
+            let local_path =
+                env::var("DPD_OPENAPI_PATH").unwrap_or_else(|_| {
+                    format!("../../out/downloads/dpd-{commit}.json")
+                });
             if !Path::new(&local_path).exists() {
                 bail!("{local_path} doesn't exist; rerun `tools/ci_download_dendrite_openapi` (after updating `tools/dendrite_openapi_version` if the dendrite commit in package-manifest.toml has changed)");
             }

clients/mg-admin-client/build.rs

@@ -31,8 +31,9 @@ fn main() -> Result<()> {
         PackageSource::Prebuilt { commit, .. } => {
             // Report a relatively verbose error if we haven't downloaded the requisite
             // openapi spec.
-            let local_path =
-                format!("../../out/downloads/mg-admin-{commit}.json");
+            let local_path = env::var("MG_OPENAPI_PATH").unwrap_or_else(|_| {
+                format!("../../out/downloads/mg-admin-{commit}.json")
+            });
             if !Path::new(&local_path).exists() {
                 bail!("{local_path} doesn't exist; rerun `tools/ci_download_maghemite_openapi` (after updating `tools/maghemite_mg_openapi_version` if the maghemite commit in package-manifest.toml has changed)");
             }

clients/sled-agent-client/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
+anyhow.workspace = true
 async-trait.workspace = true
 chrono.workspace = true
 omicron-common.workspace = true