Merge branch 'main' into init-replicated-ch

.github/buildomat/jobs/package.sh

@@ -28,7 +28,7 @@ ptime -m cargo xtask download softnpu
 # Build the test target
 export CARGO_INCREMENTAL=0
 ptime -m cargo run --locked --release --bin omicron-package -- \
-  -t test target create -i standard -m non-gimlet -s softnpu -r single-sled
+  -t test target create -p dev
 ptime -m cargo run --locked --release --bin omicron-package -- \
   -t test package
 mapfile -t packages \

.github/workflows/rust.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Install Pre-Requisites
       run: ./tools/install_builder_prerequisites.sh -y
     - name: Set default target
-      run: cargo run --bin omicron-package -- -t default target create -r single-sled
+      run: cargo run --bin omicron-package -- -t default target create --preset dev
     - name: Check build of deployed Omicron packages
       run: cargo run --bin omicron-package -- -t default check
 

Cargo.toml

@@ -499,7 +499,7 @@ omicron-rpaths = { path = "rpaths" }
 omicron-sled-agent = { path = "sled-agent" }
 omicron-test-utils = { path = "test-utils" }
 omicron-workspace-hack = "0.1.0"
-omicron-zone-package = "0.11.1"
+omicron-zone-package = "0.12.0"
 oxide-client = { path = "clients/oxide-client" }
 oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "b56afeeb14e0042cbd7bda85b166ed86ee17820e", features = [ "api", "std" ] }
 oxlog = { path = "dev-tools/oxlog" }

clients/dpd-client/build.rs

@@ -14,12 +14,16 @@ use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
 use omicron_zone_package::config::Config;
+use omicron_zone_package::config::PackageName;
 use omicron_zone_package::package::PackageSource;
 use quote::quote;
 use std::env;
 use std::fs;
 use std::path::Path;
 
+const DENDRITE_ASIC_PACKAGE: PackageName =
+    PackageName::new_const("dendrite-asic");
+
 fn main() -> Result<()> {
     // Find the current dendrite repo commit from our package manifest.
     let manifest = fs::read_to_string("../../package-manifest.toml")
@@ -31,7 +35,7 @@ fn main() -> Result<()> {
 
     let dendrite = config
         .packages
-        .get("dendrite-asic")
+        .get(&DENDRITE_ASIC_PACKAGE)
         .context("missing dendrite package in ../../package-manifest.toml")?;
 
     let local_path = match &dendrite.source {

clients/sled-agent-client/src/lib.rs

@@ -83,6 +83,7 @@ progenitor::generate_api!(
         TypedUuidForOmicronZoneKind = omicron_uuid_kinds::OmicronZoneUuid,
         TypedUuidForPropolisKind = omicron_uuid_kinds::PropolisUuid,
         TypedUuidForSledKind = omicron_uuid_kinds::SledUuid,
+        TypedUuidForSupportBundleKind = omicron_uuid_kinds::SupportBundleUuid,
         TypedUuidForZpoolKind = omicron_uuid_kinds::ZpoolUuid,
         Vni = omicron_common::api::external::Vni,
         ZpoolKind = omicron_common::zpool_name::ZpoolKind,

common/src/disk.rs

@@ -112,9 +112,7 @@ impl DatasetName {
         &self.pool_name
     }
 
-    // TODO(https://github.com/oxidecomputer/omicron/issues/7115): Rename
-    // this to "kind?
-    pub fn dataset(&self) -> &DatasetKind {
+    pub fn kind(&self) -> &DatasetKind {
         &self.kind
     }