Merge branch 'main' into john/sled-agent-config-reconciler-1

Author: jgallagher

Cargo.lock

@@ -389,10 +389,10 @@ crossterm = { version = "0.28.1", features = ["event-stream"] }
 # NOTE: if you change the pinned revision of the `crucible` dependencies, you
 # must also update the references in package-manifest.toml to match the new
 # revision.
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "da3cf198a0e000bb89efc3a1c77d7ba09340a600" }
-crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "da3cf198a0e000bb89efc3a1c77d7ba09340a600" }
-crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "da3cf198a0e000bb89efc3a1c77d7ba09340a600" }
-crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "da3cf198a0e000bb89efc3a1c77d7ba09340a600" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" }
+crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" }
+crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" }
+crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" }
 # NOTE: See above!
 csv = "1.3.1"
 curve25519-dalek = "4"
@@ -606,10 +606,10 @@ progenitor-client = "0.9.1"
 # NOTE: if you change the pinned revision of the `bhyve_api` and propolis
 # dependencies, you must also update the references in package-manifest.toml to
 # match the new revision.
-bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "e5c85d84b0a51803caffb335a1063612edb02f6d" }
-propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "e5c85d84b0a51803caffb335a1063612edb02f6d" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "e5c85d84b0a51803caffb335a1063612edb02f6d" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "e5c85d84b0a51803caffb335a1063612edb02f6d" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" }
+propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" }
 # NOTE: see above!
 proptest = "1.6.0"
 qorb = "0.3.1"

Cargo.toml

@@ -23,5 +23,6 @@ reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+sled-agent-types.workspace = true
 slog.workspace = true
 uuid.workspace = true

clients/sled-agent-client/Cargo.toml

@@ -56,6 +56,7 @@ progenitor::generate_api!(
         DiskVariant = omicron_common::disk::DiskVariant,
         ExternalIpGatewayMap = omicron_common::api::internal::shared::ExternalIpGatewayMap,
         Generation = omicron_common::api::external::Generation,
+        Hostname = omicron_common::api::external::Hostname,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
         Inventory = nexus_sled_agent_shared::inventory::Inventory,
         InventoryDisk = nexus_sled_agent_shared::inventory::InventoryDisk,
@@ -117,14 +118,6 @@ impl From<omicron_common::api::internal::nexus::VmmState> for types::VmmState {
     }
 }
 
-impl From<omicron_common::api::external::InstanceCpuCount>
-    for types::InstanceCpuCount
-{
-    fn from(s: omicron_common::api::external::InstanceCpuCount) -> Self {
-        Self(s.0)
-    }
-}
-
 impl From<types::VmmState> for omicron_common::api::internal::nexus::VmmState {
     fn from(s: types::VmmState) -> Self {
         use omicron_common::api::internal::nexus::VmmState as Output;
@@ -188,14 +181,6 @@ impl From<types::MigrationState>
     }
 }
 
-impl From<types::InstanceCpuCount>
-    for omicron_common::api::external::InstanceCpuCount
-{
-    fn from(s: types::InstanceCpuCount) -> Self {
-        Self(s.0)
-    }
-}
-
 impl From<omicron_common::api::internal::nexus::DiskRuntimeState>
     for types::DiskRuntimeState
 {

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

@@ -43,6 +43,14 @@ pub struct OmicronPhysicalDiskConfig {
     pub pool_id: ZpoolUuid,
 }
 
+impl IdMappable for OmicronPhysicalDiskConfig {
+    type Id = PhysicalDiskUuid;
+
+    fn id(&self) -> Self::Id {
+        self.id
+    }
+}
+
 #[derive(
     Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash,
 )]

common/src/disk.rs

@@ -13,6 +13,7 @@ omicron-rpaths.workspace = true
 [dependencies]
 anyhow.workspace = true
 async-bb8-diesel.workspace = true
+bytes.workspace = true
 camino.workspace = true
 chrono.workspace = true
 clap.workspace = true
