introduced non-interactive cmd arg instead - defaults to false

Author: zees-dev

forc-plugins/forc-node/src/chain_config.rs

@@ -14,7 +14,6 @@ use std::{
     collections::{HashMap, HashSet},
     fmt::Display,
     fs,
-    io::IsTerminal,
     path::PathBuf,
 };
 
@@ -71,28 +70,35 @@ pub struct ConfigFetcher {
     client: reqwest::Client,
     base_url: String,
     config_vault: PathBuf,
+    non_interactive: bool,
 }
 
 impl Default for ConfigFetcher {
     /// Creates a new fetcher to interact with github.
     /// By default user's chain configuration vault is at: `~/.forc/chainspecs`
     fn default() -> Self {
+        Self::new(false)
+    }
+}
+
+impl ConfigFetcher {
+    pub fn new(non_interactive: bool) -> Self {
         Self {
             client: reqwest::Client::new(),
             base_url: "https://api.github.com".to_string(),
             config_vault: user_forc_directory().join(CONFIG_FOLDER),
+            non_interactive,
         }
     }
-}
 
-impl ConfigFetcher {
     #[cfg(test)]
     /// Override the base url, to be used in tests.
     pub fn with_base_url(base_url: String) -> Self {
         Self {
             client: reqwest::Client::new(),
             base_url,
             config_vault: user_forc_directory().join(CONFIG_FOLDER),
+            non_interactive: false,
         }
     }
 
@@ -102,9 +108,14 @@ impl ConfigFetcher {
             client: reqwest::Client::new(),
             base_url,
             config_vault,
+            non_interactive: false,
         }
     }
 
+    fn non_interactive(&self) -> bool {
+        self.non_interactive
+    }
+
     fn get_base_url(&self) -> &str {
         &self.base_url
     }
@@ -294,7 +305,7 @@ async fn validate_local_chainconfig(fetcher: &ConfigFetcher) -> anyhow::Result<(
             "Local node configuration files are missing at {}",
             local_conf_dir.display()
         ));
-        let non_interactive = !std::io::stdout().is_terminal();
+        let non_interactive = fetcher.non_interactive();
         if non_interactive {
             println_action_green(
                 "Downloading",
@@ -335,7 +346,7 @@ async fn validate_remote_chainconfig(
         println_warning(&format!(
             "A network configuration update detected for {conf}, this might create problems while syncing with rest of the network"
         ));
-        let non_interactive = !std::io::stdout().is_terminal();
+        let non_interactive = fetcher.non_interactive();
         if non_interactive {
             println_action_green(
                 "Updating",
@@ -366,8 +377,11 @@ async fn validate_remote_chainconfig(
 /// Check local state of the configuration file in the vault (if they exists)
 /// and compare them to the remote one in github. If a change is detected asks
 /// user if they want to update, and does the update for them.
-pub async fn check_and_update_chain_config(conf: ChainConfig) -> anyhow::Result<()> {
-    let fetcher = ConfigFetcher::default();
+pub async fn check_and_update_chain_config(
+    conf: ChainConfig,
+    non_interactive: bool,
+) -> anyhow::Result<()> {
+    let fetcher = ConfigFetcher::new(non_interactive);
     match conf {
         ChainConfig::Local => validate_local_chainconfig(&fetcher).await?,
         remote_config => validate_remote_chainconfig(&fetcher, &remote_config).await?,

forc-plugins/forc-node/src/ignition/cmd.rs

@@ -10,6 +10,10 @@ pub struct IgnitionCmd {
     pub db_path: PathBuf,
     #[clap(long, default_value_t = MAINNET_BOOTSTRAP_NODE.to_string())]
     pub bootstrap_node: String,
+
+    /// Skip interactive prompts (intended for scripted/test environments).
+    #[clap(long, hide = true)]
+    pub non_interactive: bool,
 }
 
 fn default_ignition_db_path() -> PathBuf {

forc-plugins/forc-node/src/ignition/op.rs

@@ -19,7 +19,7 @@ use std::{
 /// Configures the node with ignition configuration to connect the node to latest mainnet.
 /// Returns `None` if this is a dry_run and no child process created for fuel-core.
 pub async fn run(cmd: IgnitionCmd, dry_run: bool) -> anyhow::Result<Option<Child>> {
-    check_and_update_chain_config(ChainConfig::Ignition).await?;
+    check_and_update_chain_config(ChainConfig::Ignition, cmd.non_interactive).await?;
     let keypair = if let (Some(peer_id), Some(secret)) = (
         &cmd.connection_settings.peer_id,
         &cmd.connection_settings.secret,

forc-plugins/forc-node/src/local/cmd.rs

@@ -57,6 +57,10 @@ pub struct LocalCmd {
     /// Block number to fork from (latest if not specified)
     #[clap(long, value_name = "BLOCK")]
     pub fork_block_number: Option<u32>,
+
+    /// Skip interactive prompts (intended for scripted/test environments).
+    #[clap(long, hide = true)]
+    pub non_interactive: bool,
 }
 
 fn get_coins_per_account(

forc-plugins/forc-node/src/local/mod.rs

@@ -20,7 +20,7 @@ use std::sync::Arc;
 /// By default, the node is in `debug` mode and the db used is `in-memory`.
 /// Returns `None` if this is a dry_run and no service created for fuel-core.
 pub async fn run(cmd: cmd::LocalCmd, dry_run: bool) -> anyhow::Result<Option<FuelService>> {
-    check_and_update_chain_config(ChainConfig::Local).await?;
+    check_and_update_chain_config(ChainConfig::Local, cmd.non_interactive).await?;
 
     let fork_url = cmd.fork_url.to_owned();
     let fork_block_number = cmd.fork_block_number;

forc-plugins/forc-node/src/testnet/cmd.rs

@@ -10,6 +10,10 @@ pub struct TestnetCmd {
     pub db_path: PathBuf,
     #[clap(long, default_value_t = TESTNET_BOOTSTRAP_NODE.to_string())]
     pub bootstrap_node: String,
+
+    /// Skip interactive prompts (intended for scripted/test environments).
+    #[clap(long, hide = true)]
+    pub non_interactive: bool,
 }
 
 fn default_testnet_db_path() -> PathBuf {

forc-plugins/forc-node/src/testnet/op.rs

@@ -20,7 +20,7 @@ use std::{
 /// Configures the node with testnet configuration to connect the node to latest testnet.
 /// Returns `None` if this is a dry_run and no child process created for fuel-core.
 pub async fn run(cmd: TestnetCmd, dry_run: bool) -> anyhow::Result<Option<Child>> {
-    check_and_update_chain_config(ChainConfig::Testnet).await?;
+    check_and_update_chain_config(ChainConfig::Testnet, cmd.non_interactive).await?;
     let keypair = if let (Some(peer_id), Some(secret)) = (
         &cmd.connection_settings.peer_id,
         &cmd.connection_settings.secret,

forc-plugins/forc-node/tests/local.rs

@@ -71,6 +71,7 @@ async fn run_node(fork_url: Option<String>) -> (FuelService, String) {
         poa_instant: true,
         fork_url,
         fork_block_number: None,
+        non_interactive: true,
     };
     let service = run(local_cmd, false).await.unwrap().unwrap();
     // Wait for node to start graphql service
@@ -511,6 +512,7 @@ async fn start_local_node_check_health() {
         poa_instant: false,
         fork_url: None,
         fork_block_number: None,
+        non_interactive: true,
     };
 
     let _service = run(local_cmd, false).await.unwrap().unwrap();