From 544770cc3edce84cb2d3ec30f5273a9e46a2520e Mon Sep 17 00:00:00 2001 From: Slawek Koszewski Date: Sun, 27 Jul 2025 12:37:14 +0200 Subject: [PATCH] Migrated command line commands and flags handling to cobra framework. --- go.mod | 7 ++++- main.go | 87 +++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 66 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index f8a67c0..0cb83d2 100644 --- a/go.mod +++ b/go.mod @@ -2,13 +2,18 @@ module koszewscy.waw.pl/slawek/lab-ca go 1.24.5 -require github.com/hashicorp/hcl/v2 v2.24.0 +require ( + github.com/hashicorp/hcl/v2 v2.24.0 + github.com/spf13/cobra v1.9.1 +) require ( github.com/agext/levenshtein v1.2.1 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/spf13/pflag v1.0.6 // indirect github.com/zclconf/go-cty v1.16.3 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/sync v0.14.0 // indirect diff --git a/main.go b/main.go index 259748a..1089492 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,6 @@ import ( "crypto/x509" "crypto/x509/pkix" "encoding/pem" - "flag" "fmt" "math/big" "os" @@ -14,6 +13,7 @@ import ( gohcl "github.com/hashicorp/hcl/v2/gohcl" hclparse "github.com/hashicorp/hcl/v2/hclparse" + "github.com/spf13/cobra" ) // CAConfig represents a CA block in HCL @@ -131,33 +131,66 @@ func (c *CAConfig) Validate() error { } func main() { - initCA := flag.Bool("initca", false, "Generate a new CA certificate and key") - configPath := flag.String("config", "ca_config.hcl", "Path to CA configuration file") - overwrite := flag.Bool("overwrite", false, "Allow overwriting existing files") - flag.Parse() + var configPath string + var overwrite bool - if *initCA { - config, err := LoadCAConfig(*configPath) - if err != nil { - fmt.Println("Error loading config:", err) - return - } - certPEM, keyPEM, err := GenerateCA(config) - if err != nil { - fmt.Println("Error generating CA:", err) - return - } - if err := SavePEM("ca_cert.pem", certPEM, false, *overwrite); err != nil { - fmt.Println("Error saving CA certificate:", err) - return - } - if err := SavePEM("ca_key.pem", keyPEM, true, *overwrite); err != nil { - fmt.Println("Error saving CA key:", err) - return - } - fmt.Println("CA certificate and key generated.") - return + var rootCmd = &cobra.Command{ + Use: "lab-ca", + Short: "Certificate Authority Utility", + Long: "lab-ca - Certificate Authority Utility", + Run: func(cmd *cobra.Command, args []string) { + printMainHelp() + }, } - fmt.Println("No action specified. Use -initca to generate a CA.") + var initcaCmd = &cobra.Command{ + Use: "initca", + Short: "Generate a new CA certificate and key", + Run: func(cmd *cobra.Command, args []string) { + handleInitCA(configPath, overwrite) + }, + } + + initcaCmd.Flags().StringVar(&configPath, "config", "ca_config.hcl", "Path to CA configuration file") + initcaCmd.Flags().BoolVar(&overwrite, "overwrite", false, "Allow overwriting existing files") + + rootCmd.AddCommand(initcaCmd) + + if err := rootCmd.Execute(); err != nil { + os.Exit(1) + } +} + +func handleInitCA(configPath string, overwrite bool) { + config, err := LoadCAConfig(configPath) + if err != nil { + fmt.Println("Error loading config:", err) + return + } + certPEM, keyPEM, err := GenerateCA(config) + if err != nil { + fmt.Println("Error generating CA:", err) + return + } + if err := SavePEM("ca_cert.pem", certPEM, false, overwrite); err != nil { + fmt.Println("Error saving CA certificate:", err) + return + } + if err := SavePEM("ca_key.pem", keyPEM, true, overwrite); err != nil { + fmt.Println("Error saving CA key:", err) + return + } + fmt.Println("CA certificate and key generated.") +} + +func printMainHelp() { + fmt.Println("lab-ca - Certificate Authority Utility") + fmt.Println() + fmt.Println("Usage:") + fmt.Println(" lab-ca [options]") + fmt.Println() + fmt.Println("Available commands:") + fmt.Println(" initca Generate a new CA certificate and key") + fmt.Println() + fmt.Println("Use 'lab-ca --help' for more information about a command.") }