From f6c577597e22696ac014d61599d24ef6f7548c4b Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Sat, 24 Jan 2026 04:32:15 +0100
Subject: [PATCH] refactor: isolate storage configurations creation

---
 cmd/storages.go | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/cmd/storages.go b/cmd/storages.go
index a6b9c2189..3036e4947 100644
--- a/cmd/storages.go
+++ b/cmd/storages.go
@@ -16,16 +16,7 @@ type CertificatesStorage struct {
 func newCertificatesStorage(cmd *cli.Command) *CertificatesStorage {
 	basePath := cmd.String(flgPath)
 
-	config := storage.CertificatesWriterConfig{
-		BasePath:    basePath,
-		PEM:         cmd.Bool(flgPEM),
-		PFX:         cmd.Bool(flgPFX),
-		PFXFormat:   cmd.String(flgPFXPass),
-		PFXPassword: cmd.String(flgPFXFormat),
-		Filename:    cmd.String(flgFilename),
-	}
-
-	writer, err := storage.NewCertificatesWriter(config)
+	writer, err := storage.NewCertificatesWriter(newCertificatesWriterConfig(cmd, basePath))
 	if err != nil {
 		log.Fatal("Certificates storage initialization", log.ErrorAttr(err))
 	}
@@ -36,17 +27,32 @@ func newCertificatesStorage(cmd *cli.Command) *CertificatesStorage {
 	}
 }
 
+func newCertificatesWriterConfig(cmd *cli.Command, basePath string) storage.CertificatesWriterConfig {
+	return storage.CertificatesWriterConfig{
+		BasePath:    basePath,
+		PEM:         cmd.Bool(flgPEM),
+		PFX:         cmd.Bool(flgPFX),
+		PFXFormat:   cmd.String(flgPFXPass),
+		PFXPassword: cmd.String(flgPFXFormat),
+		Filename:    cmd.String(flgFilename),
+	}
+}
+
 // newAccountsStorage Creates a new AccountsStorage.
 func newAccountsStorage(cmd *cli.Command) *storage.AccountsStorage {
-	accountsStorage, err := storage.NewAccountsStorage(storage.AccountsStorageConfig{
-		Email:     cmd.String(flgEmail),
-		BasePath:  cmd.String(flgPath),
-		Server:    cmd.String(flgServer),
-		UserAgent: getUserAgent(cmd),
-	})
+	accountsStorage, err := storage.NewAccountsStorage(newAccountsStorageConfig(cmd))
 	if err != nil {
 		log.Fatal("Accounts storage initialization", log.ErrorAttr(err))
 	}
 
 	return accountsStorage
 }
+
+func newAccountsStorageConfig(cmd *cli.Command) storage.AccountsStorageConfig {
+	return storage.AccountsStorageConfig{
+		Email:     cmd.String(flgEmail),
+		BasePath:  cmd.String(flgPath),
+		Server:    cmd.String(flgServer),
+		UserAgent: getUserAgent(cmd),
+	}
+}