[2/3 sled-agent] move some common types into their own crate

Cargo.toml

@@ -73,6 +73,7 @@ members = [
     "passwords",
     "rpaths",
     "sled-agent",
+    "sled-agent/types",
     "sled-hardware",
     "sled-hardware/types",
     "sled-storage",
@@ -170,6 +171,7 @@ default-members = [
     "passwords",
     "rpaths",
     "sled-agent",
+    "sled-agent/types",
     "sled-hardware",
     "sled-hardware/types",
     "sled-storage",
@@ -472,6 +474,7 @@ similar-asserts = "1.5.0"
 # server zones.
 sled = "=0.34.7"
 sled-agent-client = { path = "clients/sled-agent-client" }
+sled-agent-types = { path = "sled-agent/types" }
 sled-hardware = { path = "sled-hardware" }
 sled-hardware-types = { path = "sled-hardware/types" }
 sled-storage = { path = "sled-storage" }

end-to-end-tests/Cargo.toml

@@ -23,6 +23,7 @@ russh = "0.43.0"
 russh-keys = "0.43.0"
 serde.workspace = true
 serde_json.workspace = true
+sled-agent-types.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 toml.workspace = true
 trust-dns-resolver.workspace = true

end-to-end-tests/src/helpers/ctx.rs

@@ -1,14 +1,14 @@
 use crate::helpers::generate_name;
 use anyhow::{anyhow, Context as _, Result};
 use chrono::Utc;
-use omicron_sled_agent::rack_setup::config::SetupServiceConfig;
 use omicron_test_utils::dev::poll::{wait_for_condition, CondCheckError};
 use oxide_client::types::{Name, ProjectCreate};
 use oxide_client::CustomDnsResolver;
 use oxide_client::{Client, ClientImagesExt, ClientProjectsExt, ClientVpcsExt};
 use reqwest::dns::Resolve;
 use reqwest::header::{HeaderMap, HeaderValue};
 use reqwest::Url;
+use sled_agent_types::rack_init::RackInitializeRequest;
 use std::net::IpAddr;
 use std::net::SocketAddr;
 use std::sync::Arc;
@@ -73,23 +73,23 @@ impl Context {
     }
 }
 
-fn rss_config() -> Result<SetupServiceConfig> {
+fn rss_config() -> Result<RackInitializeRequest> {
     let path = "/opt/oxide/sled-agent/pkg/config-rss.toml";
     let content =
         std::fs::read_to_string(&path).unwrap_or(RSS_CONFIG_STR.to_string());
     toml::from_str(&content)
         .with_context(|| "parsing config-rss as TOML".to_string())
 }
 
-fn nexus_external_dns_name(config: &SetupServiceConfig) -> String {
+fn nexus_external_dns_name(config: &RackInitializeRequest) -> String {
     format!(
         "{}.sys.{}",
         config.recovery_silo.silo_name.as_str(),
         config.external_dns_zone_name
     )
 }
 
-fn external_dns_addr(config: &SetupServiceConfig) -> Result<SocketAddr> {
+fn external_dns_addr(config: &RackInitializeRequest) -> Result<SocketAddr> {
     // From the RSS config, grab the first address from the configured services
     // IP pool as the DNS server's IP address.
     let dns_ip = config
@@ -138,7 +138,7 @@ pub async fn nexus_addr() -> Result<IpAddr> {
 }
 
 pub struct ClientParams {
-    rss_config: SetupServiceConfig,
+    rss_config: RackInitializeRequest,
     nexus_dns_name: String,
     resolver: Arc<CustomDnsResolver>,
     proto: &'static str,

openapi/sled-agent.json

@@ -2658,7 +2658,7 @@
         ]
       },
       "EarlyNetworkConfig": {
-        "description": "Network configuration required to bring up the control plane\n\nThe fields in this structure are those from [`super::params::RackInitializeRequest`] necessary for use beyond RSS. This is just for the initial rack configuration and cold boot purposes. Updates come from Nexus.",
+        "description": "Network configuration required to bring up the control plane\n\nThe fields in this structure are those from [`crate::rack_init::RackInitializeRequest`] necessary for use beyond RSS. This is just for the initial rack configuration and cold boot purposes. Updates come from Nexus.",
         "type": "object",
         "properties": {
           "body": {

sled-agent/Cargo.toml

@@ -68,6 +68,7 @@ serde_human_bytes.workspace = true
 serde_json = { workspace = true, features = ["raw_value"] }
 sha3.workspace = true
 sled-agent-client.workspace = true
+sled-agent-types.workspace = true
 sled-hardware.workspace = true
 sled-hardware-types.workspace = true
 sled-storage.workspace = true

sled-agent/src/bin/sled-agent.rs

@@ -11,8 +11,8 @@ use omicron_common::cmd::fatal;
 use omicron_common::cmd::CmdError;
 use omicron_sled_agent::bootstrap::server as bootstrap_server;
 use omicron_sled_agent::bootstrap::RssAccessError;
-use omicron_sled_agent::rack_setup::config::SetupServiceConfig as RssConfig;
 use omicron_sled_agent::{config::Config as SledConfig, server as sled_server};
+use sled_agent_types::rack_init::RackInitializeRequest;
 
 #[derive(Subcommand, Debug)]
 enum OpenapiFlavor {
@@ -81,7 +81,7 @@ async fn do_run() -> Result<(), CmdError> {
             };
             let rss_config = if rss_config_path.exists() {
                 Some(
-                    RssConfig::from_file(rss_config_path)
+                    RackInitializeRequest::from_file(rss_config_path)
                         .map_err(|e| CmdError::Failure(anyhow!(e)))?,
                 )
             } else {