Merge branch 'main' into do-more-mounting

Author: smklein

.github/buildomat/jobs/build-and-test-helios.sh

@@ -12,7 +12,7 @@
 #:	"!/var/tmp/omicron_tmp/rustc*",
 #: ]
 #: access_repos = [
-#:	"oxidecomputer/dendrite",
+#:	"oxidecomputer/dendrite"
 #: ]
 #:
 #: [[publish]]

Cargo.lock

@@ -474,8 +474,8 @@ macaddr = { version = "1.0.1", features = ["serde_std"] }
 maplit = "1.0.2"
 mockall = "0.13"
 newtype_derive = "0.1.6"
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "caafd889f31faacfaa51e02902990c220c20ef60" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "caafd889f31faacfaa51e02902990c220c20ef60" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "5a0d6edd0ecc7f26225a5bf3849d8508956682d0" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "5a0d6edd0ecc7f26225a5bf3849d8508956682d0" }
 multimap = "0.10.0"
 nexus-auth = { path = "nexus/auth" }
 nexus-client = { path = "clients/nexus-client" }

Cargo.toml

@@ -52,6 +52,7 @@ serde_json.workspace = true
 sled-agent-client.workspace = true
 slog.workspace = true
 slog-error-chain.workspace = true
+steno.workspace = true
 strum.workspace = true
 supports-color.workspace = true
 tabled.workspace = true
@@ -67,6 +68,7 @@ multimap.workspace = true
 indicatif.workspace = true
 petgraph.workspace = true
 oxnet.workspace = true
+owo-colors.workspace = true
 
 [dev-dependencies]
 camino-tempfile.workspace = true

dev-tools/omdb/Cargo.toml

@@ -159,6 +159,8 @@ use strum::IntoEnumIterator;
 use tabled::Tabled;
 use uuid::Uuid;
 
+mod saga;
+
 const NO_ACTIVE_PROPOLIS_MSG: &str = "<no active Propolis>";
 const NOT_ON_SLED_MSG: &str = "<not on any sled>";
 
@@ -343,6 +345,8 @@ enum DbCommands {
     /// Query for information about region snapshot replacements, optionally
     /// manually triggering one.
     RegionSnapshotReplacement(RegionSnapshotReplacementArgs),
+    /// Commands for querying and interacting with sagas
+    Saga(saga::SagaArgs),
     /// Print information about sleds
     Sleds(SledsArgs),
     /// Print information about customer instances.
@@ -1064,6 +1068,9 @@ impl DbArgs {
                         )
                         .await
                     }
+                    DbCommands::Saga(args) => {
+                        args.exec(&omdb, &opctx, &datastore).await
+                    }
                     DbCommands::Sleds(args) => {
                         cmd_db_sleds(&opctx, &datastore, &fetch_opts, args).await
                     }