Search chore: tidy up dependencies on symbol search (#57576)

This contains a bunch of cleanups of search symbols code. Basically, the goal was to take all the global clients used by symbols and explicitly declare them in a new ZoektSymbolsClient.

In order to limit the scope of this change, I added a new DefaultZoektSymbolsClient so that the things that expect to be able to call this stuff without dependencies still can.

Author: camdencheek

cmd/frontend/backend/BUILD.bazel

@@ -13,7 +13,6 @@ go_library(
         "mocks_temp.go",
         "repos.go",
         "repos_mock.go",
-        "symbols.go",
         "trace.go",
         "user_emails.go",
         "users.go",
@@ -56,9 +55,6 @@ go_library(
         "//internal/repos",
         "//internal/repoupdater",
         "//internal/repoupdater/protocol",
-        "//internal/search",
-        "//internal/search/result",
-        "//internal/symbols",
         "//internal/trace",
         "//internal/txemail",
         "//internal/txemail/txtypes",

cmd/frontend/backend/symbols.go

@@ -71,7 +71,7 @@ func (r *repositoryStatsResolver) IndexedLinesCount(ctx context.Context) (BigInt
 
 func (r *repositoryStatsResolver) computeIndexedStats(ctx context.Context) (int32, int64, error) {
 	r.indexedStatsOnce.Do(func() {
-		repos, err := search.ListAllIndexed(ctx)
+		repos, err := search.ListAllIndexed(ctx, search.Indexed())
 		if err != nil {
 			r.indexedStatsErr = err
 			return

cmd/frontend/graphqlbackend/repository_stats.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
 	"github.com/sourcegraph/sourcegraph/internal/api"
-	"github.com/sourcegraph/sourcegraph/internal/authz"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/gitserver"
 	"github.com/sourcegraph/sourcegraph/internal/search/result"
@@ -20,7 +19,7 @@ type symbolsArgs struct {
 }
 
 func (r *GitTreeEntryResolver) Symbols(ctx context.Context, args *symbolsArgs) (*symbolConnectionResolver, error) {
-	symbols, err := symbol.Compute(ctx, authz.DefaultSubRepoPermsChecker, r.commit.repoResolver.RepoMatch.RepoName(), api.CommitID(r.commit.oid), r.commit.inputRev, args.Query, args.First, args.IncludePatterns)
+	symbols, err := symbol.DefaultZoektSymbolsClient().Compute(ctx, r.commit.repoResolver.RepoMatch.RepoName(), api.CommitID(r.commit.oid), r.commit.inputRev, args.Query, args.First, args.IncludePatterns)
 	if err != nil && len(symbols) == 0 {
 		return nil, err
 	}
@@ -34,15 +33,15 @@ func (r *GitTreeEntryResolver) Symbol(ctx context.Context, args *struct {
 	Line      int32
 	Character int32
 }) (*symbolResolver, error) {
-	symbolMatch, err := symbol.GetMatchAtLineCharacter(ctx, authz.DefaultSubRepoPermsChecker, r.commit.repoResolver.RepoMatch.RepoName(), api.CommitID(r.commit.oid), r.Path(), int(args.Line), int(args.Character))
+	symbolMatch, err := symbol.DefaultZoektSymbolsClient().GetMatchAtLineCharacter(ctx, r.commit.repoResolver.RepoMatch.RepoName(), api.CommitID(r.commit.oid), r.Path(), int(args.Line), int(args.Character))
 	if err != nil || symbolMatch == nil {
 		return nil, err
 	}
 	return &symbolResolver{r.db, r.commit, symbolMatch}, nil
 }
 
 func (r *GitCommitResolver) Symbols(ctx context.Context, args *symbolsArgs) (*symbolConnectionResolver, error) {
-	symbols, err := symbol.Compute(ctx, authz.DefaultSubRepoPermsChecker, r.repoResolver.RepoMatch.RepoName(), api.CommitID(r.oid), r.inputRev, args.Query, args.First, args.IncludePatterns)
+	symbols, err := symbol.DefaultZoektSymbolsClient().Compute(ctx, r.repoResolver.RepoMatch.RepoName(), api.CommitID(r.oid), r.inputRev, args.Query, args.First, args.IncludePatterns)
 	if err != nil && len(symbols) == 0 {
 		return nil, err
 	}

cmd/frontend/graphqlbackend/symbols.go

@@ -36,7 +36,6 @@ go_library(
         "//cmd/frontend/internal/search",
         "//internal/api",
         "//internal/auth/userpasswd",
-        "//internal/authz",
         "//internal/conf",
         "//internal/conf/deploy",
         "//internal/cookie",

cmd/frontend/internal/app/ui/BUILD.bazel

@@ -28,7 +28,6 @@ import (
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/routevar"
 	"github.com/sourcegraph/sourcegraph/internal/api"
 	"github.com/sourcegraph/sourcegraph/internal/auth/userpasswd"
-	"github.com/sourcegraph/sourcegraph/internal/authz"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/conf/deploy"
 	"github.com/sourcegraph/sourcegraph/internal/cookie"
@@ -276,9 +275,8 @@ func newCommon(w http.ResponseWriter, r *http.Request, db database.DB, title str
 			ctx, cancel := context.WithTimeout(r.Context(), time.Second*1)
 			defer cancel()
 
-			if symbolMatch, _ := symbol.GetMatchAtLineCharacter(
+			if symbolMatch, _ := symbol.DefaultZoektSymbolsClient().GetMatchAtLineCharacter(
 				ctx,
-				authz.DefaultSubRepoPermsChecker,
 				types.MinimalRepo{ID: common.Repo.ID, Name: common.Repo.Name},
 				common.CommitID,
 				strings.TrimLeft(blobPath, "/"),

cmd/frontend/internal/app/ui/handlers.go

@@ -62,7 +62,7 @@ var (
 )
 
 func (h *handler) Handle(ctx context.Context) error {
-	indexed, err := search.ListAllIndexed(ctx)
+	indexed, err := search.ListAllIndexed(ctx, search.Indexed())
 	if err != nil {
 		return err
 	}

cmd/worker/internal/zoektrepos/zoektrepos.go

@@ -30,8 +30,6 @@ var (
 
 	indexedDialerOnce sync.Once
 	indexedDialer     backend.ZoektDialer
-
-	IndexedMock zoekt.Streamer
 )
 
 func SearcherURLs() *endpoint.Map {
@@ -53,9 +51,6 @@ func SearcherGRPCConnectionCache() *defaults.ConnectionCache {
 }
 
 func Indexed() zoekt.Streamer {
-	if IndexedMock != nil {
-		return IndexedMock
-	}
 	indexedSearchOnce.Do(func() {
 		indexedSearch = backend.NewCachedSearcher(conf.Get().ServiceConnections().ZoektListTTL, backend.NewMeteredSearcher(
 			"", // no hostname means its the aggregator
@@ -79,11 +74,11 @@ type ZoektAllIndexed struct {
 }
 
 // ListAllIndexed lists all indexed repositories.
-func ListAllIndexed(ctx context.Context) (*ZoektAllIndexed, error) {
+func ListAllIndexed(ctx context.Context, zs zoekt.Searcher) (*ZoektAllIndexed, error) {
 	q := &query.Const{Value: true}
 	opts := &zoekt.ListOptions{Field: zoekt.RepoListFieldReposMap}
 
-	repos, err := Indexed().List(ctx, q, opts)
+	repos, err := zs.List(ctx, q, opts)
 	if err != nil {
 		return nil, err
 	}

internal/search/env.go

@@ -13,7 +13,6 @@ go_library(
     importpath = "github.com/sourcegraph/sourcegraph/internal/search/searcher",
     visibility = ["//:__subpackages__"],
     deps = [
-        "//cmd/frontend/backend",
         "//cmd/searcher/protocol",
         "//internal/api",
         "//internal/conf",
@@ -29,6 +28,7 @@ go_library(
         "//internal/search/streaming",
         "//internal/search/streaming/http",
         "//internal/searcher/v1:searcher",
+        "//internal/symbols",
         "//internal/trace",
         "//internal/types",
         "//lib/errors",

internal/search/searcher/BUILD.bazel

@@ -7,14 +7,14 @@ import (
 	"github.com/sourcegraph/conc/pool"
 	"go.opentelemetry.io/otel/attribute"
 
-	"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
 	"github.com/sourcegraph/sourcegraph/internal/api"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/gitserver"
 	"github.com/sourcegraph/sourcegraph/internal/search"
 	"github.com/sourcegraph/sourcegraph/internal/search/job"
 	"github.com/sourcegraph/sourcegraph/internal/search/result"
 	"github.com/sourcegraph/sourcegraph/internal/search/streaming"
+	"github.com/sourcegraph/sourcegraph/internal/symbols"
 	"github.com/sourcegraph/sourcegraph/internal/trace"
 	"github.com/sourcegraph/sourcegraph/internal/types"
 )
@@ -103,7 +103,7 @@ func searchInRepo(ctx context.Context, gitserverClient gitserver.Client, repoRev
 	}
 	tr.SetAttributes(commitID.Attr())
 
-	symbols, err := backend.Symbols.ListTags(ctx, search.SymbolsParameters{
+	symbols, err := symbols.DefaultClient.Search(ctx, search.SymbolsParameters{
 		Repo:            repoRevs.Repo.Name,
 		CommitID:        commitID,
 		Query:           patternInfo.Pattern,
@@ -114,6 +114,13 @@ func searchInRepo(ctx context.Context, gitserverClient gitserver.Client, repoRev
 		// Ask for limit + 1 so we can detect whether there are more results than the limit.
 		First: limit + 1,
 	})
+	if err != nil {
+		return nil, err
+	}
+
+	for i := range symbols {
+		symbols[i].Line += 1 // callers expect 1-indexed lines
+	}
 
 	// All symbols are from the same repo, so we can just partition them by path
 	// to build file matches