refactor(crypto): Rename sign command to crypto

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.showUnlinkedFileNotification": false
+}

Cargo.toml

@@ -55,14 +55,14 @@ build-data = "0.1.5"
 windows_exe_info = { version = "0.4.1", features = ["manifest"] }
 
 [features]
-default = ["dyndns", "sign", "tamanu", "upload"]
+default = ["dyndns", "crypto", "tamanu", "upload"]
 
 ## Common dep groups (not meant to be used directly)
 aws = ["dep:aws-config", "dep:aws-credential-types", "dep:aws-sdk-route53", "dep:aws-sdk-s3", "dep:aws-sdk-sts"]
 
 ## Subcommands
 dyndns = ["aws", "dep:local-ip-address", "dep:ip_network"]
-sign = ["dep:hex", "dep:leon", "dep:minisign"]
+crypto = ["dep:hex", "dep:leon", "dep:minisign"]
 tamanu = ["dep:leon", "dep:leon-macros"]
 upload = ["aws"]
 wifisetup = ["dep:networkmanager"]

src/actions.rs

@@ -11,8 +11,8 @@ pub mod completions;
 pub mod context;
 #[cfg(feature = "dyndns")]
 pub mod dyndns;
-#[cfg(feature = "sign")]
-pub mod sign;
+#[cfg(feature = "crypto")]
+pub mod crypto;
 #[cfg(feature = "tamanu")]
 pub mod tamanu;
 #[cfg(feature = "upload")]
@@ -25,8 +25,8 @@ pub enum Action {
 	Completions(completions::CompletionsArgs),
 	#[cfg(feature = "dyndns")]
 	Dyndns(dyndns::DyndnsArgs),
-	#[cfg(feature = "sign")]
-	Sign(sign::SignArgs),
+	#[cfg(feature = "crypto")]
+	Crypto(crypto::CryptoArgs),
 	#[cfg(feature = "tamanu")]
 	Tamanu(tamanu::TamanuArgs),
 	#[cfg(feature = "upload")]
@@ -44,8 +44,8 @@ pub async fn run() -> Result<()> {
 		(Action::Completions(args), ctx) => completions::run(ctx.with_top(args)).await,
 		#[cfg(feature = "dyndns")]
 		(Action::Dyndns(args), ctx) => dyndns::run(ctx.with_top(args)).await,
-		#[cfg(feature = "sign")]
-		(Action::Sign(args), ctx) => sign::run(ctx.with_top(args)).await,
+		#[cfg(feature = "crypto")]
+		(Action::Crypto(args), ctx) => crypto::run(ctx.with_top(args)).await,
 		#[cfg(feature = "tamanu")]
 		(Action::Tamanu(args), ctx) => tamanu::run(ctx.with_top(args)).await,
 		#[cfg(feature = "upload")]

src/actions/crypto.rs

@@ -0,0 +1,34 @@
+use clap::{Parser, Subcommand};
+use miette::Result;
+
+use super::Context;
+
+pub mod check;
+pub mod sign;
+pub mod keygen;
+
+mod inout_args;
+mod key_args;
+
+/// Cryptographic operations.
+#[derive(Debug, Clone, Parser)]
+pub struct CryptoArgs {
+	/// Crypto subcommand
+	#[command(subcommand)]
+	pub action: CryptoAction,
+}
+
+#[derive(Debug, Clone, Subcommand)]
+pub enum CryptoAction {
+	Verify(check::CheckArgs),
+	Sign(sign::SignArgs),
+	Keygen(keygen::KeygenArgs),
+}
+
+pub async fn run(ctx: Context<SignArgs>) -> Result<()> {
+	match ctx.args_top.action.clone() {
+		CryptoAction::Check(subargs) => check::run(ctx.with_sub(subargs)).await,
+		CryptoAction::Sign(subargs) => sign::run(ctx.with_sub(subargs)).await,
+		CryptoAction::Keygen(subargs) => keygen::run(ctx.with_sub(subargs)).await,
+	}
+}

src/actions/sign/files.rs → src/actions/crypto/sign.rs

@@ -9,9 +9,9 @@ use tracing::debug;
 
 use super::{inout_args::inout_files, key_args::SecretKeyArgs, Context, SignArgs};
 
-/// Sign a file or data with a secret key.
+/// Sign files with a secret key.
 #[derive(Debug, Clone, Parser)]
-pub struct FilesArgs {
+pub struct SignArgs {
 	/// A file to sign.
 	///
 	/// You can provide this multiple times to sign multiple files.
@@ -45,8 +45,8 @@ pub struct FilesArgs {
 	pub comment: Option<String>,
 }
 
-pub async fn run(ctx: Context<SignArgs, FilesArgs>) -> Result<()> {
-	let FilesArgs {
+pub async fn run(ctx: Context<SignArgs, SignArgs>) -> Result<()> {
+	let SignArgs {
 		files,
 		key,
 		output,