keep all repo clone dir organised

Author: asiyani

cleanup.go

@@ -26,8 +26,9 @@ func cleanupOrphanedRepos(config *mirror.RepoPoolConfig, repoPool *mirror.RepoPo
 	}
 
 	repoDirs := repoPool.RepositoriesDirPath()
+	defaultRepoDirRoot := mirror.DefaultRepoDir(config.Defaults.Root)
 
-	entries, err := os.ReadDir(config.Defaults.Root)
+	entries, err := os.ReadDir(defaultRepoDirRoot)
 	if err != nil {
 		logger.Error("unable to read root dir for clean up", "err", err)
 		return
@@ -38,7 +39,7 @@ func cleanupOrphanedRepos(config *mirror.RepoPoolConfig, repoPool *mirror.RepoPo
 			continue
 		}
 
-		fullPath := filepath.Join(config.Defaults.Root, entry.Name())
+		fullPath := filepath.Join(defaultRepoDirRoot, entry.Name())
 
 		if slices.Contains(repoDirs, fullPath) {
 			continue

pkg/mirror/config.go

@@ -125,6 +125,11 @@ func (rpc *RepoPoolConfig) ValidateDefaults() error {
 	return nil
 }
 
+// DefaultRepoDir returns path of dir where all repositories mirrors are cloned
+func DefaultRepoDir(root string) string {
+	return filepath.Join(root, "repo-mirrors")
+}
+
 // ApplyDefaults will add  given default config to repository config if where needed
 func (rpc *RepoPoolConfig) ApplyDefaults() {
 	for i := range rpc.Repositories {

pkg/mirror/repository.go

@@ -105,7 +105,7 @@ func NewRepository(repoConf RepositoryConfig, envs []string, log *slog.Logger) (
 	if !strings.HasSuffix(repoDir, ".git") {
 		repoDir += ".git"
 	}
-	repoDir = filepath.Join(repoConf.Root, repoDir)
+	repoDir = filepath.Join(DefaultRepoDir(repoConf.Root), repoDir)
 
 	repo := &Repository{
 		gitURL:        gURL,

pkg/mirror/repository_test.go

@@ -37,7 +37,7 @@ func TestNewRepo(t *testing.T) {
 				gitURL:        &giturl.URL{Scheme: "scp", User: "user", Host: "host.xz", Path: "path/to", Repo: "repo.git"},
 				remote:        "[email protected]:path/to/repo.git",
 				root:          "/tmp",
-				dir:           "/tmp/repo.git",
+				dir:           "/tmp/repo-mirrors/repo.git",
 				gitGC:         "always",
 				interval:      10 * time.Second,
 				auth:          &Auth{SSHKeyPath: "/path/to/key", SSHKnownHostsPath: "path/to/host"},