more client cleanup

oxidecomputer · May 24, 2024 · 4715fb5 · 4715fb5
1 parent 7a69ee5
commit 4715fb5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/clients/bootstrap-agent-client/src/lib.rs b/clients/bootstrap-agent-client/src/lib.rs
@@ -24,7 +24,6 @@ progenitor::generate_api!(
     replace = {
         AllowedSourceIps = omicron_common::api::external::AllowedSourceIps,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
-        IpAllowList = omicron_common::api::external::IpAllowList,
     }
 );
 

diff --git a/clients/gateway-client/src/lib.rs b/clients/gateway-client/src/lib.rs
@@ -50,15 +50,15 @@ progenitor::generate_api!(
     }),
     derives = [schemars::JsonSchema],
     patch = {
-        HostPhase2RecoveryImageId = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
-        ImageVersion = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
-        RotImageDetails = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
-        RotSlot = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
-        RotState = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
+        HostPhase2RecoveryImageId = { derives = [PartialEq, Eq, PartialOrd, Ord] },
+        ImageVersion = { derives = [PartialEq, Eq, PartialOrd, Ord] },
+        RotImageDetails = { derives = [PartialEq, Eq, PartialOrd, Ord] },
+        RotSlot = { derives = [PartialEq, Eq, PartialOrd, Ord] },
+        RotState = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         SpIdentifier = { derives = [Copy, PartialEq, Hash, Eq] },
         SpIgnition = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         SpIgnitionSystemType = { derives = [Copy, PartialEq, Eq, PartialOrd, Ord] },
-        SpState = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
+        SpState = { derives = [PartialEq, Eq, PartialOrd, Ord] },
     },
 );
 

diff --git a/clients/sled-agent-client/src/lib.rs b/clients/sled-agent-client/src/lib.rs
@@ -16,7 +16,7 @@ use uuid::Uuid;
 
 progenitor::generate_api!(
     spec = "../../openapi/sled-agent.json",
-    derives = [ schemars::JsonSchema, PartialEq ],
+    derives = [schemars::JsonSchema, PartialEq],
     inner_type = slog::Logger,
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {
         slog::debug!(log, "client request";
@@ -29,13 +29,13 @@ progenitor::generate_api!(
         slog::debug!(log, "client response"; "result" => ?result);
     }),
     patch = {
-        BfdPeerConfig = { derives = [PartialEq, Eq, Hash] },
-        BgpConfig = { derives = [PartialEq, Eq, Hash] },
-        BgpPeerConfig = { derives = [PartialEq, Eq, Hash] },
-        OmicronPhysicalDiskConfig = { derives = [PartialEq, Eq, Hash, PartialOrd, Ord] },
-        PortConfigV1 = { derives = [PartialEq, Eq, Hash] },
-        RouteConfig = { derives = [PartialEq, Eq, Hash] },
-        VirtualNetworkInterfaceHost = { derives = [PartialEq, Eq, Hash] },
+        BfdPeerConfig = { derives = [Eq, Hash] },
+        BgpConfig = { derives = [Eq, Hash] },
+        BgpPeerConfig = { derives = [Eq, Hash] },
+        OmicronPhysicalDiskConfig = { derives = [Eq, Hash, PartialOrd, Ord] },
+        PortConfigV1 = { derives = [Eq, Hash] },
+        RouteConfig = { derives = [Eq, Hash] },
+        VirtualNetworkInterfaceHost = { derives = [Eq, Hash] },
     },
     crates = {
         "oxnet" = "0.1.0",