fix repository fetch

Author: badjware

cache/cache.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"context"
+	"log/slog"
 	"sync"
 	"time"
 
@@ -10,6 +11,7 @@ import (
 
 type Cache struct {
 	backend types.GitForge
+	logger  *slog.Logger
 
 	rootContentLock   sync.RWMutex
 	cachedRootContent map[string]types.GroupSource
@@ -18,9 +20,10 @@ type Cache struct {
 	cachedContent map[string]CachedContent
 }
 
-func NewForgeCache(backend types.GitForge) types.GitForge {
+func NewForgeCache(backend types.GitForge, logger *slog.Logger) types.GitForge {
 	return &Cache{
 		backend: backend,
+		logger:  logger,
 
 		cachedContent: map[string]CachedContent{},
 	}
@@ -43,6 +46,7 @@ func (c *Cache) FetchRootGroupContent(ctx context.Context) (map[string]types.Gro
 		// check to make sure the data is still not there,
 		// since RWMutex is not upgradeable and another thread may have grabbed the lock in the meantime
 		if c.cachedRootContent == nil {
+			c.logger.Info("Fetching root content from backend")
 			content, err := c.backend.FetchRootGroupContent(ctx)
 			if err != nil {
 				return nil, err
@@ -56,10 +60,14 @@ func (c *Cache) FetchRootGroupContent(ctx context.Context) (map[string]types.Gro
 }
 
 func (c *Cache) FetchGroupContent(ctx context.Context, source types.GroupSource) (types.GroupContent, error) {
+	logger := c.logger.With("groupID", source.GetGroupID()).With("groupPath", source.GetGroupPath())
+
 	c.contentLock.RLock()
 	if cachedContent, found := c.cachedContent[source.GetGroupPath()]; !found {
 		c.contentLock.RUnlock()
 
+		logger.Debug("Cache miss")
+
 		// acquire write lock
 		c.contentLock.Lock()
 		defer c.contentLock.Unlock()
@@ -70,6 +78,7 @@ func (c *Cache) FetchGroupContent(ctx context.Context, source types.GroupSource)
 		}
 
 		// fetch content from backend and cache it
+		logger.Info("Fetching content from backend")
 		content, err := c.backend.FetchGroupContent(ctx, source)
 		if err != nil {
 			return types.GroupContent{}, err
@@ -81,6 +90,7 @@ func (c *Cache) FetchGroupContent(ctx context.Context, source types.GroupSource)
 		return content, nil
 	} else {
 		c.contentLock.RUnlock()
+		logger.Debug("Cache hit")
 		return cachedContent.GroupContent, nil
 	}
 }

config/loader.go

@@ -39,7 +39,7 @@ type (
 		URL   string `yaml:"url,omitempty"`
 		Token string `yaml:"token,omitempty"`
 
-		GroupIDs  []uint64 `yaml:"group_ids,omitempty"`
+		GroupIDs  []int    `yaml:"group_ids,omitempty"`
 		UserNames []string `yaml:"user_names,omitempty"`
 
 		ArchivedProjectHandling string `yaml:"archived_project_handling,omitempty"`
@@ -97,7 +97,7 @@ func LoadConfig(configPath string) (*Config, error) {
 			URL:                     "https://gitlab.com",
 			Token:                   "",
 			PullMethod:              "http",
-			GroupIDs:                []uint64{9970},
+			GroupIDs:                []int{9970},
 			UserNames:               []string{},
 			ArchivedProjectHandling: "hide",
 			IncludeCurrentUser:      true,

config/loader_test.go

@@ -24,7 +24,7 @@ func TestLoadConfig(t *testing.T) {
 					URL:                     "https://example.com",
 					Token:                   "12345",
 					PullMethod:              "ssh",
-					GroupIDs:                []uint64{123},
+					GroupIDs:                []int{123},
 					UserNames:               []string{"test-user"},
 					ArchivedProjectHandling: "hide",
 					IncludeCurrentUser:      true,
@@ -147,7 +147,7 @@ func TestMakeGitlabConfig(t *testing.T) {
 					URL:                     "https://gitlab.com",
 					PullMethod:              "http",
 					Token:                   "",
-					GroupIDs:                []uint64{9970},
+					GroupIDs:                []int{9970},
 					UserNames:               []string{},
 					ArchivedProjectHandling: "hide",
 					IncludeCurrentUser:      true,
@@ -157,7 +157,7 @@ func TestMakeGitlabConfig(t *testing.T) {
 				URL:                     "https://gitlab.com",
 				PullMethod:              "http",
 				Token:                   "",
-				GroupIDs:                []uint64{9970},
+				GroupIDs:                []int{9970},
 				UserNames:               []string{},
 				ArchivedProjectHandling: "hide",
 				IncludeCurrentUser:      true,
@@ -172,7 +172,7 @@ func TestMakeGitlabConfig(t *testing.T) {
 					URL:                     "https://gitlab.com",
 					PullMethod:              "invalid",
 					Token:                   "",
-					GroupIDs:                []uint64{9970},
+					GroupIDs:                []int{9970},
 					UserNames:               []string{},
 					ArchivedProjectHandling: "hide",
 					IncludeCurrentUser:      true,
@@ -186,7 +186,7 @@ func TestMakeGitlabConfig(t *testing.T) {
 					URL:                     "https://gitlab.com",
 					PullMethod:              "http",
 					Token:                   "",
-					GroupIDs:                []uint64{9970},
+					GroupIDs:                []int{9970},
 					UserNames:               []string{},
 					IncludeCurrentUser:      true,
 					ArchivedProjectHandling: "invalid",

forges/gitlab/client.go

@@ -83,8 +83,8 @@ func (c *gitlabClient) FetchRootGroupContent(ctx context.Context) (map[string]ty
 
 func (c *gitlabClient) FetchGroupContent(ctx context.Context, source types.GroupSource) (types.GroupContent, error) {
 	if _, found := c.users[source.GetGroupPath()]; found {
-		return c.fetchUserContent(ctx, source.GetGroupID())
+		return c.fetchUserContent(ctx, int(source.GetGroupID()))
 	} else {
-		return c.fetchGroupContent(ctx, source.GetGroupID())
+		return c.fetchGroupContent(ctx, int(source.GetGroupID()))
 	}
 }

forges/gitlab/group.go

@@ -34,7 +34,7 @@ func (c *gitlabClient) newGroupFromGitlabGroup(gitlabGroup *gitlab.Group) *Group
 	}
 }
 
-func (c *gitlabClient) fetchGroup(ctx context.Context, gid uint64) (*Group, error) {
+func (c *gitlabClient) fetchGroup(ctx context.Context, gid int) (*Group, error) {
 	gitlabGroup, _, err := c.client.Groups.GetGroup(gid, &gitlab.GetGroupOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch group with id %v: %v", gid, err)
@@ -43,7 +43,7 @@ func (c *gitlabClient) fetchGroup(ctx context.Context, gid uint64) (*Group, erro
 	return c.newGroupFromGitlabGroup(gitlabGroup), nil
 }
 
-func (c *gitlabClient) fetchGroupContent(ctx context.Context, gid uint64) (types.GroupContent, error) {
+func (c *gitlabClient) fetchGroupContent(ctx context.Context, gid int) (types.GroupContent, error) {
 	childGroups := make(map[string]types.GroupSource)
 	childProjects := make(map[string]types.RepositorySource)
 

forges/gitlab/project.go

@@ -38,7 +38,8 @@ func (c *gitlabClient) newProjectFromGitlabProject(project *gitlab.Project) *Pro
 	}
 	p := Project{
 		ID:            project.ID,
-		Path:          project.Path,
+		Name:          project.Name,
+		Path:          project.PathWithNamespace,
 		DefaultBranch: project.DefaultBranch,
 	}
 	if p.DefaultBranch == "" {

forges/gitlab/user.go

@@ -32,7 +32,7 @@ func (c *gitlabClient) fetchUser(ctx context.Context, uid int) (*User, error) {
 	}, nil
 }
 
-func (c *gitlabClient) fetchUserContent(ctx context.Context, uid uint64) (types.GroupContent, error) {
+func (c *gitlabClient) fetchUserContent(ctx context.Context, uid int) (types.GroupContent, error) {
 	childProjects := make(map[string]types.RepositorySource)
 
 	// Fetch the user repositories

main.go

@@ -105,7 +105,7 @@ func main() {
 	}
 
 	// setup cache
-	cache := cache.NewForgeCache(gitForgeClient)
+	cache := cache.NewForgeCache(gitForgeClient, logger)
 
 	// Start the filesystem
 	err = fstree.Start(