boltless.me / zoekt
fork of https://github.com/sourcegraph/zoekt
0
Fork 0

Configure Feed

Select the types of activity you want to include in your feed.

Move several packages to internal/ (#901)

This PR moves the following packages to `internal` to avoid exposing them in the API:
* `ctags`
* `debugserver`
* `gitindex`
* `shards`
* `trace`

author
Julie Tibshirani committer
GitHub date (Jan 28, 2025, 9:36 AM -0800) commit a634b6cd parent e7f0a1a3
+65 -81
+1 -2
build/builder.go
··· 40 40 "github.com/dustin/go-humanize" 41 41 "github.com/go-enry/go-enry/v2" 42 42 "github.com/rs/xid" 43 - 44 43 "github.com/sourcegraph/zoekt" 45 - "github.com/sourcegraph/zoekt/ctags" 44 + "github.com/sourcegraph/zoekt/internal/ctags" 46 45 ) 47 46 48 47 var DefaultDir = filepath.Join(os.Getenv("HOME"), ".zoekt")
+1 -1
build/ctags.go
··· 24 24 "time" 25 25 26 26 "github.com/sourcegraph/zoekt" 27 - "github.com/sourcegraph/zoekt/ctags" 27 + "github.com/sourcegraph/zoekt/internal/ctags" 28 28 ) 29 29 30 30 // Make sure all names are lowercase here, since they are normalized
+1 -1
build/ctags_test.go
··· 20 20 "testing" 21 21 22 22 "github.com/sourcegraph/zoekt" 23 - "github.com/sourcegraph/zoekt/ctags" 23 + "github.com/sourcegraph/zoekt/internal/ctags" 24 24 ) 25 25 26 26 func TestTagsToSections(t *testing.T) {
+2 -3
build/e2e_test.go
··· 33 33 "github.com/google/go-cmp/cmp" 34 34 "github.com/google/go-cmp/cmp/cmpopts" 35 35 "github.com/grafana/regexp" 36 - "github.com/stretchr/testify/require" 37 - 38 36 "github.com/sourcegraph/zoekt" 37 + "github.com/sourcegraph/zoekt/internal/shards" 39 38 "github.com/sourcegraph/zoekt/internal/tenant" 40 39 "github.com/sourcegraph/zoekt/internal/tenant/tenanttest" 41 40 "github.com/sourcegraph/zoekt/query" 42 - "github.com/sourcegraph/zoekt/shards" 41 + "github.com/stretchr/testify/require" 43 42 ) 44 43 45 44 func TestBasic(t *testing.T) {
+2 -2
build/scoring_test.go
··· 21 21 "testing" 22 22 23 23 "github.com/sourcegraph/zoekt" 24 - "github.com/sourcegraph/zoekt/ctags" 24 + "github.com/sourcegraph/zoekt/internal/ctags" 25 + "github.com/sourcegraph/zoekt/internal/shards" 25 26 "github.com/sourcegraph/zoekt/query" 26 - "github.com/sourcegraph/zoekt/shards" 27 27 ) 28 28 29 29 type scoreCase struct {
+1 -1
cmd/zoekt-git-clone/main.go
··· 28 28 "strconv" 29 29 "strings" 30 30 31 - "github.com/sourcegraph/zoekt/gitindex" 31 + "github.com/sourcegraph/zoekt/internal/gitindex" 32 32 ) 33 33 34 34 func main() {
+4 -6
cmd/zoekt-git-index/main.go
··· 23 23 "strings" 24 24 25 25 "github.com/dustin/go-humanize" 26 - "go.uber.org/automaxprocs/maxprocs" 27 - 28 - "github.com/sourcegraph/zoekt/internal/profiler" 29 - 30 26 "github.com/sourcegraph/zoekt/cmd" 31 - "github.com/sourcegraph/zoekt/ctags" 32 - "github.com/sourcegraph/zoekt/gitindex" 27 + "github.com/sourcegraph/zoekt/internal/ctags" 28 + "github.com/sourcegraph/zoekt/internal/gitindex" 29 + "github.com/sourcegraph/zoekt/internal/profiler" 30 + "go.uber.org/automaxprocs/maxprocs" 33 31 ) 34 32 35 33 func run() int {
+1 -1
cmd/zoekt-indexserver/main.go
··· 34 34 "time" 35 35 36 36 "github.com/sourcegraph/zoekt" 37 - "github.com/sourcegraph/zoekt/gitindex" 37 + "github.com/sourcegraph/zoekt/internal/gitindex" 38 38 ) 39 39 40 40 const day = time.Hour * 24
+2 -3
cmd/zoekt-merge-index/main_test.go
··· 8 8 "sort" 9 9 "testing" 10 10 11 - "github.com/stretchr/testify/require" 12 - 13 11 "github.com/sourcegraph/zoekt" 12 + "github.com/sourcegraph/zoekt/internal/shards" 14 13 "github.com/sourcegraph/zoekt/query" 15 - "github.com/sourcegraph/zoekt/shards" 14 + "github.com/stretchr/testify/require" 16 15 ) 17 16 18 17 func TestMerge(t *testing.T) {
+1 -1
cmd/zoekt-mirror-bitbucket-server/main.go
··· 30 30 31 31 bitbucketv1 "github.com/gfleury/go-bitbucket-v1" 32 32 33 - "github.com/sourcegraph/zoekt/gitindex" 33 + "github.com/sourcegraph/zoekt/internal/gitindex" 34 34 ) 35 35 36 36 func main() {
+1 -1
cmd/zoekt-mirror-gerrit/main.go
··· 34 34 gerrit "github.com/andygrunwald/go-gerrit" 35 35 git "github.com/go-git/go-git/v5" 36 36 "github.com/go-git/go-git/v5/config" 37 - "github.com/sourcegraph/zoekt/gitindex" 37 + "github.com/sourcegraph/zoekt/internal/gitindex" 38 38 ) 39 39 40 40 type loggingRT struct {
+1 -1
cmd/zoekt-mirror-gitea/main.go
··· 30 30 31 31 "code.gitea.io/sdk/gitea" 32 32 33 - "github.com/sourcegraph/zoekt/gitindex" 33 + "github.com/sourcegraph/zoekt/internal/gitindex" 34 34 ) 35 35 36 36 type topicsFlag []string
+1 -1
cmd/zoekt-mirror-github/main.go
··· 32 32 "github.com/google/go-github/v27/github" 33 33 "golang.org/x/oauth2" 34 34 35 - "github.com/sourcegraph/zoekt/gitindex" 35 + "github.com/sourcegraph/zoekt/internal/gitindex" 36 36 ) 37 37 38 38 type topicsFlag []string
+1 -1
cmd/zoekt-mirror-gitiles/main.go
··· 24 24 "os" 25 25 "path/filepath" 26 26 27 - "github.com/sourcegraph/zoekt/gitindex" 27 + "github.com/sourcegraph/zoekt/internal/gitindex" 28 28 ) 29 29 30 30 type crawlTarget struct {
+1 -1
cmd/zoekt-mirror-gitlab/main.go
··· 34 34 "strings" 35 35 "time" 36 36 37 - "github.com/sourcegraph/zoekt/gitindex" 37 + "github.com/sourcegraph/zoekt/internal/gitindex" 38 38 gitlab "github.com/xanzy/go-gitlab" 39 39 ) 40 40
+1 -1
cmd/zoekt-repo-index/main.go
··· 42 42 "github.com/google/slothfs/manifest" 43 43 "github.com/sourcegraph/zoekt" 44 44 "github.com/sourcegraph/zoekt/build" 45 - "github.com/sourcegraph/zoekt/gitindex" 46 45 "github.com/sourcegraph/zoekt/ignore" 46 + "github.com/sourcegraph/zoekt/internal/gitindex" 47 47 "go.uber.org/automaxprocs/maxprocs" 48 48 49 49 git "github.com/go-git/go-git/v5"
+1 -2
cmd/zoekt-sourcegraph-indexserver/index.go
··· 17 17 "time" 18 18 19 19 sglog "github.com/sourcegraph/log" 20 - 21 20 "github.com/sourcegraph/zoekt" 22 21 "github.com/sourcegraph/zoekt/build" 23 - "github.com/sourcegraph/zoekt/ctags" 22 + "github.com/sourcegraph/zoekt/internal/ctags" 24 23 "github.com/sourcegraph/zoekt/internal/tenant" 25 24 ) 26 25
+5 -7
cmd/zoekt-sourcegraph-indexserver/index_test.go
··· 13 13 "testing" 14 14 "time" 15 15 16 + "github.com/google/go-cmp/cmp" 17 + "github.com/google/go-cmp/cmp/cmpopts" 16 18 "github.com/sourcegraph/log/logtest" 19 + proto "github.com/sourcegraph/zoekt/cmd/zoekt-sourcegraph-indexserver/protos/sourcegraph/zoekt/configuration/v1" 20 + "github.com/sourcegraph/zoekt/internal/ctags" 21 + "github.com/sourcegraph/zoekt/internal/tenant/tenanttest" 17 22 "github.com/stretchr/testify/require" 18 23 "google.golang.org/grpc" 19 24 "google.golang.org/protobuf/testing/protocmp" 20 25 "google.golang.org/protobuf/types/known/timestamppb" 21 - 22 - proto "github.com/sourcegraph/zoekt/cmd/zoekt-sourcegraph-indexserver/protos/sourcegraph/zoekt/configuration/v1" 23 - "github.com/sourcegraph/zoekt/ctags" 24 - "github.com/sourcegraph/zoekt/internal/tenant/tenanttest" 25 - 26 - "github.com/google/go-cmp/cmp" 27 - "github.com/google/go-cmp/cmp/cmpopts" 28 26 29 27 "github.com/sourcegraph/zoekt" 30 28 )
+8 -9
cmd/zoekt-sourcegraph-indexserver/main.go
··· 38 38 "github.com/prometheus/client_golang/prometheus/promauto" 39 39 sglog "github.com/sourcegraph/log" 40 40 "github.com/sourcegraph/mountinfo" 41 + "github.com/sourcegraph/zoekt" 42 + "github.com/sourcegraph/zoekt/build" 43 + proto "github.com/sourcegraph/zoekt/cmd/zoekt-sourcegraph-indexserver/protos/sourcegraph/zoekt/configuration/v1" 44 + "github.com/sourcegraph/zoekt/grpc/internalerrs" 45 + "github.com/sourcegraph/zoekt/grpc/messagesize" 46 + "github.com/sourcegraph/zoekt/internal/debugserver" 47 + "github.com/sourcegraph/zoekt/internal/profiler" 48 + "github.com/sourcegraph/zoekt/internal/tenant" 41 49 "go.uber.org/automaxprocs/maxprocs" 42 50 "golang.org/x/net/trace" 43 51 "golang.org/x/sys/unix" ··· 45 53 "google.golang.org/grpc/codes" 46 54 "google.golang.org/grpc/credentials/insecure" 47 55 "google.golang.org/grpc/metadata" 48 - 49 - "github.com/sourcegraph/zoekt" 50 - "github.com/sourcegraph/zoekt/build" 51 - proto "github.com/sourcegraph/zoekt/cmd/zoekt-sourcegraph-indexserver/protos/sourcegraph/zoekt/configuration/v1" 52 - "github.com/sourcegraph/zoekt/debugserver" 53 - "github.com/sourcegraph/zoekt/grpc/internalerrs" 54 - "github.com/sourcegraph/zoekt/grpc/messagesize" 55 - "github.com/sourcegraph/zoekt/internal/profiler" 56 - "github.com/sourcegraph/zoekt/internal/tenant" 57 56 ) 58 57 59 58 var (
+2 -3
cmd/zoekt-sourcegraph-indexserver/sg.go
··· 18 18 "time" 19 19 20 20 "github.com/go-git/go-git/v5" 21 + "github.com/sourcegraph/zoekt/internal/ctags" 21 22 "golang.org/x/net/trace" 22 23 24 + "github.com/sourcegraph/zoekt" 23 25 proto "github.com/sourcegraph/zoekt/cmd/zoekt-sourcegraph-indexserver/protos/sourcegraph/zoekt/configuration/v1" 24 - "github.com/sourcegraph/zoekt/ctags" 25 - 26 - "github.com/sourcegraph/zoekt" 27 26 ) 28 27 29 28 // SourcegraphListResult is the return value of Sourcegraph.List. It is its
+1 -1
cmd/zoekt-test/main.go
··· 33 33 34 34 "github.com/sourcegraph/zoekt" 35 35 "github.com/sourcegraph/zoekt/build" 36 + "github.com/sourcegraph/zoekt/internal/shards" 36 37 "github.com/sourcegraph/zoekt/query" 37 - "github.com/sourcegraph/zoekt/shards" 38 38 ) 39 39 40 40 func readTree(dir string) (map[string][]byte, error) {
+7 -8
cmd/zoekt-webserver/main.go
··· 41 41 42 42 grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" 43 43 "github.com/sourcegraph/mountinfo" 44 - "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" 45 - "golang.org/x/net/http2" 46 - "golang.org/x/net/http2/h2c" 47 - "google.golang.org/grpc" 48 - 49 44 "github.com/sourcegraph/zoekt" 50 45 "github.com/sourcegraph/zoekt/build" 51 46 zoektgrpc "github.com/sourcegraph/zoekt/cmd/zoekt-webserver/grpc/server" 52 - "github.com/sourcegraph/zoekt/debugserver" 53 47 "github.com/sourcegraph/zoekt/grpc/internalerrs" 54 48 "github.com/sourcegraph/zoekt/grpc/messagesize" 55 49 "github.com/sourcegraph/zoekt/grpc/propagator" 56 50 proto "github.com/sourcegraph/zoekt/grpc/protos/zoekt/webserver/v1" 51 + "github.com/sourcegraph/zoekt/internal/debugserver" 57 52 "github.com/sourcegraph/zoekt/internal/profiler" 53 + "github.com/sourcegraph/zoekt/internal/shards" 58 54 "github.com/sourcegraph/zoekt/internal/tenant" 55 + "github.com/sourcegraph/zoekt/internal/trace" 59 56 "github.com/sourcegraph/zoekt/internal/tracer" 60 57 "github.com/sourcegraph/zoekt/query" 61 - "github.com/sourcegraph/zoekt/shards" 62 - "github.com/sourcegraph/zoekt/trace" 63 58 "github.com/sourcegraph/zoekt/web" 59 + "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" 60 + "golang.org/x/net/http2" 61 + "golang.org/x/net/http2/h2c" 62 + "google.golang.org/grpc" 64 63 65 64 "github.com/opentracing/opentracing-go" 66 65 "github.com/prometheus/client_golang/prometheus"
+1 -1
cmd/zoekt/main.go
··· 29 29 30 30 "github.com/felixge/fgprof" 31 31 "github.com/sourcegraph/zoekt" 32 + "github.com/sourcegraph/zoekt/internal/shards" 32 33 "github.com/sourcegraph/zoekt/query" 33 - "github.com/sourcegraph/zoekt/shards" 34 34 ) 35 35 36 36 func displayMatches(files []zoekt.FileMatch, pat string, withRepo bool, list bool) {
+1 -1
contentprovider.go
··· 23 23 "unicode" 24 24 "unicode/utf8" 25 25 26 - "github.com/sourcegraph/zoekt/ctags" 26 + "github.com/sourcegraph/zoekt/internal/ctags" 27 27 ) 28 28 29 29 var _ = log.Println
ctags/parser.go internal/ctags/parser.go
ctags/parser_bins.go internal/ctags/parser_bins.go
ctags/parser_test.go internal/ctags/parser_test.go
ctags/symbol_kind.go internal/ctags/symbol_kind.go
debugserver/debug.go internal/debugserver/debug.go
debugserver/expvar.go internal/debugserver/expvar.go
gitindex/clone.go internal/gitindex/clone.go
gitindex/clone_test.go internal/gitindex/clone_test.go
gitindex/delete.go internal/gitindex/delete.go
gitindex/delete_test.go internal/gitindex/delete_test.go
gitindex/filter.go internal/gitindex/filter.go
+2 -3
gitindex/ignore_test.go internal/gitindex/ignore_test.go
··· 9 9 "reflect" 10 10 "testing" 11 11 12 - "github.com/sourcegraph/zoekt/query" 13 - 14 12 "github.com/sourcegraph/zoekt" 15 13 "github.com/sourcegraph/zoekt/build" 16 - "github.com/sourcegraph/zoekt/shards" 14 + "github.com/sourcegraph/zoekt/internal/shards" 15 + "github.com/sourcegraph/zoekt/query" 17 16 ) 18 17 19 18 func createSourcegraphignoreRepo(dir string) error {
gitindex/index.go internal/gitindex/index.go
+1 -1
gitindex/index_test.go internal/gitindex/index_test.go
··· 35 35 "github.com/sourcegraph/zoekt" 36 36 "github.com/sourcegraph/zoekt/build" 37 37 "github.com/sourcegraph/zoekt/ignore" 38 + "github.com/sourcegraph/zoekt/internal/shards" 38 39 "github.com/sourcegraph/zoekt/query" 39 - "github.com/sourcegraph/zoekt/shards" 40 40 ) 41 41 42 42 func TestIndexEmptyRepo(t *testing.T) {
gitindex/repocache.go internal/gitindex/repocache.go
gitindex/repocache_test.go internal/gitindex/repocache_test.go
gitindex/submodule.go internal/gitindex/submodule.go
gitindex/submodule_test.go internal/gitindex/submodule_test.go
gitindex/tree.go internal/gitindex/tree.go
+2 -3
gitindex/tree_test.go internal/gitindex/tree_test.go
··· 29 29 30 30 "github.com/google/go-cmp/cmp" 31 31 "github.com/grafana/regexp" 32 - "github.com/sourcegraph/zoekt/ignore" 33 - 34 32 "github.com/sourcegraph/zoekt" 35 33 "github.com/sourcegraph/zoekt/build" 34 + "github.com/sourcegraph/zoekt/ignore" 35 + "github.com/sourcegraph/zoekt/internal/shards" 36 36 "github.com/sourcegraph/zoekt/query" 37 - "github.com/sourcegraph/zoekt/shards" 38 37 ) 39 38 40 39 func createSubmoduleRepo(dir string) error {
+1 -1
ignore/ignore.go
··· 1 - // package ignore provides helpers to support ignore-files similar to .gitignore 1 + // Package ignore provides helpers to support ignore-files similar to .gitignore 2 2 package ignore 3 3 4 4 import (
+2 -3
internal/archive/e2e_test.go
··· 16 16 "testing" 17 17 "time" 18 18 19 - "github.com/stretchr/testify/require" 20 - 21 19 "github.com/sourcegraph/zoekt" 22 20 "github.com/sourcegraph/zoekt/build" 21 + "github.com/sourcegraph/zoekt/internal/shards" 23 22 "github.com/sourcegraph/zoekt/query" 24 - "github.com/sourcegraph/zoekt/shards" 23 + "github.com/stretchr/testify/require" 25 24 ) 26 25 27 26 func TestMain(m *testing.M) {
+1 -2
internal/e2e/e2e_rank_test.go
··· 15 15 "time" 16 16 17 17 "github.com/google/go-cmp/cmp" 18 - 19 18 "github.com/sourcegraph/zoekt" 20 19 "github.com/sourcegraph/zoekt/build" 21 20 "github.com/sourcegraph/zoekt/internal/archive" 21 + "github.com/sourcegraph/zoekt/internal/shards" 22 22 "github.com/sourcegraph/zoekt/query" 23 - "github.com/sourcegraph/zoekt/shards" 24 23 ) 25 24 26 25 var update = flag.Bool("update", false, "update golden file")
+1 -1
internal/tenant/context.go
··· 11 11 "github.com/sourcegraph/zoekt/internal/tenant/internal/enforcement" 12 12 "github.com/sourcegraph/zoekt/internal/tenant/internal/tenanttype" 13 13 "github.com/sourcegraph/zoekt/internal/tenant/systemtenant" 14 - "github.com/sourcegraph/zoekt/trace" 14 + "github.com/sourcegraph/zoekt/internal/trace" 15 15 ) 16 16 17 17 var ErrMissingTenant = fmt.Errorf("missing tenant")
json/json.go internal/json/json.go
+1 -1
json/json_test.go internal/json/json_test.go
··· 11 11 "testing" 12 12 13 13 "github.com/sourcegraph/zoekt" 14 + zjson "github.com/sourcegraph/zoekt/internal/json" 14 15 "github.com/sourcegraph/zoekt/internal/mockSearcher" 15 - zjson "github.com/sourcegraph/zoekt/json" 16 16 "github.com/sourcegraph/zoekt/query" 17 17 ) 18 18
+1 -1
score.go
··· 20 20 "math" 21 21 "strings" 22 22 23 - "github.com/sourcegraph/zoekt/ctags" 23 + "github.com/sourcegraph/zoekt/internal/ctags" 24 24 ) 25 25 26 26 const (
shards/aggregate.go internal/shards/aggregate.go
+1 -1
shards/eval.go internal/shards/eval.go
··· 5 5 6 6 "github.com/sourcegraph/zoekt" 7 7 "github.com/sourcegraph/zoekt/internal/tenant" 8 + "github.com/sourcegraph/zoekt/internal/trace" 8 9 "github.com/sourcegraph/zoekt/query" 9 - "github.com/sourcegraph/zoekt/trace" 10 10 ) 11 11 12 12 // typeRepoSearcher evaluates all type:repo sub-queries before sending the query
shards/eval_test.go internal/shards/eval_test.go
shards/sched.go internal/shards/sched.go
shards/sched_test.go internal/shards/sched_test.go
+1 -1
shards/shards.go internal/shards/shards.go
··· 36 36 37 37 "github.com/sourcegraph/zoekt" 38 38 "github.com/sourcegraph/zoekt/internal/tenant/systemtenant" 39 + "github.com/sourcegraph/zoekt/internal/trace" 39 40 "github.com/sourcegraph/zoekt/query" 40 - "github.com/sourcegraph/zoekt/trace" 41 41 ) 42 42 43 43 var (
shards/shards_test.go internal/shards/shards_test.go
shards/watcher.go internal/shards/watcher.go
shards/watcher_test.go internal/shards/watcher_test.go
trace/middleware.go internal/trace/middleware.go
trace/opentracing.go internal/trace/opentracing.go
trace/trace.go internal/trace/trace.go
+1 -2
web/server.go
··· 32 32 "time" 33 33 34 34 "github.com/grafana/regexp" 35 - 36 35 "github.com/sourcegraph/zoekt" 36 + zjson "github.com/sourcegraph/zoekt/internal/json" 37 37 "github.com/sourcegraph/zoekt/internal/tenant/systemtenant" 38 - zjson "github.com/sourcegraph/zoekt/json" 39 38 "github.com/sourcegraph/zoekt/query" 40 39 ) 41 40
+2 -2
web/trace.go
··· 5 5 6 6 "github.com/opentracing/opentracing-go" 7 7 "github.com/sourcegraph/zoekt" 8 + "github.com/sourcegraph/zoekt/internal/trace" 8 9 "github.com/sourcegraph/zoekt/query" 9 - "github.com/sourcegraph/zoekt/trace" 10 10 ) 11 11 12 12 func NewTraceAwareSearcher(s zoekt.Streamer) zoekt.Streamer { ··· 15 15 16 16 // traceAwareSearcher wraps a zoekt.Searcher instance so that the tracing context item is set in the 17 17 // context. This context item toggles on trace collection via the 18 - // github.com/sourcegraph/zoekt/trace/ot package. 18 + // github.com/sourcegraph/zoekt/internal/trace/ot package. 19 19 type traceAwareSearcher struct { 20 20 Searcher zoekt.Streamer 21 21 }