Merge branch 'main' into explicit-datasets

oxidecomputer · Jul 26, 2024 · 75f006b · 75f006b
2 parents 29c4eb7 + 1c27e88
commit 75f006b
Show file tree

Hide file tree

Showing 115 changed files with 2,176 additions and 1,936 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,6 +43,7 @@ members = [
     "key-manager",
     "nexus",
     "nexus-config",
+    "nexus-sled-agent-shared",
     "nexus/authz-macros",
     "nexus/auth",
     "nexus/db-fixed-data",
@@ -145,6 +146,7 @@ default-members = [
     "key-manager",
     "nexus",
     "nexus-config",
+    "nexus-sled-agent-shared",
     "nexus/authz-macros",
     "nexus/auth",
     "nexus/db-fixed-data",
@@ -377,29 +379,30 @@ nexus-reconfigurator-execution = { path = "nexus/reconfigurator/execution" }
 nexus-reconfigurator-planning = { path = "nexus/reconfigurator/planning" }
 nexus-reconfigurator-preparation = { path = "nexus/reconfigurator/preparation" }
 nexus-saga-recovery = { path = "nexus/saga-recovery" }
-omicron-certificates = { path = "certificates" }
-omicron-passwords = { path = "passwords" }
-omicron-workspace-hack = "0.1.0"
-oxlog = { path = "dev-tools/oxlog" }
-oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
+nexus-sled-agent-shared = { path = "nexus-sled-agent-shared" }
 nexus-test-interface = { path = "nexus/test-interface" }
 nexus-test-utils-macros = { path = "nexus/test-utils-macros" }
 nexus-test-utils = { path = "nexus/test-utils" }
 nexus-types = { path = "nexus/types" }
 num-integer = "0.1.46"
 num = { version = "0.4.3", default-features = false, features = [ "libm" ] }
+omicron-certificates = { path = "certificates" }
 omicron-cockroach-admin = { path = "cockroach-admin" }
 omicron-common = { path = "common" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
 omicron-omdb = { path = "dev-tools/omdb" }
 omicron-package = { path = "package" }
+omicron-passwords = { path = "passwords" }
 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.0"
 oxide-client = { path = "clients/oxide-client" }
 oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d", features = [ "api", "std" ] }
+oxlog = { path = "dev-tools/oxlog" }
+oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
 once_cell = "1.19.0"
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
 openapiv3 = "2.0.0"

diff --git a/clients/ddm-admin-client/src/lib.rs b/clients/ddm-admin-client/src/lib.rs
@@ -96,7 +96,7 @@ impl Client {
             }, |err, duration| {
                 info!(
                     me.log,
-                    "Failed to notify ddmd of our address (will retry after {duration:?}";
+                    "Failed to notify ddmd of our address (will retry after {duration:?})";
                     "err" => %err,
                 );
             }).await.unwrap();
@@ -112,7 +112,7 @@ impl Client {
             }, |err, duration| {
                 info!(
                     me.log,
-                    "Failed to notify ddmd of tunnel endpoint (retry in {duration:?}";
+                    "Failed to notify ddmd of tunnel endpoint (retry in {duration:?})";
                     "err" => %err,
                 );
             }).await.unwrap();
@@ -176,7 +176,7 @@ impl Client {
             }, |err, duration| {
                 info!(
                     me.log,
-                    "Failed enable ddm stats (will retry after {duration:?}";
+                    "Failed enable ddm stats (will retry after {duration:?})";
                     "err" => %err,
                 );
             }).await.unwrap();

diff --git a/clients/nexus-client/Cargo.toml b/clients/nexus-client/Cargo.toml
@@ -11,6 +11,7 @@ workspace = true
 chrono.workspace = true
 futures.workspace = true
 nexus-types.workspace = true
+nexus-sled-agent-shared.workspace = true
 omicron-common.workspace = true
 omicron-passwords.workspace = true
 oxnet.workspace = true

diff --git a/clients/nexus-client/src/lib.rs b/clients/nexus-client/src/lib.rs
@@ -29,13 +29,18 @@ progenitor::generate_api!(
         // as "blueprint" this way, but we have really useful functionality
         // (e.g., diff'ing) that's implemented on our local type.
         Blueprint = nexus_types::deployment::Blueprint,
+        Certificate = omicron_common::api::internal::nexus::Certificate,
+        DatasetKind = omicron_common::api::internal::shared::DatasetKind,
         Generation = omicron_common::api::external::Generation,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
         MacAddr = omicron_common::api::external::MacAddr,
         Name = omicron_common::api::external::Name,
         NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
         NetworkInterfaceKind = omicron_common::api::internal::shared::NetworkInterfaceKind,
         NewPasswordHash = omicron_passwords::NewPasswordHash,
+        OmicronPhysicalDiskConfig = nexus_types::disk::OmicronPhysicalDiskConfig,
+        OmicronPhysicalDisksConfig = nexus_types::disk::OmicronPhysicalDisksConfig,
+        RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
         TypedUuidForCollectionKind = omicron_uuid_kinds::CollectionUuid,
         TypedUuidForDownstairsKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DownstairsKind>,
         TypedUuidForPropolisKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PropolisKind>,

diff --git a/clients/sled-agent-client/Cargo.toml b/clients/sled-agent-client/Cargo.toml
@@ -11,6 +11,7 @@ workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 chrono.workspace = true
+nexus-sled-agent-shared.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true