Move submitter code to separate module.

rs/cli/src/commands/api_boundary_nodes/add.rs

@@ -3,7 +3,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     ic_admin::{self},
 };
 

rs/cli/src/commands/api_boundary_nodes/remove.rs

@@ -3,7 +3,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     ic_admin::{self},
 };
 

rs/cli/src/commands/api_boundary_nodes/update.rs

@@ -3,7 +3,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     ic_admin::{self},
 };
 

rs/cli/src/commands/firewall.rs

@@ -14,9 +14,10 @@ use tempfile::NamedTempFile;
 
 use crate::{
     ctx::DreContext,
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::ForumPostKind,
     ic_admin::{IcAdminProposal, IcAdminProposalCommand, IcAdminProposalOptions},
     proposal_executors::{ProducesProposalResult, ProposalResponseWithId, RunnableViaIcAdmin},
+    submitter::{SubmissionParameters, Submitter},
 };
 
 use super::{AuthRequirement, ExecutableCommand};

rs/cli/src/commands/governance/propose/motion.rs

@@ -6,7 +6,7 @@ use tokio::io::AsyncReadExt;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     util::{extract_title_and_text, utf8},
 };
 

rs/cli/src/commands/hostos/rollout.rs

@@ -3,7 +3,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Args, Debug)]

rs/cli/src/commands/hostos/rollout_from_node_group.rs

@@ -4,7 +4,7 @@ use clap::{Args, ValueEnum};
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     operations::hostos_rollout::{NodeGroupUpdate, NumberOfNodes},
 };
 

rs/cli/src/commands/network.rs

@@ -3,7 +3,7 @@ use itertools::Itertools;
 use log::info;
 
 use crate::{
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     ic_admin::IcAdminProposal,
 };
 

rs/cli/src/commands/nodes/remove.rs

@@ -3,7 +3,7 @@ use decentralization::subnets::NodesRemover;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Args, Debug)]

rs/cli/src/commands/propose.rs

@@ -1,8 +1,9 @@
 use clap::{error::ErrorKind, Args};
 
 use crate::{
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::ForumPostKind,
     ic_admin::{IcAdminProposal, IcAdminProposalCommand},
+    submitter::{SubmissionParameters, Submitter},
 };
 
 use super::{AuthRequirement, ExecutableCommand};

rs/cli/src/commands/subnet/create.rs

@@ -5,7 +5,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Args, Debug)]

rs/cli/src/commands/subnet/deploy.rs

@@ -5,7 +5,7 @@ use ic_types::PrincipalId;
 use crate::{
     auth::get_automation_neuron_default_path,
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Args, Debug)]

rs/cli/src/commands/subnet/replace.rs

@@ -3,10 +3,10 @@ use clap::{error::ErrorKind, Args};
 use ic_types::PrincipalId;
 use itertools::Itertools;
 
-use crate::forum::{ForumPostKind, SubmissionParameters};
+use crate::forum::ForumPostKind;
+use crate::submitter::{SubmissionParameters, Submitter};
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::Submitter,
     subnet_manager::SubnetTarget,
 };
 

rs/cli/src/commands/subnet/rescue.rs

@@ -4,7 +4,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Args, Debug)]

rs/cli/src/commands/subnet/resize.rs

@@ -5,7 +5,7 @@ use ic_types::PrincipalId;
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Args, Debug)]

rs/cli/src/commands/update_authorized_subnets.rs

@@ -10,7 +10,7 @@ use itertools::Itertools;
 use log::info;
 
 use crate::{
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
     ic_admin::{IcAdminProposal, IcAdminProposalCommand, IcAdminProposalOptions},
 };
 

rs/cli/src/commands/update_unassigned_nodes.rs

@@ -4,7 +4,8 @@ use clap::Args;
 use ic_canisters::registry::RegistryCanisterWrapper;
 use ic_types::PrincipalId;
 
-use crate::forum::{ForumPostKind, SubmissionParameters, Submitter};
+use crate::forum::ForumPostKind;
+use crate::submitter::{SubmissionParameters, Submitter};
 
 use super::{AuthRequirement, ExecutableCommand};
 

rs/cli/src/commands/version/revise/guest_os.rs

@@ -2,7 +2,7 @@ use clap::{error::ErrorKind, Args};
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Debug, Args)]

