Move cli parser for sq key subkey delete to its own module.

src/cli/key/subkey.rs

@@ -26,6 +26,7 @@ use crate::cli::types::KeyDesignators;
 use crate::cli::types::cert_designator;
 
 pub mod add;
+pub mod delete;
 pub mod export;
 
 #[derive(Debug, Subcommand)]
@@ -44,113 +45,13 @@ and revoke them.",
 pub enum Command {
     Add(add::Command),
     Export(export::Command),
-    Delete(DeleteCommand),
+    Delete(delete::Command),
     Password(PasswordCommand),
     Expire(ExpireCommand),
     Revoke(RevokeCommand),
     Bind(BindCommand),
 }
 
-const SQ_KEY_SUBKEY_DELETE_EXAMPLES: Actions = Actions {
-    actions: &[
-        Action::Setup(Setup {
-            command: &[
-                "sq", "key", "import", "alice-secret.pgp",
-            ],
-        }),
-        Action::Example(Example {
-            comment: "\
-Delete Alice's signing subkey.",
-            command: &[
-                "sq", "key", "subkey", "delete",
-                "--cert=EB28F26E2739A4870ECC47726F0073F60FD0CBF0",
-                "--key=42020B87D51877E5AF8D272124F3955B0B8DECC8",
-            ],
-        }),
-    ]
-};
-test_examples!(sq_key_subkey_delete, SQ_KEY_SUBKEY_DELETE_EXAMPLES);
-
-#[derive(Debug, Args)]
-#[clap(
-    name = "delete",
-    about = "Delete a certificate's secret key material",
-    long_about = "\
-Delete a certificate's secret key material.
-
-Unlike `sq key delete`, which deletes all the secret key material, this \
-command only deletes the specified secret key material.
-
-Although the secret key material is deleted, the public keys are \
-retained.  If you don't want the keys to be used anymore you should \
-revoke the keys using `sq key subkey revoke`.
-",
-    after_help = SQ_KEY_SUBKEY_DELETE_EXAMPLES,
-)]
-pub struct DeleteCommand {
-    #[command(flatten)]
-    pub cert: CertDesignators<
-        cert_designator::CertUserIDEmailFileArgs,
-        cert_designator::NoPrefix,
-        cert_designator::OneValueAndFileRequiresOutput,
-        SubkeyDeleteDoc>,
-
-    #[clap(
-        long,
-        value_name = "FINGERPRINT|KEYID",
-        required = true,
-        help = "The keys to delete",
-        long_help = "\
-The keys to delete.
-
-The specified keys may be either the primary key or subkeys.
-
-If the secret key material is managed by multiple devices, it is \
-deleted from all of them.",
-    )]
-    pub key: Vec<KeyHandle>,
-
-    #[clap(
-        long,
-        value_name = FileOrStdout::VALUE_NAME,
-        conflicts_with = "cert",
-        help = "Write the stripped certificate to the specified file",
-        long_help = "\
-Write the stripped certificate to the specified file.
-
-This option only makes sense when deleting the secret key material from a \
-file.  When deleting secret key material managed by the key store using \
-`--cert`, you can get the stripped certificate using `sq key export`.",
-    )]
-    pub output: Option<FileOrStdout>,
-
-    #[clap(
-        long,
-        requires = "output",
-        help = "Emit binary data",
-    )]
-    pub binary: bool,
-}
-
-/// Documentation for the cert designators for the key subkey delete
-/// command.
-pub struct SubkeyDeleteDoc {}
-
-impl cert_designator::AdditionalDocs for SubkeyDeleteDoc {
-    fn help(arg: &'static str, help: &'static str) -> clap::builder::StyledStr {
-        match arg {
-            "file" =>
-                "Delete the secret key material from the key read from PATH"
-                .into(),
-            _ => {
-                debug_assert!(help.starts_with("Use certificates"));
-                help.replace("Use certificates",
-                             "Delete secret key material from the key")
-            },
-        }.into()
-    }
-}
-
 const SQ_KEY_SUBKEY_PASSWORD_EXAMPLES: Actions = Actions {
     actions: &[
         Action::Setup(Setup {

src/cli/key/subkey/delete.rs

@@ -0,0 +1,113 @@
+use clap::Args;
+
+use sequoia_openpgp as openpgp;
+use openpgp::KeyHandle;
+
+use crate::cli::examples;
+use examples::Action;
+use examples::Actions;
+use examples::Example;
+use examples::Setup;
+
+use crate::cli::types::CertDesignators;
+use crate::cli::types::ClapData;
+use crate::cli::types::FileOrStdout;
+use crate::cli::types::cert_designator;
+
+pub struct AdditionalDocs {}
+
+impl cert_designator::AdditionalDocs for AdditionalDocs {
+    fn help(arg: &'static str, help: &'static str) -> clap::builder::StyledStr {
+        match arg {
+            "file" =>
+                "Delete the secret key material from the key read from PATH"
+                .into(),
+            _ => {
+                debug_assert!(help.starts_with("Use certificates"));
+                help.replace("Use certificates",
+                             "Delete secret key material from the key")
+            },
+        }.into()
+    }
+}
+
+#[derive(Debug, Args)]
+#[clap(
+    name = "delete",
+    about = "Delete a certificate's secret key material",
+    long_about = "\
+Delete a certificate's secret key material.
+
+Unlike `sq key delete`, which deletes all the secret key material, this \
+command only deletes the specified secret key material.
+
+Although the secret key material is deleted, the public keys are \
+retained.  If you don't want the keys to be used anymore you should \
+revoke the keys using `sq key subkey revoke`.
+",
+    after_help = EXAMPLES,
+)]
+pub struct Command {
+    #[command(flatten)]
+    pub cert: CertDesignators<
+        cert_designator::CertUserIDEmailFileArgs,
+        cert_designator::NoPrefix,
+        cert_designator::OneValueAndFileRequiresOutput,
+        AdditionalDocs>,
+
+    #[clap(
+        long,
+        value_name = "FINGERPRINT|KEYID",
+        required = true,
+        help = "The keys to delete",
+        long_help = "\
+The keys to delete.
+
+The specified keys may be either the primary key or subkeys.
+
+If the secret key material is managed by multiple devices, it is \
+deleted from all of them.",
+    )]
+    pub key: Vec<KeyHandle>,
+
+    #[clap(
+        long,
+        value_name = FileOrStdout::VALUE_NAME,
+        conflicts_with = "cert",
+        help = "Write the stripped certificate to the specified file",
+        long_help = "\
+Write the stripped certificate to the specified file.
+
+This option only makes sense when deleting the secret key material from a \
+file.  When deleting secret key material managed by the key store using \
+`--cert`, you can get the stripped certificate using `sq key export`.",
+    )]
+    pub output: Option<FileOrStdout>,
+
+    #[clap(
+        long,
+        requires = "output",
+        help = "Emit binary data",
+    )]
+    pub binary: bool,
+}
+
+const EXAMPLES: Actions = Actions {
+    actions: &[
+        Action::Setup(Setup {
+            command: &[
+                "sq", "key", "import", "alice-secret.pgp",
+            ],
+        }),
+        Action::Example(Example {
+            comment: "\
+Delete Alice's signing subkey.",
+            command: &[
+                "sq", "key", "subkey", "delete",
+                "--cert=EB28F26E2739A4870ECC47726F0073F60FD0CBF0",
+                "--key=42020B87D51877E5AF8D272124F3955B0B8DECC8",
+            ],
+        }),
+    ]
+};
+test_examples!(sq_key_subkey_delete, EXAMPLES);

src/commands/key/subkey.rs

@@ -21,7 +21,7 @@ use openpgp::Result;
 use crate::Sq;
 use crate::cli::key::subkey::Command;
 use crate::cli::key::subkey::add::Command as AddCommand;
-use crate::cli::key::subkey::DeleteCommand;
+use crate::cli::key::subkey::delete::Command as DeleteCommand;
 use crate::cli::key::subkey::ExpireCommand;
 use crate::cli::key::subkey::export::Command as ExportCommand;
 use crate::cli::key::subkey::PasswordCommand;