feat(dfx-orbit): dfx-orbitv0.3

Cargo.toml

@@ -38,8 +38,9 @@ candid = "0.10.3"
 candid_parser = "0.1.3"
 cap-std = "3.1.0"
 clap = { version = "4.5.7", features = ["derive"] }
-flate2 = "1.0"
+dateparser = "0.2"
 dfx-core = { git = "https://github.com/dfinity/sdk.git", tag = "0.22.0" }
+flate2 = "1.0"
 convert_case = "0.6"
 futures = "0.3"
 getrandom = { version = "0.2", features = ["custom"] }
@@ -81,6 +82,7 @@ slog-term = "2.9.0"
 strum = "0.26"
 strum_macros = "0.26"
 syn = { version = "2.0", features = ["extra-traits", "full"] }
+tabled = "0.16"
 tempfile = "3.10"
 thiserror = "1.0.48"
 time = { version = "0.3", features = ["formatting", "parsing"] }

tests/integration/Cargo.toml

@@ -22,6 +22,9 @@ rand_chacha = { workspace = true }
 reqwest = { workspace = true }
 sha2 = { workspace = true }
 serde = { workspace = true, features = ['derive'] }
+slog = { workspace = true }
+slog-async = { workspace = true }
+slog-term = { workspace = true }
 tempfile = { workspace = true }
 tokio.workspace = true
 uuid = { workspace = true }

tests/integration/src/dfx_orbit.rs

@@ -180,19 +180,26 @@ fn test_dfx_json_from_template(config: DfxOrbitTestConfig, port: u16) -> String
 
 /// Setup the station agent for the test
 async fn setup_dfx_orbit(station_id: Principal) -> DfxOrbit {
+    // Setup a logger with highest log level. Capture logging by test harness
+    use slog::Drain;
+    let decorator = slog_term::PlainDecorator::new(slog_term::TestStdoutWriter);
+    let drain = slog_term::FullFormat::new(decorator)
+        .build()
+        .filter_level(slog::Level::Trace)
+        .fuse();
+    let drain = slog_async::Async::new(drain).build().fuse();
+    let logger = slog::Logger::root(drain, slog::o!());
+
     let port = PORT.with(|port| *port.borrow());
 
     let orbit_agent = OrbitExtensionAgent::new().unwrap();
-    orbit_agent
-        .add_station(StationConfig {
-            name: String::from("Test"),
-            station_id,
-            network: String::from("test"),
-            url: format!("http://localhost:{}", port),
-        })
-        .unwrap();
-
-    DfxOrbit::new(orbit_agent).await.unwrap()
+    let config = StationConfig {
+        name: String::from("Test"),
+        station_id,
+        network: String::from("test"),
+        url: format!("http://localhost:{}", port),
+    };
+    DfxOrbit::new(orbit_agent, config, logger).await.unwrap()
 }
 
 /// Create the dfx user's identities and add them to the station

tools/dfx-orbit/Cargo.toml

@@ -18,16 +18,19 @@ serde.workspace = true
 serde_bytes.workspace = true
 serde_json.workspace = true
 cap-std.workspace = true
+dateparser.workspace = true
 dfx-core.workspace = true
 hex.workspace = true
 ic-agent.workspace = true
 ic-asset.workspace = true
 ic-certified-assets.workspace = true
 ic-utils.workspace = true
+itertools.workspace = true
 sha2.workspace = true
 slog.workspace = true
 slog-term.workspace = true
 slog-async.workspace = true
+tabled.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ['rt'] }
 station-api = { path = '../../core/station/api', version = '0.0.2-alpha.5' }

tools/dfx-orbit/src/args.rs

@@ -11,28 +11,37 @@ use review::ReviewArgs;
 use station::StationArgs;
 
 /// Manages Orbit on the Internet Computer.
-// TODO: Specify --station to not use the default station
 // TODO: Better version information
-// TODO: -v flag
 #[derive(Parser, Debug)]
-#[command(version, about, long_about = None)]
+#[clap(version, about, long_about = None)]
 pub struct DfxOrbitArgs {
+    /// Increase verbosity level
+    #[clap(short, long, action = clap::ArgAction::Count, conflicts_with = "quiet")]
+    pub(crate) verbose: u8,
+
+    /// Reduce verbosity level
+    #[clap(short, long, action = clap::ArgAction::Count, conflicts_with = "verbose")]
+    pub(crate) quiet: u8,
+
+    /// Name of the station to execute the command on. (Uses default station if unspecified)
+    #[clap(short, long)]
+    pub(crate) station: Option<String>,
+
     /// Manage Orbit stations.
-    #[command(subcommand)]
-    pub command: DfxOrbitSubcommands,
+    #[clap(subcommand)]
+    pub(crate) command: DfxOrbitSubcommands,
 }
 
 /// CLI commands for managing Orbit on the Internet Computer.
 #[derive(Debug, Subcommand)]
-#[command(version, about, long_about = None)]
+#[clap(version, about, long_about = None)]
 pub enum DfxOrbitSubcommands {
     /// Manage Orbit stations.
-    #[command(subcommand)]
+    #[clap(subcommand)]
     Station(StationArgs),
     /// Make requests to Orbit
     Request(RequestArgs),
     /// View and decide on requests.
-    #[command(subcommand)]
     Review(ReviewArgs),
     /// Manage assets stored in an asset canister through Orbit
     Asset(AssetArgs),

tools/dfx-orbit/src/args/asset.rs

@@ -3,9 +3,9 @@ use clap::{Parser, Subcommand};
 
 /// Station management commands.
 #[derive(Debug, Clone, Parser)]
-#[command(version, about, long_about = None)]
+#[clap(version, about, long_about = None)]
 pub struct AssetArgs {
-    #[command(subcommand)]
+    #[clap(subcommand)]
     pub(crate) action: AssetArgsAction,
 }
 
@@ -79,6 +79,6 @@ pub struct AssetCheckArgs {
     pub(crate) files: Vec<String>,
 
     /// Automatically approve the request, if the request's evidence matches the local evidence
-    #[clap(long)]
+    #[clap(short = 'a', long)]
     pub(crate) then_approve: bool,
 }