From 7e70331179264d356c33b81d0a20d73b74b12b2d Mon Sep 17 00:00:00 2001
From: MrMelon54 <github@mrmelon54.com>
Date: Fri, 31 Jan 2025 19:00:04 +0000
Subject: [PATCH] Add utils/name.go for cert and key file names

---
 renewal/service.go |  7 ++++---
 utils/name.go      | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 utils/name.go

diff --git a/renewal/service.go b/renewal/service.go
index 11a26ff..a0e2655 100644
--- a/renewal/service.go
+++ b/renewal/service.go
@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"github.com/1f349/orchid/database"
 	"github.com/1f349/orchid/pebble"
+	"github.com/1f349/orchid/utils"
 	"github.com/go-acme/lego/v4/certificate"
 	"github.com/go-acme/lego/v4/challenge"
 	"github.com/go-acme/lego/v4/challenge/dns01"
@@ -368,7 +369,7 @@ func (s *Service) getDnsProvider(name, token string) (challenge.Provider, error)
 // getPrivateKey reads the private key for the specified certificate id, or
 // generates one is the file doesn't exist
 func (s *Service) getPrivateKey(id int64) (*rsa.PrivateKey, error) {
-	fPath := filepath.Join(s.keyDir, fmt.Sprintf("%d.key.pem", id))
+	fPath := filepath.Join(s.keyDir, utils.GetKeyFileName(id))
 	pemBytes, err := os.ReadFile(fPath)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -522,8 +523,8 @@ func (s *Service) setRetry(id int64) {
 // writeCertFile writes the output certificate file and renames the current one
 // to include `-old` in the name.
 func (s *Service) writeCertFile(id int64, certBytes []byte) error {
-	oldPath := filepath.Join(s.certDir, fmt.Sprintf("%d-old.cert.pem", id))
-	newPath := filepath.Join(s.certDir, fmt.Sprintf("%d.cert.pem", id))
+	oldPath := filepath.Join(s.certDir, utils.GetOldCertFileName(id))
+	newPath := filepath.Join(s.certDir, utils.GetCertFileName(id))
 
 	// move certificate file to old name
 	err := os.Rename(newPath, oldPath)
diff --git a/utils/name.go b/utils/name.go
new file mode 100644
index 0000000..5f06ed5
--- /dev/null
+++ b/utils/name.go
@@ -0,0 +1,15 @@
+package utils
+
+import "fmt"
+
+func GetCertFileName(id int64) string {
+	return fmt.Sprintf("%d.cert.pem", id)
+}
+
+func GetOldCertFileName(id int64) string {
+	return fmt.Sprintf("%d-old.cert.pem", id)
+}
+
+func GetKeyFileName(id int64) string {
+	return fmt.Sprintf("%d.key.pem", id)
+}