From 08dc4c3349df5df62fdd2850907bfc710a009239 Mon Sep 17 00:00:00 2001 From: "Andrew J. Stone" Date: Tue, 17 Oct 2023 20:19:53 +0000 Subject: [PATCH] fix failing builds --- sled-agent/Cargo.toml | 2 +- wicketd/src/rss_config.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 82d7411d1a..0bf4dfcb85 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -56,7 +56,7 @@ reqwest = { workspace = true, features = ["rustls-tls", "stream"] } schemars = { workspace = true, features = [ "chrono", "uuid1" ] } semver.workspace = true serde.workspace = true -serde_json.workspace = true +serde_json = {workspace = true, features = ["raw_value"]} sha3.workspace = true sled-agent-client.workspace = true sled-hardware.workspace = true diff --git a/wicketd/src/rss_config.rs b/wicketd/src/rss_config.rs index 35e9ef383e..a96acc56a0 100644 --- a/wicketd/src/rss_config.rs +++ b/wicketd/src/rss_config.rs @@ -453,7 +453,7 @@ impl From<&'_ CurrentRssConfig> for CurrentRssUserConfig { fn validate_rack_network_config( config: &RackNetworkConfig, -) -> Result { +) -> Result { use bootstrap_agent_client::types::BgpConfig as BaBgpConfig; use bootstrap_agent_client::types::BgpPeerConfig as BaBgpPeerConfig; use bootstrap_agent_client::types::PortConfigV1 as BaPortConfigV1; @@ -496,7 +496,7 @@ fn validate_rack_network_config( } // TODO Add more client side checks on `rack_network_config` contents? - Ok(bootstrap_agent_client::types::RackNetworkConfig { + Ok(bootstrap_agent_client::types::RackNetworkConfigV1 { rack_subnet: config.rack_subnet, infra_ip_first: config.infra_ip_first, infra_ip_last: config.infra_ip_last,