Skip to content

Load workspace config when indexing tracked repos #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex4o wants to merge 1 commit into
base: main
Choose a base branch
from
+85 −0
Open

Load workspace config when indexing tracked repos #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions internal/indexer/multi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,17 @@ func (mi *MultiIndexer) indexSingleRepo(entry config.RepoEntry) (map[string]*Ind
}

prefix := config.ResolvePrefix(entry)
mi.configMgr.LoadWorkspaceConfig(prefix, absPath)
cfg := mi.configMgr.GetRepoConfig(prefix)

idx := New(mi.graph, mi.registry, cfg.Index, mi.logger)
idx.search = mi.search
if mi.embedder != nil {
idx.SetEmbedder(mi.embedder)
}
entryCopy := entry
idx.SetWorkspaceID(resolveWorkspaceID(&entryCopy, cfg, prefix))
idx.SetProjectID(resolveProjectID(&entryCopy, cfg, prefix))
// No repo prefix in single-repo mode.

result, err := idx.Index(absPath)
Expand Down Expand Up @@ -249,13 +253,17 @@ func (mi *MultiIndexer) indexMultiRepo(repos []config.RepoEntry) (map[string]*In
return
}

mi.configMgr.LoadWorkspaceConfig(prefix, absPath)
cfg := mi.configMgr.GetRepoConfig(prefix)
idx := New(mi.graph, mi.registry, cfg.Index, mi.logger)
idx.search = mi.search
if mi.embedder != nil {
idx.SetEmbedder(mi.embedder)
}
idx.SetRepoPrefix(prefix)
entryCopy := e
idx.SetWorkspaceID(resolveWorkspaceID(&entryCopy, cfg, prefix))
idx.SetProjectID(resolveProjectID(&entryCopy, cfg, prefix))
idx.SetTrackedRepoModules(trackedModules)
// Defer the cross-cutting passes (ResolveAll, InferImplements,
// semantic enrich, contract extract+commit) so they don't race
Expand Down Expand Up @@ -356,6 +364,7 @@ func (mi *MultiIndexer) IndexRepo(repoPrefix string) (*IndexResult, error) {
mi.graph.EvictRepo(repoPrefix)
}

mi.configMgr.LoadWorkspaceConfig(repoPrefix, meta.RootPath)
cfg := mi.configMgr.GetRepoConfig(repoPrefix)
idx := New(mi.graph, mi.registry, cfg.Index, mi.logger)
idx.search = mi.search
Expand All @@ -365,6 +374,9 @@ func (mi *MultiIndexer) IndexRepo(repoPrefix string) (*IndexResult, error) {
if mi.IsMultiRepo() {
idx.SetRepoPrefix(repoPrefix)
}
entry := mi.configMgr.Global().FindRepoByPrefix(repoPrefix)
idx.SetWorkspaceID(resolveWorkspaceID(entry, cfg, repoPrefix))
idx.SetProjectID(resolveProjectID(entry, cfg, repoPrefix))

result, err := idx.Index(meta.RootPath)
if err != nil {
Expand Down
73 changes: 73 additions & 0 deletions internal/indexer/multi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,76 @@ func TestMultiIndexer_IndexAll_MultiRepo(t *testing.T) {
assert.Len(t, mi.AllMetadata(), 2)
}

func TestMultiIndexer_IndexAll_SingleRepoLoadsWorkspaceExclude(t *testing.T) {
dir := setupRepoDir(t, "myrepo")
require.NoError(t, os.MkdirAll(filepath.Join(dir, "ignored"), 0o755))
writeFile(t, filepath.Join(dir, "ignored", "ignored.go"), "package main\nfunc Ignored() {}\n")
writeFile(t, filepath.Join(dir, ".gortex.yaml"), "workspace: shared\nproject: app\nexclude:\n - ignored/**\n")

tmpCfg := filepath.Join(t.TempDir(), "config.yaml")
gc := &config.GlobalConfig{Repos: []config.RepoEntry{{Path: dir, Name: "myrepo"}}}
gc.SetConfigPath(tmpCfg)
require.NoError(t, gc.Save())

cm, err := config.NewConfigManager(tmpCfg)
require.NoError(t, err)

g := graph.New()
mi := NewMultiIndexer(g, newTestRegistry(), search.NewBM25(), cm, zap.NewNop())

_, err = mi.IndexAll()
require.NoError(t, err)

for _, n := range g.AllNodes() {
assert.NotContains(t, n.FilePath, "ignored/ignored.go")
assert.NotContains(t, n.ID, "Ignored")
if n.Kind != graph.KindFile && n.Kind != graph.KindImport {
assert.Equal(t, "shared", n.WorkspaceID)
assert.Equal(t, "app", n.ProjectID)
}
}
}

func TestMultiIndexer_IndexAll_MultiRepoLoadsWorkspaceExclude(t *testing.T) {
repoA := setupRepoDir(t, "repo-a")
repoB := setupRepoDir(t, "repo-b")
require.NoError(t, os.MkdirAll(filepath.Join(repoA, "ignored"), 0o755))
writeFile(t, filepath.Join(repoA, "ignored", "ignored.go"), "package main\nfunc Ignored() {}\n")
writeFile(t, filepath.Join(repoA, ".gortex.yaml"), "workspace: shared\nproject: api\nexclude:\n - ignored/**\n")

tmpCfg := filepath.Join(t.TempDir(), "config.yaml")
gc := &config.GlobalConfig{
Repos: []config.RepoEntry{
{Path: repoA, Name: "repo-a"},
{Path: repoB, Name: "repo-b"},
},
}
gc.SetConfigPath(tmpCfg)
require.NoError(t, gc.Save())

cm, err := config.NewConfigManager(tmpCfg)
require.NoError(t, err)

g := graph.New()
mi := NewMultiIndexer(g, newTestRegistry(), search.NewBM25(), cm, zap.NewNop())

_, err = mi.IndexAll()
require.NoError(t, err)

for _, n := range g.AllNodes() {
assert.NotContains(t, n.FilePath, "ignored/ignored.go")
assert.NotContains(t, n.ID, "Ignored")
if n.RepoPrefix == "repo-a" && n.Kind != graph.KindFile && n.Kind != graph.KindImport {
assert.Equal(t, "shared", n.WorkspaceID)
assert.Equal(t, "api", n.ProjectID)
}
}
}

func TestMultiIndexer_IndexRepo(t *testing.T) {
repoA := setupRepoDir(t, "repo-a")
repoB := setupRepoDir(t, "repo-b")
writeFile(t, filepath.Join(repoA, ".gortex.yaml"), "workspace: shared\nproject: api\n")

tmpCfg := filepath.Join(t.TempDir(), "config.yaml")
gc := &config.GlobalConfig{
Expand Down Expand Up @@ -178,6 +245,12 @@ func TestMultiIndexer_IndexRepo(t *testing.T) {
assert.Equal(t, repoBNodes, len(g.GetRepoNodes("repo-b")))
// Total should be roughly the same (re-indexed, not duplicated).
assert.InDelta(t, nodesBefore, g.NodeCount(), 2)
for _, n := range g.GetRepoNodes("repo-a") {
if n.Kind != graph.KindFile && n.Kind != graph.KindImport {
assert.Equal(t, "shared", n.WorkspaceID)
assert.Equal(t, "api", n.ProjectID)
}
}
}

func TestMultiIndexer_IndexRepo_NotFound(t *testing.T) {
Expand Down