From dc26fa68b9967d97c58cb730a13203af44d40ab3 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Mon, 4 Dec 2023 14:59:11 -0800
Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?=
 =?UTF-8?q?l=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Created using spr 1.3.5
---
 Cargo.lock                                 |  1 -
 nexus/db-model/src/sled_provision_state.rs | 13 ++++---------
 nexus/src/external_api/http_entrypoints.rs |  5 +----
 nexus/types/Cargo.toml                     |  1 -
 nexus/types/src/external_api/views.rs      |  7 -------
 openapi/nexus.json                         |  7 -------
 6 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 329f74bb77..cfac442745 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4179,7 +4179,6 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "serde_with",
  "steno",
  "strum",
  "uuid",
diff --git a/nexus/db-model/src/sled_provision_state.rs b/nexus/db-model/src/sled_provision_state.rs
index 6cf81b9c70..b2b1ee39dc 100644
--- a/nexus/db-model/src/sled_provision_state.rs
+++ b/nexus/db-model/src/sled_provision_state.rs
@@ -34,19 +34,14 @@ impl From<SledProvisionState> for views::SledProvisionState {
     }
 }
 
-impl TryFrom<views::SledProvisionState> for SledProvisionState {
-    type Error = UnknownSledProvisionState;
-
-    fn try_from(state: views::SledProvisionState) -> Result<Self, Self::Error> {
+impl From<views::SledProvisionState> for SledProvisionState {
+    fn from(state: views::SledProvisionState) -> Self {
         match state {
             views::SledProvisionState::Provisionable => {
-                Ok(SledProvisionState::Provisionable)
+                SledProvisionState::Provisionable
             }
             views::SledProvisionState::NonProvisionable => {
-                Ok(SledProvisionState::NonProvisionable)
-            }
-            views::SledProvisionState::Unknown => {
-                Err(UnknownSledProvisionState)
+                SledProvisionState::NonProvisionable
             }
         }
     }
diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
index f1302f4a73..ef8d73afab 100644
--- a/nexus/src/external_api/http_entrypoints.rs
+++ b/nexus/src/external_api/http_entrypoints.rs
@@ -4504,10 +4504,7 @@ async fn sled_set_provision_state(
 
         let opctx = crate::context::op_context_for_external_api(&rqctx).await?;
         // Convert the external `SledProvisionState` into our internal data model.
-        let new_state =
-            db::model::SledProvisionState::try_from(provision_state).map_err(
-                |error| HttpError::for_bad_request(None, format!("{error}")),
-            )?;
+        let new_state = db::model::SledProvisionState::from(provision_state);
 
         let sled_lookup = nexus.sled_lookup(&opctx, &path.sled_id)?;
 
diff --git a/nexus/types/Cargo.toml b/nexus/types/Cargo.toml
index 8cbbd8626c..9cb94a8484 100644
--- a/nexus/types/Cargo.toml
+++ b/nexus/types/Cargo.toml
@@ -14,7 +14,6 @@ parse-display.workspace = true
 schemars = { workspace = true, features = ["chrono", "uuid1"] }
 serde.workspace = true
 serde_json.workspace = true
-serde_with.workspace = true
 steno.workspace = true
 strum.workspace = true
 uuid.workspace = true
diff --git a/nexus/types/src/external_api/views.rs b/nexus/types/src/external_api/views.rs
index 6d02623f34..4006b18bcc 100644
--- a/nexus/types/src/external_api/views.rs
+++ b/nexus/types/src/external_api/views.rs
@@ -17,7 +17,6 @@ use omicron_common::api::external::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use serde_with::rust::deserialize_ignore_any;
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 use std::net::IpAddr;
@@ -311,12 +310,6 @@ pub enum SledProvisionState {
     /// resources will continue to be on this sled unless manually migrated
     /// off.
     NonProvisionable,
-
-    /// This is a state that isn't known yet.
-    ///
-    /// This is defined to avoid API breakage.
-    #[serde(other, deserialize_with = "deserialize_ignore_any")]
-    Unknown,
 }
 
 /// An operator's view of an instance running on a given sled
diff --git a/openapi/nexus.json b/openapi/nexus.json
index 15e75f93ff..39f0d87601 100644
--- a/openapi/nexus.json
+++ b/openapi/nexus.json
@@ -13192,13 +13192,6 @@
             "enum": [
               "non_provisionable"
             ]
-          },
-          {
-            "description": "This is a state that isn't known yet.\n\nThis is defined to avoid API breakage.",
-            "type": "string",
-            "enum": [
-              "unknown"
-            ]
           }
         ]
       },