oxidecomputer · iliana · Oct 30, 2025 · Oct 27, 2025 · Oct 29, 2025 · Oct 29, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/bootstrap-agent-client/src/lib.rs b/clients/bootstrap-agent-client/src/lib.rs
@@ -5,7 +5,7 @@
 //! Interface for making API requests to a Bootstrap Agent
 
 progenitor::generate_api!(
-    spec = "../../openapi/bootstrap-agent.json",
+    spec = "../../openapi/bootstrap-agent/bootstrap-agent-1.0.0-127591.json",
     interface = Positional,
     inner_type = slog::Logger,
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {

diff --git a/clients/installinator-client/src/lib.rs b/clients/installinator-client/src/lib.rs
@@ -5,7 +5,7 @@
 //! Interface for installinator to make API requests.
 
 progenitor::generate_api!(
-    spec = "../../openapi/installinator.json",
+    spec = "../../openapi/installinator/installinator-1.0.0-c0ed87.json",
     interface = Positional,
     inner_type = slog::Logger,
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {

diff --git a/clients/nexus-client/src/lib.rs b/clients/nexus-client/src/lib.rs
@@ -6,7 +6,7 @@
 //! from within the control plane
 
 progenitor::generate_api!(
-    spec = "../../openapi/nexus-internal.json",
+    spec = "../../openapi/nexus-internal/nexus-internal-1.0.0-6d8ade.json",
     interface = Positional,
     derives = [schemars::JsonSchema, PartialEq],
     inner_type = slog::Logger,
@@ -261,3 +261,13 @@ impl TryFrom<types::ProducerEndpoint>
         })
     }
 }
+
+impl From<nexus_types::external_api::shared::Baseboard> for types::Baseboard {
+    fn from(value: nexus_types::external_api::shared::Baseboard) -> Self {
+        types::Baseboard {
+            part: value.part,
+            revision: value.revision,
+            serial: value.serial,
+        }
+    }
+}
diff --git a/clients/repo-depot-client/src/lib.rs b/clients/repo-depot-client/src/lib.rs
@@ -5,7 +5,7 @@
 //! Interface for Sled Agent's Repo Depot to make API requests.
 
 progenitor::generate_api!(
-    spec = "../../openapi/repo-depot.json",
+    spec = "../../openapi/repo-depot/repo-depot-1.0.0-65083f.json",
     interface = Positional,
     inner_type = slog::Logger,
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {

diff --git a/dev-tools/dropshot-apis/src/main.rs b/dev-tools/dropshot-apis/src/main.rs
@@ -53,7 +53,9 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
     let apis = vec![
         ManagedApiConfig {
             title: "Bootstrap Agent API",
-            versions: Versions::new_lockstep(semver::Version::new(0, 0, 1)),
+            versions: Versions::new_versioned(
+                bootstrap_agent_api::supported_versions(),
+            ),
             metadata: ManagedApiMetadata {
                 description: Some("Per-sled API for setup and teardown"),
                 contact_url: Some("https://oxide.computer"),
@@ -172,7 +174,9 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
         },
         ManagedApiConfig {
             title: "Installinator API",
-            versions: Versions::new_lockstep(semver::Version::new(0, 0, 1)),
+            versions: Versions::new_versioned(
+                installinator_api::supported_versions(),
+            ),
             metadata: ManagedApiMetadata {
                 description: Some(
                     "API for installinator to fetch artifacts \
@@ -205,7 +209,9 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
         },
         ManagedApiConfig {
             title: "Nexus internal API",
-            versions: Versions::new_lockstep(semver::Version::new(0, 0, 1)),
+            versions: Versions::new_versioned(
+                nexus_internal_api::supported_versions(),
+            ),
             metadata: ManagedApiMetadata {
                 description: Some("Nexus internal API"),
                 contact_url: Some("https://oxide.computer"),
@@ -261,7 +267,9 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
         },
         ManagedApiConfig {
             title: "Oxide TUF Repo Depot API",
-            versions: Versions::new_lockstep(semver::Version::new(0, 0, 1)),
+            versions: Versions::new_versioned(
+                repo_depot_api::supported_versions(),
+            ),
             metadata: ManagedApiMetadata {
                 description: Some("API for fetching update artifacts"),
                 contact_url: Some("https://oxide.computer"),

diff --git a/dev-tools/repo-depot-standalone/Cargo.toml b/dev-tools/repo-depot-standalone/Cargo.toml
@@ -16,6 +16,8 @@ clap.workspace = true
 dropshot.workspace = true
 futures.workspace = true
 libc.workspace = true
+omicron-common.workspace = true
+omicron-workspace-hack.workspace = true
 oxide-tokio-rt.workspace = true
 repo-depot-api.workspace = true
 serde_json.workspace = true
@@ -26,7 +28,6 @@ tokio = { workspace = true, features = [ "full" ] }
 tokio-util.workspace = true
 tufaceous-artifact.workspace = true
 update-common.workspace = true
-omicron-workspace-hack.workspace = true
 
 [[bin]]
 name = "repo-depot-standalone"

diff --git a/dev-tools/repo-depot-standalone/src/main.rs b/dev-tools/repo-depot-standalone/src/main.rs
@@ -124,6 +124,12 @@ impl RepoDepotStandalone {
                 bind_address: self.listen_addr,
                 ..Default::default()
             })
+            .version_policy(dropshot::VersionPolicy::Dynamic(Box::new(
+                dropshot::ClientSpecifiesVersionInHeader::new(
+                    omicron_common::api::VERSION_HEADER,
+                    repo_depot_api::latest_version(),
+                ),
+            )))
             .start()
             .context("failed to create server")?;
 

diff --git a/installinator-api/Cargo.toml b/installinator-api/Cargo.toml
@@ -10,6 +10,7 @@ workspace = true
 [dependencies]
 anyhow.workspace = true
 dropshot.workspace = true
+dropshot-api-manager-types.workspace = true
 hyper.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true

diff --git a/installinator-api/src/lib.rs b/installinator-api/src/lib.rs
@@ -14,13 +14,20 @@ use dropshot::{
     HttpResponseHeaders, HttpResponseOk, HttpResponseUpdatedNoContent, Path,
     RequestContext, TypedBody,
 };
+use dropshot_api_manager_types::api_versions;
 use hyper::header;
 use omicron_uuid_kinds::MupdateUuid;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use tufaceous_artifact::ArtifactHashId;
 use update_engine::{NestedSpec, events::EventReport};
 
+api_versions!([
+    // Do not create new versions of this client-side versioned API.
+    // https://github.com/oxidecomputer/omicron/issues/9290
+    (1, INITIAL),
+]);
+
 const PROGRESS_REPORT_MAX_BYTES: usize = 4 * 1024 * 1024;
 
 #[derive(Debug, Deserialize, JsonSchema)]

diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
@@ -160,6 +160,7 @@ httpmock.workspace = true
 httptest.workspace = true
 hubtools.workspace = true
 hyper-rustls.workspace = true
+nexus-client.workspace = true
 nexus-db-queries = { workspace = true, features = ["testing"] }
 nexus-lockstep-client.workspace = true
 nexus-test-utils.workspace = true

diff --git a/nexus/internal-api/Cargo.toml b/nexus/internal-api/Cargo.toml
@@ -9,11 +9,12 @@ workspace = true
 
 [dependencies]
 dropshot.workspace = true
+dropshot-api-manager-types.workspace = true
 http.workspace = true
 nexus-types.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
-serde.workspace = true
 schemars.workspace = true
+serde.workspace = true
 uuid.workspace = true
diff --git a/nexus/internal-api/src/lib.rs b/nexus/internal-api/src/lib.rs
@@ -9,6 +9,7 @@ use dropshot::{
     HttpResponseUpdatedNoContent, Path, Query, RequestContext, ResultsPage,
     TypedBody,
 };
+use dropshot_api_manager_types::api_versions;
 use nexus_types::{
     external_api::{
         shared::ProbeInfo,
@@ -34,6 +35,12 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
+api_versions!([
+    // Do not create new versions of this client-side versioned API.
+    // https://github.com/oxidecomputer/omicron/issues/9290
+    (1, INITIAL),
+]);
+
 #[dropshot::api_description]
 pub trait NexusInternalApi {
     type Context;

diff --git a/nexus/mgs-updates/src/test_util/test_artifacts.rs b/nexus/mgs-updates/src/test_util/test_artifacts.rs
@@ -193,6 +193,12 @@ impl TestArtifacts {
             .unwrap();
 
             ServerBuilder::new(my_api, Arc::new(artifact_data), log)
+                .version_policy(dropshot::VersionPolicy::Dynamic(Box::new(
+                    dropshot::ClientSpecifiesVersionInHeader::new(
+                        omicron_common::api::VERSION_HEADER,
+                        repo_depot_api::latest_version(),
+                    ),
+                )))
                 .start()
                 .context("failed to create server")?
         };

diff --git a/nexus/src/lib.rs b/nexus/src/lib.rs
@@ -106,6 +106,12 @@ impl InternalServer {
             log.new(o!("component" => "dropshot_internal")),
         )
         .config(config.deployment.dropshot_internal.clone())
+        .version_policy(dropshot::VersionPolicy::Dynamic(Box::new(
+            dropshot::ClientSpecifiesVersionInHeader::new(
+                omicron_common::api::VERSION_HEADER,
+                nexus_internal_api::latest_version(),
+            ),
+        )))
         .start()
         .map_err(|error| format!("initializing internal server: {}", error))
         {

diff --git a/nexus/test-utils/Cargo.toml b/nexus/test-utils/Cargo.toml
@@ -29,6 +29,7 @@ id-map.workspace = true
 illumos-utils.workspace = true
 internal-dns-resolver.workspace = true
 internal-dns-types.workspace = true
+nexus-client.workspace = true
 nexus-config.workspace = true
 nexus-db-queries = { workspace = true, features = [ "testing" ] }
 nexus-lockstep-client.workspace = true

diff --git a/nexus/test-utils/src/lib.rs b/nexus/test-utils/src/lib.rs
@@ -271,6 +271,13 @@ impl<N: NexusServer> ControlPlaneTestContext<N> {
         }
     }
 
+    pub fn internal_client(&self) -> nexus_client::Client {
+        nexus_client::Client::new(
+            &format!("http://{}", self.internal_client.bind_address),
+            self.internal_client.client_log.clone(),
+        )
+    }
+
     pub async fn teardown(mut self) {
         self.server.close().await;
         self.database.cleanup().await.unwrap();

diff --git a/nexus/tests/integration_tests/crucible_replacements.rs b/nexus/tests/integration_tests/crucible_replacements.rs
@@ -1314,7 +1314,7 @@ mod region_snapshot_replacement {
         datastore: Arc<DataStore>,
         disk_test: DiskTest<'a>,
         client: ClientTestContext,
-        internal_client: ClientTestContext,
+        internal_client: nexus_client::Client,
         lockstep_client: ClientTestContext,
         replacement_request_id: Uuid,
         snapshot_socket_addr: SocketAddr,
@@ -1334,7 +1334,7 @@ mod region_snapshot_replacement {
                 .await;
 
             let client = &cptestctx.external_client;
-            let internal_client = &cptestctx.internal_client;
+            let internal_client = cptestctx.internal_client();
             let lockstep_client = &cptestctx.lockstep_client;
             let datastore = nexus.datastore().clone();
 
@@ -1768,15 +1768,8 @@ mod region_snapshot_replacement {
 
             let disk_id = disk_from_snapshot.identity.id;
 
-            // Note: `make_request` needs a type here, otherwise rustc cannot
-            // figure out the type of the `request_body` parameter
             self.internal_client
-                .make_request::<u32>(
-                    http::Method::POST,
-                    &format!("/disk/{disk_id}/remove-read-only-parent"),
-                    None,
-                    http::StatusCode::NO_CONTENT,
-                )
+                .cpapi_disk_remove_read_only_parent(&disk_id)
                 .await
                 .unwrap();
         }