Migrated to cobra for command handling and viper for config handling

util.go

@@ -10,8 +10,8 @@ import (
 	"syscall"
 
 	"code.gitea.io/sdk/gitea"
-	"git.nevets.tech/Steven/ezconf"
 	"github.com/google/go-github/v55/github"
+	"github.com/spf13/viper"
 )
 
 var (
@@ -22,7 +22,7 @@ var (
 
 type Domain struct {
 	name        *string
-	config      *ezconf.Configuration
+	config      *viper.Viper
 	description *string
 	ghClient    *github.Client
 	gtClient    *gitea.Client
@@ -245,19 +245,19 @@ func sanitizeDomainKey(s string) string {
 	return r.Replace(s)
 }
 
-// getDomainCertsDir Can return BlankConfigEntry, ConfigNotFound, or other errors
+// getDomainCertsDir Can return ErrBlankConfigEntry, ErrConfigNotFound, or other errors
 func getDomainCertsDir(domain string) (string, error) {
-	domainConfig, exists := getDomainConfig(domain)
+	domainConfig, exists := domainStore.Get(domain)
 	if !exists {
-		return "", ConfigNotFound
+		return "", ErrConfigNotFound
 	}
 
 	return getDomainCertsDirWConf(domain, domainConfig)
 }
 
-// getDomainCertsDir Can return BlankConfigEntry or other errors
-func getDomainCertsDirWConf(domain string, domainConfig *ezconf.Configuration) (string, error) {
-	effectiveDataRoot, err := getEffectiveString(domainConfig, "Certificates.data_root")
+// getDomainCertsDir Can return ErrBlankConfigEntry or other errors
+func getDomainCertsDirWConf(domain string, domainConfig *viper.Viper) (string, error) {
+	effectiveDataRoot, err := EffectiveString(domainConfig, "Certificates.data_root")
 	if err != nil {
 		return "", err
 	}
@@ -265,7 +265,7 @@ func getDomainCertsDirWConf(domain string, domainConfig *ezconf.Configuration) (
 	return filepath.Join(effectiveDataRoot, "certificates", domain), nil
 }
 
-func getDomainCertsDirWOnlyConf(domainConfig *ezconf.Configuration) (string, error) {
-	domain := domainConfig.GetAsString("Domain.domain_name")
+func getDomainCertsDirWOnlyConf(domainConfig *viper.Viper) (string, error) {
+	domain := domainConfig.GetString("Domain.domain_name")
 	return getDomainCertsDirWConf(domain, domainConfig)
 }