ls-apis choking on the latest dpd-client (#7853)

Author: davepacheco

.github/buildomat/build-and-test.sh

@@ -70,7 +70,8 @@ banner ls-apis
     ptime -m cargo xtask ls-apis apis &&
         ptime -m cargo xtask ls-apis deployment-units &&
         ptime -m cargo xtask ls-apis servers &&
-        ptime -m cargo xtask ls-apis check
+        ptime -m cargo xtask ls-apis check && \
+	ptime -m cargo xtask ls-apis adoc > /dev/null
 )
 
 #

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

@@ -180,7 +180,7 @@ impl Workspaces {
             })
             .collect();
 
-        // TODO As of this writing, we have two distinct packages called
+        // TODO As of this writing, we have three distinct packages called
         // "dpd-client":
         //
         // - There's one in the "dendrite" repo.  This is used by:
@@ -189,6 +189,8 @@ impl Workspaces {
         //   - `ddm` (in Maghemite)
         //   - `ddmd` (in Maghemite)
         //   - `mgd` (via `mg-lower`) (in Maghemite)
+        // - There's one in the "lldpd" repo.  This is used by:
+        //   - `lldpd` (in lldpd)
         // - There's one in the "omicron" repo.  This is used by:
         //   - `wicketd` (in Omicron)
         //   - `omicron-sled-agent` (in Omicron)
@@ -211,12 +213,11 @@ impl Workspaces {
         //
         // To keep things working, we just have this function always report the
         // one in the Omicron repo.
-        if server_pkgname == "dpd-client" && found_in_workspaces.len() == 2 {
-            if found_in_workspaces[0].0.name() == "omicron" {
-                return Ok(found_in_workspaces[0]);
-            }
-            if found_in_workspaces[1].0.name() == "omicron" {
-                return Ok(found_in_workspaces[1]);
+        if server_pkgname == "dpd-client" && found_in_workspaces.len() == 3 {
+            if let Some(rv) =
+                found_in_workspaces.iter().find(|w| w.0.name() == "omicron")
+            {
+                return Ok(*rv);
             }
         }
         ensure!(