pick up new progenitor CLI interface (#545)

oxidecomputer · Feb 6, 2024 · e4359fb · e4359fb
1 parent bdde14a
commit e4359fb
Show file tree

Hide file tree

Showing 12 changed files with 2,214 additions and 1,979 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -34,6 +34,7 @@ open = { workspace = true }
 oxide = { workspace = true }
 predicates = { workspace = true }
 reqwest = { workspace = true, features = ["native-tls-vendored"] }
+schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tabwriter = { workspace = true }

diff --git a/cli/src/cli_builder.rs b/cli/src/cli_builder.rs
@@ -74,7 +74,7 @@ impl<'a> Default for NewCli<'a> {
             let Some(path) = xxx(op) else { continue };
             runner.add_cmd(path, GeneratedCmd(op));
 
-            let cmd = Cli::get_command(op);
+            let cmd = Cli::<OxideOverride>::get_command(op);
             let cmd = match op {
                 CliCommand::IpPoolRangeAdd
                 | CliCommand::IpPoolRangeRemove
@@ -245,9 +245,8 @@ struct GeneratedCmd(CliCommand);
 #[async_trait]
 impl RunIt for GeneratedCmd {
     async fn run_cmd(&self, matches: &ArgMatches, ctx: &Context) -> Result<()> {
-        let cli = Cli::new_with_override(ctx.client()?.clone(), OxideOverride);
-        cli.execute(self.0, matches).await;
-        Ok(())
+        let cli = Cli::new(ctx.client()?.clone(), OxideOverride::default());
+        cli.execute(self.0, matches).await
     }
 
     fn is_subtree(&self) -> bool {