Rename to cert-tools

Author: sbernauer

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "cert-tool"
+name = "cert-tools"
 description = "A CLI tool to merge two truststores in PEM or PKCS12 format in such as way that they are accepted by the JVM"
 version = "0.0.0-dev"
 authors.workspace = true

Cargo.nix

@@ -8,7 +8,13 @@ use crate::parsers::{parse_pem_contents, parse_pkcs12_file_workaround};
 
 #[derive(Parser, Debug)]
 #[command(version, about)]
-pub struct Cli {
+pub enum Cli {
+    /// Generate PKCS12 truststore files from PEM or PKCS12 files
+    GeneratePkcs12Truststore(GeneratePkcs12),
+}
+
+#[derive(Parser, Debug)]
+pub struct GeneratePkcs12 {
     /// The path to output the resulting PKCS12 to
     #[arg(long)]
     pub out: PathBuf,
@@ -54,7 +60,7 @@ fn parse_cli_pkcs12_source(cli_argument: &str) -> Result<Pkcs12Source, String> {
     })
 }
 
-impl Cli {
+impl GeneratePkcs12 {
     pub fn certificate_sources(&self) -> Vec<CertInput> {
         let pems = self.pems.iter().cloned().map(CertInput::Pem);
         let pkcs12s = self.pkcs12s.iter().cloned().map(CertInput::Pkcs12);

rust/truststore-merger/Cargo.toml

@@ -3,7 +3,7 @@ use std::{collections::HashMap, fs};
 use anyhow::{Context, ensure};
 use cert_ext::CertExt;
 use clap::Parser;
-use cli_args::Cli;
+use cli_args::{Cli, GeneratePkcs12};
 use openssl::x509::X509;
 use stackable_secret_operator_utils::pkcs12::pkcs12_truststore;
 use tracing::{info, level_filters::LevelFilter, warn};
@@ -25,7 +25,15 @@ pub fn main() -> anyhow::Result<()> {
 
     let cli = Cli::parse();
 
-    let certificate_sources = cli.certificate_sources();
+    match cli {
+        Cli::GeneratePkcs12Truststore(cli_args) => generate_pkcs12_truststore(cli_args)?,
+    }
+
+    Ok(())
+}
+
+fn generate_pkcs12_truststore(cli_args: GeneratePkcs12) -> anyhow::Result<()> {
+    let certificate_sources = cli_args.certificate_sources();
     ensure!(
         !certificate_sources.is_empty(),
         "The list of certificate sources can not be empty. Please provide at least on --pem or --pkcs12."
@@ -79,12 +87,12 @@ pub fn main() -> anyhow::Result<()> {
     }
 
     let pkcs12_truststore_bytes =
-        pkcs12_truststore(certificates.values().map(|c| &**c), &cli.out_password)
+        pkcs12_truststore(certificates.values().map(|c| &**c), &cli_args.out_password)
             .context("failed to create PKCS12 truststore from certificates")?;
-    fs::write(&cli.out, &pkcs12_truststore_bytes).with_context(|| {
+    fs::write(&cli_args.out, &pkcs12_truststore_bytes).with_context(|| {
         format!(
             "failed to write to output PKCS12 truststore at {:?}",
-            cli.out
+            cli_args.out
         )
     })?;