@@ -50,6 +51,7 @@ oximeter-db = { workspace = true, default-features = false, features = [ "oxql"
 pq-sys = "*"
 ratatui.workspace = true
 reedline.workspace = true
+reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 sled-agent-client.workspace = true

dev-tools/omdb/Cargo.toml

@@ -22,6 +22,7 @@ use clap::Args;
 use clap::ColorChoice;
 use clap::Subcommand;
 use clap::ValueEnum;
+use futures::StreamExt;
 use futures::TryStreamExt;
 use futures::future::try_join;
 use http::StatusCode;
@@ -70,6 +71,7 @@ use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::ParseError;
 use omicron_uuid_kinds::PhysicalDiskUuid;
 use omicron_uuid_kinds::SledUuid;
+use omicron_uuid_kinds::SupportBundleUuid;
 use serde::Deserialize;
 use slog_error_chain::InlineErrorChain;
 use std::collections::BTreeMap;
@@ -127,6 +129,9 @@ enum NexusCommands {
     Sagas(SagasArgs),
     /// interact with sleds
     Sleds(SledsArgs),
+    /// interact with support bundles
+    #[command(visible_alias = "sb")]
+    SupportBundles(SupportBundleArgs),
 }
 
 #[derive(Debug, Args)]
@@ -475,6 +480,49 @@ struct DiskExpungeArgs {
     physical_disk_id: PhysicalDiskUuid,
 }
 
+#[derive(Debug, Args)]
+struct SupportBundleArgs {
+    #[command(subcommand)]
+    command: SupportBundleCommands,
+}
+
+#[derive(Debug, Subcommand)]
+#[allow(clippy::large_enum_variant)]
+enum SupportBundleCommands {
+    /// List all support bundles
+    List,
+    /// Create a new support bundle
+    Create,
+    /// Delete a support bundle
+    Delete(SupportBundleDeleteArgs),
+    /// Download the index of a support bundle
+    ///
+    /// This is a "list of files", from which individual files can be accessed
+    GetIndex(SupportBundleIndexArgs),
+    /// View a file within a support bundle
+    GetFile(SupportBundleFileArgs),
+}
+
+#[derive(Debug, Args)]
+struct SupportBundleDeleteArgs {
+    id: SupportBundleUuid,
+}
+
+#[derive(Debug, Args)]
+struct SupportBundleIndexArgs {
+    id: SupportBundleUuid,
+}
+
+#[derive(Debug, Args)]
+struct SupportBundleFileArgs {
+    id: SupportBundleUuid,
+    path: Utf8PathBuf,
+    /// Optional output path where the file should be written,
+    /// instead of stdout.
+    #[arg(short, long)]
+    output: Option<Utf8PathBuf>,
+}
+
 impl NexusArgs {
     /// Run a `omdb nexus` subcommand.
     pub(crate) async fn run_cmd(
@@ -668,6 +716,27 @@ impl NexusArgs {
                 cmd_nexus_sled_expunge_disk(&client, args, omdb, log, token)
                     .await
             }
+            NexusCommands::SupportBundles(SupportBundleArgs {
+                command: SupportBundleCommands::List,
+            }) => cmd_nexus_support_bundles_list(&client).await,
+            NexusCommands::SupportBundles(SupportBundleArgs {
+                command: SupportBundleCommands::Create,
+            }) => {
+                let token = omdb.check_allow_destructive()?;
+                cmd_nexus_support_bundles_create(&client, token).await
+            }
+            NexusCommands::SupportBundles(SupportBundleArgs {
+                command: SupportBundleCommands::Delete(args),
+            }) => {
+                let token = omdb.check_allow_destructive()?;
+                cmd_nexus_support_bundles_delete(&client, args, token).await
+            }
+            NexusCommands::SupportBundles(SupportBundleArgs {
+                command: SupportBundleCommands::GetIndex(args),
+            }) => cmd_nexus_support_bundles_get_index(&client, args).await,
+            NexusCommands::SupportBundles(SupportBundleArgs {
+                command: SupportBundleCommands::GetFile(args),
+            }) => cmd_nexus_support_bundles_get_file(&client, args).await,
         }
     }
 }
@@ -3682,3 +3751,132 @@ async fn cmd_nexus_sled_expunge_disk_with_datastore(
     eprintln!("expunged disk {}", args.physical_disk_id);
     Ok(())
 }
+
+/// Runs `omdb nexus support-bundles list`
+async fn cmd_nexus_support_bundles_list(
+    client: &nexus_client::Client,
+) -> Result<(), anyhow::Error> {
+    let support_bundle_stream = client.support_bundle_list_stream(None, None);
+
+    let support_bundles = support_bundle_stream
+        .try_collect::<Vec<_>>()
+        .await
+        .context("listing support bundles")?;
+
+    #[derive(Tabled)]
+    #[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
+    struct SupportBundleInfo {
+        id: Uuid,
+        time_created: DateTime<Utc>,
+        reason_for_creation: String,
+        reason_for_failure: String,
+        state: String,
+    }
+    let rows = support_bundles.into_iter().map(|sb| SupportBundleInfo {
+        id: *sb.id,
+        time_created: sb.time_created,
+        reason_for_creation: sb.reason_for_creation,
+        reason_for_failure: sb
+            .reason_for_failure
+            .unwrap_or_else(|| "-".to_string()),
+        state: format!("{:?}", sb.state),
+    });
+    let table = tabled::Table::new(rows)
+        .with(tabled::settings::Style::empty())
+        .with(tabled::settings::Padding::new(0, 1, 0, 0))
+        .to_string();
+    println!("{}", table);
+    Ok(())
+}
+
+/// Runs `omdb nexus support-bundles create`
+async fn cmd_nexus_support_bundles_create(
+    client: &nexus_client::Client,
+    _destruction_token: DestructiveOperationToken,
+) -> Result<(), anyhow::Error> {
+    let support_bundle_id = client
+        .support_bundle_create()
+        .await
+        .context("creating support bundle")?
+        .into_inner()
+        .id;
+    println!("created support bundle: {support_bundle_id}");
+    Ok(())
+}
+
+/// Runs `omdb nexus support-bundles delete`
+async fn cmd_nexus_support_bundles_delete(
+    client: &nexus_client::Client,
+    args: &SupportBundleDeleteArgs,
+    _destruction_token: DestructiveOperationToken,
+) -> Result<(), anyhow::Error> {
+    let _ = client
+        .support_bundle_delete(args.id.as_untyped_uuid())
+        .await
+        .with_context(|| format!("deleting support bundle {}", args.id))?;
+    println!("support bundle {} deleted", args.id);
+    Ok(())
+}
+
+async fn write_stream_to_sink(
+    mut stream: impl futures::Stream<Item = reqwest::Result<bytes::Bytes>>
+    + std::marker::Unpin,
+    mut sink: impl std::io::Write,
+) -> Result<(), anyhow::Error> {
+    while let Some(data) = stream.next().await {
+        match data {
+            Err(err) => return Err(anyhow::anyhow!(err)),
+            Ok(data) => sink.write_all(&data)?,
+        }
+    }
+    Ok(())
+}
+
+/// Runs `omdb nexus support-bundles get-index`
+async fn cmd_nexus_support_bundles_get_index(
+    client: &nexus_client::Client,
+    args: &SupportBundleIndexArgs,
+) -> Result<(), anyhow::Error> {
+    let stream = client
+        .support_bundle_index(args.id.as_untyped_uuid())
+        .await
+        .with_context(|| {
+            format!("downloading support bundle index {}", args.id)
+        })?
+        .into_inner_stream();
+
+    write_stream_to_sink(stream, std::io::stdout()).await.with_context(
+        || format!("streaming support bundle index {}", args.id),
+    )?;
+    Ok(())
+}
+
+/// Runs `omdb nexus support-bundles get-file`
+async fn cmd_nexus_support_bundles_get_file(
+    client: &nexus_client::Client,
+    args: &SupportBundleFileArgs,
+) -> Result<(), anyhow::Error> {
+    let stream = client
+        .support_bundle_download_file(
+            args.id.as_untyped_uuid(),
+            args.path.as_str(),
+        )
+        .await
+        .with_context(|| {
+            format!(
+                "downloading support bundle file {}: {}",
+                args.id, args.path
+            )
+        })?
+        .into_inner_stream();
+
+    let sink: Box<dyn std::io::Write> = match &args.output {
+        Some(path) => Box::new(std::fs::File::create(path)?),
+        None => Box::new(std::io::stdout()),
+    };
+
+    write_stream_to_sink(stream, sink).await.with_context(|| {
+        format!("streaming support bundle file {}: {}", args.id, args.path)
+    })?;
+    Ok(())
+}

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -706,6 +706,7 @@ Commands:
   oximeter-read-policy  interact with oximeter read policy
   sagas                 view sagas, create and complete demo sagas
   sleds                 interact with sleds
+  support-bundles       interact with support bundles [aliases: sb]
   help                  Print this message or the help of the given subcommand(s)
 
 Options:

dev-tools/omdb/tests/usage_errors.out

@@ -72,8 +72,9 @@ const RECOVERY_IMAGE_PACKAGES: [(&PackageName, InstallMethod); 2] = [
     (&PackageName::new_const("installinator"), InstallMethod::Install),
     (&PackageName::new_const("mg-ddm-gz"), InstallMethod::Install),
 ];
-const TUF_PACKAGES: [&PackageName; 11] = [
+const TUF_PACKAGES: [&PackageName; 12] = [
     &PackageName::new_const("clickhouse_keeper"),
+    &PackageName::new_const("clickhouse_server"),
     &PackageName::new_const("clickhouse"),
     &PackageName::new_const("cockroachdb"),
     &PackageName::new_const("crucible-pantry-zone"),

dev-tools/releng/src/main.rs

@@ -8,6 +8,7 @@ workspace = true
 
 [dependencies]
 daft.workspace = true
+id-map.workspace = true
 illumos-utils.workspace = true
 omicron-common.workspace = true
 omicron-passwords.workspace = true