rs/cli/src/commands/version/revise/host_os.rs

@@ -2,7 +2,7 @@ use clap::{error::ErrorKind, Args};
 
 use crate::{
     commands::{AuthRequirement, ExecutableCommand},
-    forum::{ForumPostKind, SubmissionParameters, Submitter},
+    forum::{ForumPostKind}, submitter::{SubmissionParameters, Submitter},
 };
 
 #[derive(Debug, Args)]

rs/cli/src/forum/mod.rs

@@ -3,19 +3,12 @@ use std::{path::PathBuf, str::FromStr};
 use clap::Args as ClapArgs;
 use futures::future::BoxFuture;
 use ic_types::PrincipalId;
-use log::warn;
 use mockall::automock;
 
-use crate::{
-    confirm::{ConfirmationModeOptions, HowToProceed},
-    proposal_executors::ProposalExecution,
-    util::yesno,
-};
-
 mod impls;
 
 #[derive(Debug, Clone)]
-pub enum ForumPostLinkVariant {
+pub(crate) enum ForumPostLinkVariant {
     Url(url::Url),
     ManageOnDiscourse,
     Ask,
@@ -120,15 +113,6 @@ impl ForumParameters {
     }
 }
 
-#[derive(ClapArgs, Debug, Clone)]
-pub struct SubmissionParameters {
-    #[clap(flatten)]
-    pub forum_parameters: ForumParameters,
-
-    #[clap(flatten)]
-    pub confirmation_mode: ConfirmationModeOptions,
-}
-
 // FIXME: this should become part of a new composite trait
 // that builds on the ProducesProposalResults trait,
 // so that we don't have to have a separate kind here, this just
@@ -158,7 +142,7 @@ pub trait ForumPost: Sync + Send {
 }
 
 #[derive(Clone)]
-struct ForumContext {
+pub struct ForumContext {
     forum_opts: ForumParameters,
 }
 
@@ -168,11 +152,6 @@ impl ForumContext {
         Self { forum_opts }
     }
 
-    // FIXME: turn into impl From.
-    fn from_opts(opts: &ForumParameters) -> Self {
-        Self::new(opts.clone())
-    }
-
     pub fn client(&self) -> anyhow::Result<Box<dyn ForumPostHandler>> {
         match &self.forum_opts.forum_post_link {
             ForumPostLinkVariant::Url(u) => Ok(Box::new(impls::UserSuppliedLink { url: Some(u.clone()) }) as Box<dyn ForumPostHandler>),
@@ -183,57 +162,8 @@ impl ForumContext {
     }
 }
 
-/// Helps the caller preview and then submit a proposal automatically,
-/// handling the forum post part of the work as smoothly as possible.
-pub struct Submitter {
-    mode: HowToProceed,
-    forum_parameters: ForumParameters,
-}
-
-impl From<&SubmissionParameters> for Submitter {
-    fn from(other: &SubmissionParameters) -> Self {
-        Self {
-            mode: (&other.confirmation_mode).into(),
-            forum_parameters: other.forum_parameters.clone(),
-        }
-    }
-}
-
-impl Submitter {
-    /// Submits a proposal (maybe in dry-run mode) with confirmation from the user, unless the user
-    /// specifies in the command line that he wants no confirmation (--yes).
-    pub async fn propose(&self, execution: Box<dyn ProposalExecution>, kind: ForumPostKind) -> anyhow::Result<()> {
-        if let HowToProceed::Unconditional = self.mode {
-        } else {
-            execution.simulate().await?;
-        };
-
-        if let HowToProceed::Confirm = self.mode {
-            // Ask for confirmation
-            if !yesno("Do you want to continue?", false).await?? {
-                return Ok(());
-            }
-        }
-
-        if let HowToProceed::DryRun = self.mode {
-            Ok(())
-        } else {
-            let forum_post = ForumContext::from_opts(&self.forum_parameters).client()?.forum_post(kind).await?;
-            let res = execution.submit(forum_post.url()).await;
-            match res {
-                Ok(res) => forum_post.add_proposal_url(res.into()).await,
-                Err(e) => {
-                    if let Some(forum_post_url) = forum_post.url() {
-                        // Here we would ask the forum post code to delete the post since
-                        // the submission has failed... that is, if we had that feature.
-                        warn!(
-                        "Forum post {} may have been created for this proposal, but proposal submission failed.  Please delete the forum post if necessary, as it now serves no purpose.",
-                        forum_post_url
-                    );
-                    };
-                    Err(e)
-                }
-            }
-        }
+impl From<&ForumParameters> for ForumContext {
+    fn from(p: &ForumParameters) -> Self {
+        Self::new(p.clone())
     }
 }

rs/cli/src/lib.rs

@@ -13,5 +13,6 @@ mod proposal_executors;
 mod qualification;
 mod runner;
 mod store;
+mod submitter;
 mod subnet_manager;
 mod util;

rs/cli/src/main.rs

@@ -21,6 +21,7 @@ mod proposal_executors;
 mod qualification;
 mod runner;
 mod store;
+mod submitter;
 mod subnet_manager;
 #[cfg(test)]
 mod unit_tests;

rs/cli/src/submitter.rs

@@ -0,0 +1,73 @@
+use clap::Args as ClapArgs;
+use log::warn;
+
+use crate::{
+    confirm::{ConfirmationModeOptions, HowToProceed},
+    forum::{ForumContext, ForumParameters, ForumPostKind},
+    proposal_executors::ProposalExecution,
+    util::yesno,
+};
+
+#[derive(ClapArgs, Debug, Clone)]
+pub struct SubmissionParameters {
+    #[clap(flatten)]
+    pub forum_parameters: ForumParameters,
+
+    #[clap(flatten)]
+    pub confirmation_mode: ConfirmationModeOptions,
+}
+
+/// Helps the caller preview and then submit a proposal automatically,
+/// handling the forum post part of the work as smoothly as possible.
+pub struct Submitter {
+    mode: HowToProceed,
+    forum_parameters: ForumParameters,
+}
+
+impl From<&SubmissionParameters> for Submitter {
+    fn from(other: &SubmissionParameters) -> Self {
+        Self {
+            mode: (&other.confirmation_mode).into(),
+            forum_parameters: other.forum_parameters.clone(),
+        }
+    }
+}
+
+impl Submitter {
+    /// Submits a proposal (maybe in dry-run mode) with confirmation from the user, unless the user
+    /// specifies in the command line that he wants no confirmation (--yes).
+    pub async fn propose(&self, execution: Box<dyn ProposalExecution>, kind: ForumPostKind) -> anyhow::Result<()> {
+        if let HowToProceed::Unconditional = self.mode {
+        } else {
+            execution.simulate().await?;
+        };
+
+        if let HowToProceed::Confirm = self.mode {
+            // Ask for confirmation
+            if !yesno("Do you want to continue?", false).await?? {
+                return Ok(());
+            }
+        }
+
+        if let HowToProceed::DryRun = self.mode {
+            Ok(())
+        } else {
+            let forum_post = ForumContext::from(&self.forum_parameters).client()?.forum_post(kind).await?;
+            let res = execution.submit(forum_post.url()).await;
+            match res {
+                Ok(res) => forum_post.add_proposal_url(res.into()).await,
+                Err(e) => {
+                    if let Some(forum_post_url) = forum_post.url() {
+                        // Here we would ask the forum post code to delete the post since
+                        // the submission has failed... that is, if we had that feature.
+                        warn!(
+                        "Forum post {} may have been created for this proposal, but proposal submission failed.  Please delete the forum post if necessary, as it now serves no purpose.",
+                        forum_post_url
+                    );
+                    };
+                    Err(e)
+                }
+            }
+        }
+    }
+}

rs/cli/src/unit_tests/update_unassigned_nodes.rs

@@ -5,8 +5,9 @@ use crate::auth::Neuron;
 use crate::commands::{update_unassigned_nodes::UpdateUnassignedNodes, ExecutableCommand};
 use crate::confirm::ConfirmationModeOptions;
 use crate::cordoned_feature_fetcher::MockCordonedFeatureFetcher;
-use crate::forum::{ForumParameters, SubmissionParameters};
+use crate::forum::ForumParameters;
 use crate::ic_admin::MockIcAdmin;
+use crate::submitter::SubmissionParameters;
 use ic_management_backend::health::MockHealthStatusQuerier;
 use ic_management_backend::{lazy_git::MockLazyGit, lazy_registry::MockLazyRegistry, proposal::MockProposalAgent};
 use ic_management_types::{Network, Subnet};