make check exhaustive

Author: sunshowers

dev-tools/ls-apis/api-manifest.toml

@@ -607,69 +607,83 @@ sled agent.
 [[localhost_only_edges]]
 server = "ddmd"
 client = "dpd-client"
-note = "still to verify: ddmd communicates with dendrite locally within the switch zone"
+note = "verified: sled-agent configures ddmd with dpd_host=[::1] (services.rs:3127)"
 
 [[localhost_only_edges]]
 server = "dpd"
 client = "gateway-client"
-note = "still to verify: dendrite communicates with MGS locally"
+note = "verified: dpd defaults to [::1]:MGS_PORT (dendrite switch_identifiers.rs:60)"
 
 [[localhost_only_edges]]
 server = "lldpd"
 client = "dpd-client"
-note = "still to verify: lldpd communicates with dendrite locally within the switch zone"
+note = "verified: lldpd defaults to localhost for dpd (lldp dendrite.rs:194)"
 
 [[localhost_only_edges]]
 server = "mgd"
 client = "ddm-admin-client"
-note = "still to verify: mgd communicates with ddmd locally within the switch zone"
+note = "verified: mg-lower hardcodes localhost:8000 (mg-lower ddm.rs:110)"
 
 [[localhost_only_edges]]
 server = "mgd"
 client = "dpd-client"
-note = "still to verify: mgd communicates with dendrite locally within the switch zone"
+note = "verified: mg-lower hardcodes localhost (mg-lower dendrite.rs:491)"
 
 [[localhost_only_edges]]
 server = "mgd"
 client = "gateway-client"
-note = "still to verify: mgd communicates with MGS locally"
+note = "verified: mgd defaults to [::1]:12225 (mgd main.rs:93)"
+
+# NOTE: The following sled-agent edges are BUGS - they use underlay IPs, not
+# localhost. They are kept here to avoid breaking the build, but need to be
+# fixed, either through client-side versioning or by some other means.
 
 [[localhost_only_edges]]
 server = "omicron-sled-agent"
 client = "gateway-client"
-note = "still to verify: sled-agent communicates with MGS locally"
+note = "BUG: uses underlay IP, not localhost (early_networking.rs:376)"
 
 [[localhost_only_edges]]
 server = "omicron-sled-agent"
 client = "ddm-admin-client"
-note = "still to verify: sled-agent communicates with ddmd locally"
+note = "verified: uses Client::localhost() (ddm_reconciler.rs:56)"
 
 [[localhost_only_edges]]
 server = "omicron-sled-agent"
 client = "dpd-client"
-note = "still to verify: sled-agent communicates with dendrite locally"
+note = "BUG: uses underlay IP, not localhost (services.rs:1090)"
 
 [[localhost_only_edges]]
 server = "omicron-sled-agent"
 client = "mg-admin-client"
-note = "still to verify: sled-agent communicates with mgd locally"
+note = "BUG: uses underlay IP, not localhost (early_networking.rs:483)"
 
 [[localhost_only_edges]]
 server = "omicron-sled-agent"
 client = "propolis-client"
-note = "still to verify: sled-agent communicates with propolis instances locally"
+note = "BUG: uses zone IP, not localhost (instance.rs:2283)"
 
 [[localhost_only_edges]]
 server = "tfportd"
 client = "dpd-client"
-note = "still to verify: tfportd communicates with dendrite locally within the switch zone"
+note = "verified: configured with dpd_host=[::1] (services.rs:2852)"
 
 [[localhost_only_edges]]
 server = "tfportd"
 client = "lldpd-client"
-note = "still to verify: tfportd communicates with lldpd locally within the switch zone"
+note = "verified: hardcodes localhost (tfportd tfport.rs:88)"
+
+[[localhost_only_edges]]
+server = "wicketd"
+client = "ddm-admin-client"
+note = "verified: uses DdmAdminClient::localhost() (bootstrap_addrs.rs:162)"
 
 [[localhost_only_edges]]
 server = "wicketd"
