Finalized Client

git.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"code.gitea.io/sdk/gitea"
+	"git.nevets.tech/Steven/ezconf"
 	"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-git/v5"
 	gitconf "github.com/go-git/go-git/v5/config"
@@ -26,6 +27,35 @@ type GitWorkspace struct {
 	WorkTree *git.Worktree
 }
 
+type GitSource int
+
+const (
+	Github GitSource = iota
+	Gitlab
+	Gitea
+	Gogs
+	Bitbucket
+	CodeCommit
+)
+
+var GitSourceName = map[GitSource]string{
+	Github:     "github",
+	Gitlab:     "gitlab",
+	Gitea:      "gitea",
+	Gogs:       "gogs",
+	Bitbucket:  "bitbucket",
+	CodeCommit: "code-commit",
+}
+
+func strToGitSource(s string) (GitSource, error) {
+	for k, v := range GitSourceName {
+		if v == s {
+			return k, nil
+		}
+	}
+	return GitSource(0), errors.New("invalid gitsource name")
+}
+
 func createGithubClient() *github.Client {
 	return github.NewClient(nil).WithAuthToken(config.GetAsString("Git.api_token"))
 }
@@ -155,13 +185,16 @@ func addAndPushCerts(domain string, ws *GitWorkspace) error {
 		return ConfigNotFound
 	}
 
-	effectiveDataRoot, err := getEffectiveString(domainConfig, "Certificates.data_root")
+	certsDir, err := getDomainCertsDirWConf(domain, domainConfig)
 	if err != nil {
-		fmt.Printf("Error getting effective data root for domain %s: %v\n", domain, err)
-		return err
+		if errors.Is(err, ConfigNotFound) {
+			fmt.Printf("Domain %s config not found: %v\n", domain, err)
+			return err
+		}
+		fmt.Printf("Error getting domain %s certs dir: %v\n", domain, err)
 	}
 
-	certFiles, err := os.ReadDir(filepath.Join(effectiveDataRoot, "certificates", domain))
+	certFiles, err := os.ReadDir(certsDir)
 	if err != nil {
 		fmt.Printf("Error reading from directory: %v\n", err)
 		return err
@@ -173,7 +206,7 @@ func addAndPushCerts(domain string, ws *GitWorkspace) error {
 				fmt.Printf("Error copying file to memfs: %v\n", err)
 				return err
 			}
-			certFile, err := os.ReadFile(filepath.Join(effectiveDataRoot, "certificates", domain, file.Name()))
+			certFile, err := os.ReadFile(filepath.Join(certsDir, file.Name()))
 			if err != nil {
 				fmt.Printf("Error reading file to memfs: %v\n", err)
 				file.Close()
@@ -214,7 +247,7 @@ func addAndPushCerts(domain string, ws *GitWorkspace) error {
 		Email: config.GetAsString("Certificates.email"),
 		When:  time.Now(),
 	}
-	_, err = ws.WorkTree.Commit("Update "+domain+" @ "+time.Now().Format("Mon Jan _2 2006 15:04:05 MST"), &git.CommitOptions{Author: signature, Committer: signature})
+	commitHash, err := ws.WorkTree.Commit("Update "+domain+" @ "+time.Now().Format("Mon Jan _2 2006 15:04:05 MST"), &git.CommitOptions{Author: signature, Committer: signature})
 	if err != nil {
 		fmt.Printf("Error committing certs: %v\n", err)
 		return err
@@ -237,25 +270,75 @@ func addAndPushCerts(domain string, ws *GitWorkspace) error {
 	}
 
 	fmt.Println("Successfully uploaded to " + config.GetAsString("Git.server") + "/" + config.GetAsString("Git.org_name") + "/" + domain + domainConfig.GetAsString("Repo.repo_suffix") + ".git")
+
+	err = writeCommitHash(commitHash.String(), domainConfig)
+	if err != nil {
+		fmt.Printf("Error writing commit hash: %v\n", err)
+		return err
+	}
+
+	return nil
+}
+
+func writeCommitHash(hash string, domainConfig *ezconf.Configuration) error {
+	certsDir, err := getDomainCertsDirWOnlyConf(domainConfig)
+	if err != nil {
+		if errors.Is(err, ConfigNotFound) {
+			return err
+		}
+		return err
+	}
+
+	err = os.WriteFile(filepath.Join(certsDir, "hash"), []byte(hash), 0644)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
 func getLocalCommitHash(domain string) (string, error) {
+	certsDir, err := getDomainCertsDir(domain)
+	if err != nil {
+		if errors.Is(err, ConfigNotFound) {
+			fmt.Printf("Domain %s config not found: %v\n", domain, err)
+			return "", err
+		}
+		fmt.Printf("Error getting domain %s certs dir: %v\n", domain, err)
+	}
 
-	return "", nil
+	data, err := os.ReadFile(filepath.Join(certsDir, "hash"))
+	if err != nil {
+		fmt.Printf("Error reading file for domain %s: %v\n", domain, err)
+		return "", err
+	}
+
+	return strings.TrimSpace(string(data)), nil
 }
 
-func writeCommitHash(domain string, ws *GitWorkspace) error {
-	//ref, err := ws.Repo.Head()
-	//if err != nil {
-	//	fmt.Printf("Error getting HEAD: %v\n", err)
-	//	return err
-	//}
-	//hash := ref.Hash()
-	return nil
+func getRemoteCommitHash(domain string, gitSource GitSource) (string, error) {
+	domainConfig, exists := getDomainConfig(domain)
+	if !exists {
+		fmt.Printf("Domain %s config does not exist\n", domain)
+		return "", ConfigNotFound
+	}
+
+	switch gitSource {
+	case Gitea:
+		return getRemoteCommitHashGitea(config.GetAsString("Git.org_name"), domain+domainConfig.GetAsString("Repo.repo_suffix"), "master")
+	default:
+		fmt.Printf("Unimplemented git source %v\n", gitSource)
+		return "", errors.New("unimplemented git source")
+	}
 }
 
-func getRemoteCommitHash(domain string) (string, error) {
-
-	return "", nil
+func getRemoteCommitHashGitea(org, repo, branchName string) (string, error) {
+	giteaClient := createGiteaClient()
+	branch, _, err := giteaClient.GetRepoBranch(org, repo, branchName)
+	if err != nil {
+		fmt.Printf("Error getting repo branch: %v\n", err)
+		return "", err
+	}
+	//TODO catch repo not found as ErrRepoNotInit
+	return branch.Commit.ID, nil
 }