ServiceZoneRequest is too general (#4466)

oxidecomputer · Nov 30, 2023 · e3887d5 · e3887d5
1 parent 7ef3631
commit e3887d5
Show file tree

Hide file tree

Showing 104 changed files with 12,950 additions and 3,013 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/sled-agent-client/Cargo.toml b/clients/sled-agent-client/Cargo.toml
@@ -12,6 +12,7 @@ progenitor.workspace = true
 ipnetwork.workspace = true
 regress.workspace = true
 reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
+schemars.workspace = true
 serde.workspace = true
 slog.workspace = true
 sled-storage.workspace = true

diff --git a/clients/sled-agent-client/src/lib.rs b/clients/sled-agent-client/src/lib.rs
@@ -6,11 +6,11 @@
 
 use async_trait::async_trait;
 use std::convert::TryFrom;
-use std::str::FromStr;
 use uuid::Uuid;
 
 progenitor::generate_api!(
     spec = "../../openapi/sled-agent.json",
+    derives = [ schemars::JsonSchema ],
     inner_type = slog::Logger,
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {
         slog::debug!(log, "client request";
@@ -529,27 +529,3 @@ impl TestInterfaces for Client {
             .expect("disk_finish_transition() failed unexpectedly");
     }
 }
-
-impl From<sled_storage::dataset::DatasetKind> for types::DatasetKind {
-    fn from(k: sled_storage::dataset::DatasetKind) -> Self {
-        use sled_storage::dataset::DatasetKind::*;
-        match k {
-            CockroachDb => Self::CockroachDb,
-            Crucible => Self::Crucible,
-            Clickhouse => Self::Clickhouse,
-            ClickhouseKeeper => Self::ClickhouseKeeper,
-            ExternalDns => Self::ExternalDns,
-            InternalDns => Self::InternalDns,
-        }
-    }
-}
-
-impl From<sled_storage::dataset::DatasetName> for types::DatasetName {
-    fn from(n: sled_storage::dataset::DatasetName) -> Self {
-        Self {
-            pool_name: types::ZpoolName::from_str(&n.pool().to_string())
-                .unwrap(),
-            kind: n.dataset().clone().into(),
-        }
-    }
-}
diff --git a/common/src/api/external/mod.rs b/common/src/api/external/mod.rs
@@ -622,6 +622,7 @@ impl From<ByteCount> for i64 {
     Debug,
     Deserialize,
     Eq,
+    Hash,
     JsonSchema,
     Ord,
     PartialEq,

diff --git a/common/src/ledger.rs b/common/src/ledger.rs
@@ -54,6 +54,7 @@ impl From<Error> for crate::api::external::Error {
 ///
 /// This structure is intended to help with serialization and deserialization
 /// of configuration information to both M.2s.
+#[derive(Debug)]
 pub struct Ledger<T> {
     log: Logger,
     ledger: T,
-Original file line number
+Diff line change
@@ Expand Up / @@ -622,6 +622,7 @@ impl From<ByteCount> for i64 { @@
         Debug,
         Deserialize,
         Eq,
+        Hash,
         JsonSchema,
         Ord,
         PartialEq,
@@ Expand Down @@