-client = "*"
-note = "still to verify: wicketd communicates with local services; enumerate specific clients later"
+client = "dpd-client"
+note = "verified: hardcodes [::1]:DENDRITE_PORT (preflight_check/uplink.rs:83)"
+
+[[localhost_only_edges]]
+server = "wicketd"
+client = "gateway-client"
+note = "verified: --mgs-address CLI expects localhost (bin/wicketd.rs:35)"

dev-tools/ls-apis/src/api_metadata.rs

@@ -203,25 +203,21 @@ impl TryFrom<RawApiMetadata> for AllApiMetadata {
 
         // Validate localhost_only_edges reference known server components and
         // APIs.
-        let known_components: BTreeSet<_> = deployment_units
-            .values()
-            .flat_map(|u| u.packages.iter())
-            .collect();
+        let known_components: BTreeSet<_> =
+            deployment_units.values().flat_map(|u| u.packages.iter()).collect();
         for edge in &raw.localhost_only_edges {
             if !known_components.contains(&edge.server) {
                 bail!(
                     "localhost_only_edges: unknown server component {:?}",
                     edge.server
                 );
             }
-            // Validate non-wildcard clients reference known APIs.
-            if let Some(client_name) = edge.client.as_specific() {
-                if !apis.contains_key(client_name) {
-                    bail!(
-                        "localhost_only_edges: unknown client {:?}",
-                        client_name
-                    );
-                }
+            let client_name = edge.client.as_specific();
+            if !apis.contains_key(client_name) {
+                bail!(
+                    "localhost_only_edges: unknown client {:?}",
+                    client_name
+                );
             }
         }
 
@@ -449,11 +445,9 @@ pub enum Evaluation {
     Dag,
 }
 
-/// Specifies which client(s) to match in a localhost-only edge rule.
+/// Specifies which client to match in a localhost-only edge rule.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum ClientMatcher {
-    /// Match all clients (represented as "*" in TOML).
-    Wildcard,
     /// Match a specific client package.
     Specific(ClientPackageName),
 }
@@ -464,28 +458,22 @@ impl<'de> Deserialize<'de> for ClientMatcher {
         D: serde::Deserializer<'de>,
     {
         let s = String::deserialize(deserializer)?;
-        if s == "*" {
-            Ok(ClientMatcher::Wildcard)
-        } else {
-            Ok(ClientMatcher::Specific(ClientPackageName::from(s)))
-        }
+        Ok(ClientMatcher::Specific(ClientPackageName::from(s)))
     }
 }
 
 impl ClientMatcher {
     /// Returns true if this matcher matches the given client package.
     pub fn matches(&self, client: &ClientPackageName) -> bool {
         match self {
-            ClientMatcher::Wildcard => true,
             ClientMatcher::Specific(name) => name == client,
         }
     }
 
-    /// Returns the specific client name, if not a wildcard.
-    pub fn as_specific(&self) -> Option<&ClientPackageName> {
+    /// Returns the specific client name.
+    pub fn as_specific(&self) -> &ClientPackageName {
         match self {
-            ClientMatcher::Wildcard => None,
-            ClientMatcher::Specific(name) => Some(name),
+            ClientMatcher::Specific(name) => name,
         }
     }
 }
@@ -498,7 +486,7 @@ impl ClientMatcher {
 pub struct LocalhostOnlyEdge {
     /// The server component that consumes the API.
     pub server: ServerComponentName,
-    /// The client package consumed, or "*" to match all clients.
+    /// The client package consumed.
     pub client: ClientMatcher,
     /// Explanation of why this edge is localhost-only.
     pub note: String,

dev-tools/ls-apis/src/bin/ls-apis.rs

@@ -253,7 +253,10 @@ fn print_server_components<'a>(
         }
         for (c, path) in apis.component_apis_consumed(s, filter)? {
             if let Some(note) = apis.localhost_only_edge_note(s, c) {
-                println!("{}    consumes: {} (localhost-only: {})", prefix, c, note);
+                println!(
+                    "{}    consumes: {} (localhost-only: {})",
+                    prefix, c, note
+                );
             } else {
                 println!("{}    consumes: {}", prefix, c);
             }