Use the omicron-zone-package methods for topo sorting (#1099)

I moved this logic (and tested it) in `omicron-zone-package`: oxidecomputer/omicron-package#57

This PR uses that version, to simplify how much logic Crucible needs to know

Author: smklein

Cargo.lock

@@ -62,7 +62,7 @@ nix = { version = "0.26", features = [ "feature", "uio" ] }
 num_enum = "0.7"
 num-derive = "0.4"
 num-traits = "0.2"
-omicron-zone-package = "0.9.1"
+omicron-zone-package = "0.10.0"
 openapiv3 = "2.0.0"
 opentelemetry = "0.21.0"
 opentelemetry-jaeger = { version = "0.17.0" }
@@ -97,7 +97,6 @@ tokio-rustls = { version = "0.24.1" }
 tokio-test = "*"
 tokio-util = { version = "0.7", features = ["codec"]}
 toml = "0.8"
-topological-sort = "0.2.2"
 tracing = "0.1"
 tracing-opentelemetry = "0.18.0"
 tracing-subscriber = "0.3.18"

Cargo.toml

@@ -7,5 +7,4 @@ edition = "2021"
 anyhow.workspace = true
 omicron-zone-package.workspace = true
 tokio.workspace = true
-topological-sort.workspace = true
 crucible-workspace-hack.workspace = true

package/Cargo.toml

@@ -1,13 +1,10 @@
 // Copyright 2022 Oxide Computer Company
 
-use anyhow::{bail, Result};
+use anyhow::Result;
 use omicron_zone_package::config;
-use omicron_zone_package::package::{PackageOutput, PackageSource};
 use omicron_zone_package::target::Target;
-use std::collections::BTreeMap;
 use std::fs::create_dir_all;
 use std::path::Path;
-use topological_sort::TopologicalSort;
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -16,61 +13,14 @@ async fn main() -> Result<()> {
     let output_dir = Path::new("out");
     create_dir_all(output_dir)?;
 
-    // Reverse lookup of "output" -> "package creating this output".
-    let all_packages = cfg
-        .packages
-        .iter()
-        .map(|(name, package)| (package.get_output_file(name), (name, package)))
-        .collect::<BTreeMap<_, _>>();
-
-    // Collect all packages, and sort them in dependency order,
-    // so we know which ones to build first.
-    let mut outputs = TopologicalSort::<String>::new();
-    for (package_output, (_, package)) in &all_packages {
-        match &package.source {
-            PackageSource::Local { .. }
-            | PackageSource::Prebuilt { .. }
-            | PackageSource::Manual => {
-                // Skip intermediate leaf packages; if necessary they'll be
-                // added to the dependency graph by whatever composite package
-                // actually depends on them.
-                if !matches!(
-                    package.output,
-                    PackageOutput::Zone {
-                        intermediate_only: true
-                    }
-                ) {
-                    outputs.insert(package_output);
-                }
-            }
-            PackageSource::Composite { packages: deps } => {
-                for dep in deps {
-                    outputs.add_dependency(dep, package_output);
-                }
-            }
-        }
-    }
-
-    while !outputs.is_empty() {
-        let batch = outputs.pop_all();
-        assert!(
-            !batch.is_empty() || outputs.is_empty(),
-            "cyclic dependency in package manifest!"
-        );
-
-        for output in &batch {
-            println!("Creating '{output}'");
-
-            let Some((name, package)) = all_packages.get(output) else {
-                bail!(
-                    "Cannot find a package to create output: '{output}' \n\
-                     \tThis can happen when building a composite package, where one of \n\
-                     \tthe 'source.packages' has not been found."
-                );
-            };
+    let packages = cfg.packages_to_deploy(&Target::default());
+    let package_iter = packages.build_order();
 
+    for batch in package_iter {
+        for (name, package) in &batch {
+            println!("Building '{name}'");
             package
-                .create_for_target(&Target::default(), &name, output_dir)
+                .create_for_target(&Target::default(), name, output_dir)
                 .await?;
         }
     }