artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 14:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename pkg to internal (#5898)

Browse Source 
* git mv pkg internal

* fix imports in Go files

find ./ -type f -name '*.go' -exec sed -i '' -e 's/sourcegraph\/pkg\//sourcegraph\/internal\//g' {} \;

* fix imports in scripts

find ./ -type f -name '*.sh' -exec sed -i '' -e 's/sourcegraph\/pkg\//sourcegraph\/internal\//g' {} \;

* fix launch.sh

* go fmt ./...

* fix CODEOWNERS
This commit is contained in:
Nick Snyder 2019-10-07 15:36:41 -07:00 committed by GitHub
parent b4274425a3
commit 85fba22315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
709 changed files with 1302 additions and 1302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
.github/CODEOWNERS vendored
View File

@ -34,23 +34,23 @@
/cmd/frontend/types @slimsag
/cmd/frontend/hooks @beyang @slimsag
/cmd/frontend/internal/ @beyang @slimsag
/pkg/randstring/ @beyang
/pkg/pubsub/ @beyang
/pkg/repotrackutil/ @beyang
/pkg/atomicvalue/ @beyang
/pkg/testutil/ @beyang
/pkg/debugserver/ @beyang
/pkg/vfsutil/ @slimsag
/pkg/gituri/ @beyang
/pkg/db/ @keegancsmith
/pkg/processrestart @slimsag @keegancsmith
/pkg/honey @keegancsmith
/pkg/ratelimit @beyang
/pkg/registry @chrismwendt
/pkg/slack @slimsag
/pkg/prefixsuffixsaver @beyang
/pkg/gosrc @beyang
/pkg/txemail @slimsag
/internal/randstring/ @beyang
/internal/pubsub/ @beyang
/internal/repotrackutil/ @beyang
/internal/atomicvalue/ @beyang
/internal/testutil/ @beyang
/internal/debugserver/ @beyang
/internal/vfsutil/ @slimsag
/internal/gituri/ @beyang
/internal/db/ @keegancsmith
/internal/processrestart @slimsag @keegancsmith
/internal/honey @keegancsmith
/internal/ratelimit @beyang
/internal/registry @chrismwendt
/internal/slack @slimsag
/internal/prefixsuffixsaver @beyang
/internal/gosrc @beyang
/internal/txemail @slimsag
/gulpfile.ts @beyang
/renovate.json @felixfbecker
/.stylelintrc.json @felixfbecker
@ -61,18 +61,18 @@
/.gitattributes @beyang
/.yarnrc @felixfbecker
.eslintrc.js @felixfbecker
/pkg/httputil @beyang
/pkg/diskcache @beyang
/pkg/sysreq @beyang
/pkg/errcode @beyang
/pkg/routevar @beyang
/pkg/env @beyang
/pkg/pathmatch @beyang
/pkg/version @beyang
/pkg/httptestutil @beyang
/pkg/mutablelimiter @beyang
/pkg/buildkite @ggilmore
/pkg/httpcli @sourcegraph/core-services
/internal/httputil @beyang
/internal/diskcache @beyang
/internal/sysreq @beyang
/internal/errcode @beyang
/internal/routevar @beyang
/internal/env @beyang
/internal/pathmatch @beyang
/internal/version @beyang
/internal/httptestutil @beyang
/internal/mutablelimiter @beyang
/internal/buildkite @ggilmore
/internal/httpcli @sourcegraph/core-services
/packages @beyang
/cmd/frontend @beyang
/dev @beyang
@ -99,7 +99,7 @@ tslint.config.js @felixfbecker
/.editorconfig @felixfbecker
/jest.config.js @felixfbecker
/cmd @beyang @slimsag
/pkg @beyang @slimsag
/internal @beyang @slimsag
# Regression testing
/web/src/regression @beyang
@ -120,12 +120,12 @@ tslint.config.js @felixfbecker
/web/src/tracking/ @dadlerj
**/tracking @dadlerj
/cmd/frontend/internal/pkg/usagestats @dadlerj
/pkg/eventlogger @dadlerj
/internal/eventlogger @dadlerj
# Automation
*/a8n/* @sourcegraph/automation
/enterprise/pkg/a8n @sourcegraph/automation
/pkg/a8n @sourcegraph/automation
/internal/a8n @sourcegraph/automation
**/campaigns/** @sourcegraph/automation
# Auth
@ -138,18 +138,18 @@ tslint.config.js @felixfbecker
/cmd/frontend/graphqlbackend/*session* @beyang
/cmd/frontend/graphqlbackend/*auth* @beyang
/cmd/frontend/graphqlbackend/access_token.go @beyang
/pkg/actor/ @beyang
/internal/actor/ @beyang
# Core Services
*git*/* @sourcegraph/core-services
/cmd/gitserver/ @sourcegraph/core-services
/cmd/repo-updater/ @sourcegraph/core-services
/migrations/ @sourcegraph/core-services
/pkg/gitserver/ @sourcegraph/core-services
/pkg/repoupdater/ @sourcegraph/core-services
/pkg/trace/ @sourcegraph/core-services
/pkg/tracer/ @sourcegraph/core-services
/pkg/vcs/ @sourcegraph/core-services
/internal/gitserver/ @sourcegraph/core-services
/internal/repoupdater/ @sourcegraph/core-services
/internal/trace/ @sourcegraph/core-services
/internal/tracer/ @sourcegraph/core-services
/internal/vcs/ @sourcegraph/core-services
/cmd/frontend/db @sourcegraph/core-services
/cmd/frontend/graphqlbackend @sourcegraph/core-services @slimsag
/cmd/frontend/globals @sourcegraph/core-services @slimsag
@ -158,9 +158,9 @@ tslint.config.js @felixfbecker
/schema @sourcegraph/core-services
/cmd/frontend/internal/bg @sourcegraph/core-services @slimsag
/cmd/github-proxy @sourcegraph/core-services
/pkg/api/ @sourcegraph/core-services
/pkg/jsonc @tsenart @slimsag
/pkg/extsvc @sourcegraph/core-services
/internal/api/ @sourcegraph/core-services
/internal/jsonc @tsenart @slimsag
/internal/extsvc @sourcegraph/core-services
/cmd/frontend/authz/ @sourcegraph/core-services
/enterprise/cmd/frontend/internal/authz @sourcegraph/core-services
# authz overrides (still owned by beyang for now)
@ -181,8 +181,8 @@ tslint.config.js @felixfbecker
/cmd/symbols @sourcegraph/code-search
/cmd/query-runner @sourcegraph/code-search
/cmd/replacer @rvantonder
/pkg/symbols/ @sourcegraph/code-search
/pkg/search @sourcegraph/code-search
/internal/symbols/ @sourcegraph/code-search
/internal/search @sourcegraph/code-search
# Saved searches
/web/src/SavedQuery.tsx @attfarhan
@ -200,9 +200,9 @@ Dockerfile @sourcegraph/distribution
**/build.sh @sourcegraph/distribution
/cmd/frontend/envvar @sourcegraph/distribution
/cmd/server @sourcegraph/distribution
/pkg/conf @slimsag
/pkg/db/confdb @slimsag
/pkg/db/globalstatedb @slimsag
/internal/conf @slimsag
/internal/db/confdb @slimsag
/internal/db/globalstatedb @slimsag
/enterprise/docs @sourcegraph/distribution
# Licensing and billing
@ -225,11 +225,11 @@ README.md @sqs
/enterprise/cmd/frontend/internal/registry @sourcegraph/web
# Backend shared packages
/pkg/endpoint/ @keegancsmith @slimsag
/pkg/rcache/ @keegancsmith
/pkg/redispool/ @keegancsmith
/pkg/store/ @keegancsmith
/pkg/metrics @keegancsmith @slimsag
/internal/endpoint/ @keegancsmith @slimsag
/internal/rcache/ @keegancsmith
/internal/redispool/ @keegancsmith
/internal/store/ @keegancsmith
/internal/metrics @keegancsmith @slimsag
# Management console
/cmd/management-console @slimsag
@ -260,8 +260,8 @@ README.md @sqs
/cmd/frontend/external @beyang
/babel.config.js @felixfbecker
/cmd/loadtest @beyang
/pkg/hubspot/ @dadlerj
/pkg/highlight/ @slimsag
/internal/hubspot/ @dadlerj
/internal/highlight/ @slimsag
# These are configured through Renovate config.
# See ../renovate.json and https://github.com/sourcegraph/renovate-config/blob/master/renovate.json

4
cmd/frontend/auth/non_public.go
View File

@ -8,8 +8,8 @@ import (
"github.com/gorilla/mux"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/router"
uirouter "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/ui/router"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/conf"
)
// RequireAuthMiddleware is a middleware that requires authentication for all HTTP requests, except

4
cmd/frontend/auth/non_public_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/auth"
_ "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/ui"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/schema" // Import for side effects so that the UI router gets created and is accessible in the
// ../app/ui/router package's Router var.
)

6
cmd/frontend/auth/user.go
View File

@ -5,9 +5,9 @@ import (
"fmt"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/errcode"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
var MockGetAndSaveUser func(ctx context.Context, op GetAndSaveUserOp) (userID int32, safeErrMsg string, err error)

6
cmd/frontend/auth/user_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/sergi/go-diff/diffmatchpatch"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/errcode"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
func init() {

2
cmd/frontend/authz/iface.go
View File

@ -6,7 +6,7 @@ import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
// Provider defines a source of truth of which repositories a user is authorized to view. The

4
cmd/frontend/backend/configuration.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/jsonc"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/jsonc"
"github.com/sourcegraph/sourcegraph/schema"
)

6
cmd/frontend/backend/go_importers.go
View File

@ -14,9 +14,9 @@ import (
"time"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/rcache"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/rcache"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
"golang.org/x/net/context/ctxhttp"
)

10
cmd/frontend/backend/go_importers_test.go
View File

@ -11,11 +11,11 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/extsvc/github"
"github.com/sourcegraph/sourcegraph/pkg/rcache"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/pkg/vcs/util"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/extsvc/github"
"github.com/sourcegraph/sourcegraph/internal/rcache"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/vcs/util"
)
func TestCountGoImporters(t *testing.T) {

4
cmd/frontend/backend/mocks.go
View File

@ -6,8 +6,8 @@ import (
opentracing "github.com/opentracing/opentracing-go"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
var Mocks MockServices

2
cmd/frontend/backend/orgs.go
View File

@ -5,7 +5,7 @@ import (
"errors"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
var ErrNotAuthenticated = errors.New("not authenticated")

14
cmd/frontend/backend/repos.go
View File

@ -17,13 +17,13 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/inventory"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
"github.com/sourcegraph/sourcegraph/pkg/rcache"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/gitserver"
"github.com/sourcegraph/sourcegraph/internal/rcache"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
"gopkg.in/inconshreveable/log15.v2"
)

8
cmd/frontend/backend/repos_mock.go
View File

@ -9,10 +9,10 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/inventory"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/errcode"
"github.com/sourcegraph/sourcegraph/internal/gitserver"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
type MockRepos struct {

12
cmd/frontend/backend/repos_test.go
View File

@ -10,12 +10,12 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/inventory"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/rcache"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/pkg/vcs/util"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/rcache"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/vcs/util"
log15 "gopkg.in/inconshreveable/log15.v2"
)

14
cmd/frontend/backend/repos_vcs.go
View File

@ -11,13 +11,13 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/extsvc/github"
"github.com/sourcegraph/sourcegraph/pkg/extsvc/gitlab"
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/extsvc/github"
"github.com/sourcegraph/sourcegraph/internal/extsvc/gitlab"
"github.com/sourcegraph/sourcegraph/internal/gitserver"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
// CachedGitRepo returns a handle to the Git repository that does not know the remote URL. If

8
cmd/frontend/backend/repos_vcs_test.go
View File

@ -7,10 +7,10 @@ import (
"testing"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
func TestRepos_ResolveRev_noRevSpecified_getsDefaultBranch(t *testing.T) {

4
cmd/frontend/backend/site_admin.go
View File

@ -7,8 +7,8 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
var ErrMustBeSiteAdmin = errors.New("must be site admin")

4
cmd/frontend/backend/symbols.go
View File

@ -3,8 +3,8 @@ package backend
import (
"context"
symbolsclient "github.com/sourcegraph/sourcegraph/pkg/symbols"
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
symbolsclient "github.com/sourcegraph/sourcegraph/internal/symbols"
"github.com/sourcegraph/sourcegraph/internal/symbols/protocol"
)
// Symbols backend.

4
cmd/frontend/backend/trace.go
View File

@ -10,8 +10,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
log15 "gopkg.in/inconshreveable/log15.v2"
"github.com/sourcegraph/sourcegraph/pkg/actor"
tracepkg "github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/actor"
tracepkg "github.com/sourcegraph/sourcegraph/internal/trace"
)
var metricLabels = []string{"method", "success"}

8
cmd/frontend/backend/user_emails.go
View File

@ -11,10 +11,10 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/envvar"
"github.com/sourcegraph/sourcegraph/cmd/frontend/globals"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/router"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/txemail"
"github.com/sourcegraph/sourcegraph/pkg/txemail/txtypes"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/errcode"
"github.com/sourcegraph/sourcegraph/internal/txemail"
"github.com/sourcegraph/sourcegraph/internal/txemail/txtypes"
)
// UserEmails contains backend methods related to user email addresses.

2
cmd/frontend/backend/user_emails_test.go
View File

@ -5,7 +5,7 @@ import (
"reflect"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/txemail"
"github.com/sourcegraph/sourcegraph/internal/txemail"
)
func TestSendUserEmailVerificationEmail(t *testing.T) {

4
cmd/frontend/backend/users.go
View File

@ -7,8 +7,8 @@ import (
"strconv"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/randstring"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/randstring"
)
func MakeRandomHardToGuessPassword() string {

2
cmd/frontend/build.sh
View File

@ -18,7 +18,7 @@ export CGO_ENABLED=0
echo "--- go build"
for pkg in github.com/sourcegraph/sourcegraph/cmd/frontend; do
go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/pkg/version.version=$VERSION" -buildmode exe -tags dist -o $OUTPUT/$(basename $pkg) $pkg
go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION" -buildmode exe -tags dist -o $OUTPUT/$(basename $pkg) $pkg
done
echo "--- docker build $IMAGE"

2
cmd/frontend/db/access_tokens.go
View File

@ -11,7 +11,7 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/lib/pq"
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
// AccessToken describes an access token. The actual token (that a caller must supply to

2
cmd/frontend/db/access_tokens_test.go
View File

@ -5,7 +5,7 @@ import (
"reflect"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
// 🚨 SECURITY: This tests the routine that creates access tokens and returns the token secret value

2
cmd/frontend/db/db_test.go
View File

@ -1,6 +1,6 @@
package db
import "github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
import "github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
func init() {
dbtesting.BeforeTest = append(dbtesting.BeforeTest, func() { Mocks = MockStores{} })

4
cmd/frontend/db/dbstore_db_test.go
View File

@ -4,8 +4,8 @@ import (
"os"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestMigrations(t *testing.T) {

2
cmd/frontend/db/default_repos.go
View File

@ -6,7 +6,7 @@ import (
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
type defaultRepos struct{}

6
cmd/frontend/db/default_repos_test.go
View File

@ -6,9 +6,9 @@ import (
"testing"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func Test_defaultRepos_List(t *testing.T) {

2
cmd/frontend/db/discussion_comments.go
View File

@ -10,7 +10,7 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/lib/pq"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
// TODO(slimsag:discussions): future: tests for DiscussionComments.List

4
cmd/frontend/db/discussion_comments_test.go
View File

@ -6,8 +6,8 @@ import (
"time"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
// TODO(slimsag:discussions): future: test that DiscussionCommentsListOptions.AuthorUserID works

2
cmd/frontend/db/discussion_mail_reply_tokens.go
View File

@ -9,7 +9,7 @@ import (
"fmt"
"io"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
// discussionMailReplyTokens provides access to the `discussion_mail_reply_tokens` table.

6
cmd/frontend/db/discussion_threads.go
View File

@ -16,9 +16,9 @@ import (
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/discussions/searchquery"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
// TODO(slimsag:discussions): future: tests for DiscussionThreadsListOptions.TargetRepoID

4
cmd/frontend/db/discussion_threads_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/davecgh/go-spew/spew"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
// TODO(slimsag:discussions): future: test that DiscussionThreadsListOptions.AuthorUserID works

2
cmd/frontend/db/err_test.go
View File

@ -5,7 +5,7 @@ import (
"runtime"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
func TestErrorsInterface(t *testing.T) {

4
cmd/frontend/db/event_logs.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/version"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/version"
)
type eventLogs struct{}

2
cmd/frontend/db/event_logs_test.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestEventLogs_ValidInfo(t *testing.T) {

6
cmd/frontend/db/external_accounts.go
View File

@ -8,9 +8,9 @@ import (
multierror "github.com/hashicorp/go-multierror"
"github.com/keegancsmith/sqlf"
otlog "github.com/opentracing/opentracing-go/log"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
"github.com/sourcegraph/sourcegraph/internal/trace"
log15 "gopkg.in/inconshreveable/log15.v2"
)

4
cmd/frontend/db/external_accounts_test.go
View File

@ -6,8 +6,8 @@ import (
"testing"
"time"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
func TestExternalAccounts_LookupUserAndSave(t *testing.T) {

8
cmd/frontend/db/external_services.go
View File

@ -15,10 +15,10 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbutil"
"github.com/sourcegraph/sourcegraph/pkg/jsonc"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbutil"
"github.com/sourcegraph/sourcegraph/internal/jsonc"
"github.com/sourcegraph/sourcegraph/schema"
"github.com/xeipuuv/gojsonschema"
)

2
cmd/frontend/db/org_invitations.go
View File

@ -9,7 +9,7 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/lib/pq"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
// An OrgInvitation is an invitation for a user to join an organization as a member.

4
cmd/frontend/db/org_invitations_test.go
View File

@ -6,8 +6,8 @@ import (
"testing"
"time"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
// 🚨 SECURITY: This tests the routine that creates org invitations and returns the invitation secret value

2
cmd/frontend/db/org_members.go
View File

@ -7,7 +7,7 @@ import (
"fmt"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/keegancsmith/sqlf"

2
cmd/frontend/db/org_members_db_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestOrgMembers_CreateMembershipInOrgsForAllUsers(t *testing.T) {

2
cmd/frontend/db/orgs.go
View File

@ -8,7 +8,7 @@ import (
multierror "github.com/hashicorp/go-multierror"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/keegancsmith/sqlf"
"github.com/lib/pq"

2
cmd/frontend/db/orgs_test.go
View File

@ -5,7 +5,7 @@ import (
"strings"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestOrgs_ValidNames(t *testing.T) {

4
cmd/frontend/db/phabricator.go
View File

@ -6,8 +6,8 @@ import (
"fmt"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
type phabricator struct{}

2
cmd/frontend/db/recent_searches.go
View File

@ -3,7 +3,7 @@ package db
import (
"context"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/pkg/errors"
)

4
cmd/frontend/db/recent_searches_test.go
View File

@ -7,8 +7,8 @@ import (
"reflect"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestRecentSearches_Log(t *testing.T) {

10
cmd/frontend/db/repos.go
View File

@ -12,11 +12,11 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/authz"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db/query"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbutil"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbutil"
"github.com/sourcegraph/sourcegraph/internal/trace"
)
type repoNotFoundErr struct {

6
cmd/frontend/db/repos_db_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/authz"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db/query"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
/*

2
cmd/frontend/db/repos_mock.go
View File

@ -6,7 +6,7 @@ import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/internal/api"
)
type MockRepos struct {

6
cmd/frontend/db/repos_perm.go
View File

@ -8,9 +8,9 @@ import (
otlog "github.com/opentracing/opentracing-go/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/authz"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
"github.com/sourcegraph/sourcegraph/internal/trace"
"gopkg.in/inconshreveable/log15.v2"
)

6
cmd/frontend/db/repos_perm_filter_test.go
View File

@ -10,9 +10,9 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/authz"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
type authzFilter_Test struct {

8
cmd/frontend/db/repos_perm_test.go
View File

@ -8,10 +8,10 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/sourcegraph/sourcegraph/cmd/frontend/authz"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
func Benchmark_authzFilter(b *testing.B) {

8
cmd/frontend/db/repos_test.go
View File

@ -5,10 +5,10 @@ import (
"reflect"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
func TestParseIncludePattern(t *testing.T) {

2
cmd/frontend/db/saved_queries.go
View File

@ -6,7 +6,7 @@ import (
"time"
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
type queryRunnerState struct{}

6
cmd/frontend/db/saved_searches.go
View File

@ -9,9 +9,9 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/trace"
)
type savedSearches struct{}

2
cmd/frontend/db/saved_searches_mock.go
View File

@ -4,7 +4,7 @@ import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/internal/api"
)
type MockSavedSearches struct {

4
cmd/frontend/db/saved_searches_test.go
View File

@ -6,8 +6,8 @@ import (
"testing"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestSavedSearchesIsEmpty(t *testing.T) {

2
cmd/frontend/db/schemadoc/main.go
View File

@ -9,7 +9,7 @@ import (
"sort"
"strings"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
_ "github.com/lib/pq"
)

6
cmd/frontend/db/settings.go
View File

@ -9,9 +9,9 @@ import (
multierror "github.com/hashicorp/go-multierror"
"github.com/keegancsmith/sqlf"
"github.com/sourcegraph/jsonx"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/trace"
)
type settings struct{}

2
cmd/frontend/db/settings_mock.go
View File

@ -3,7 +3,7 @@ package db
import (
"context"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/internal/api"
)
type MockSettings struct {

4
cmd/frontend/db/settings_test.go
View File

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestSettings_ListAll(t *testing.T) {

2
cmd/frontend/db/survey_responses.go
View File

@ -9,7 +9,7 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
// SurveyResponseListOptions specifies the options for listing survey responses.

2
cmd/frontend/db/survey_responses_test.go
View File

@ -4,7 +4,7 @@ import (
"context"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
// TestSurveyResponses_Create_Count tests creation and counting of db survey responses

4
cmd/frontend/db/user_emails.go
View File

@ -8,8 +8,8 @@ import (
"fmt"
"time"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/globalstatedb"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/globalstatedb"
)
// UserEmail represents a row in the `user_emails` table.

6
cmd/frontend/db/user_emails_test.go
View File

@ -7,9 +7,9 @@ import (
"testing"
"time"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
func TestUserEmails_Get(t *testing.T) {

2
cmd/frontend/db/user_tags.go
View File

@ -3,7 +3,7 @@ package db
import (
"context"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
)
// SetTag adds (present=true) or removes (present=false) a tag from the given user's set of tags. An

4
cmd/frontend/db/user_tags_test.go
View File

@ -6,8 +6,8 @@ import (
"sort"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
func TestUsers_SetTag(t *testing.T) {

10
cmd/frontend/db/users.go
View File

@ -11,11 +11,11 @@ import (
"github.com/keegancsmith/sqlf"
"github.com/lib/pq"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/globalstatedb"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/globalstatedb"
"github.com/sourcegraph/sourcegraph/internal/trace"
log15 "gopkg.in/inconshreveable/log15.v2"
)

6
cmd/frontend/db/users_builtin_auth.go
View File

@ -8,9 +8,9 @@ import (
"errors"
"fmt"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/randstring"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/randstring"
"golang.org/x/crypto/bcrypt"
)

2
cmd/frontend/db/users_builtin_auth_test.go
View File

@ -4,7 +4,7 @@ import (
"context"
"testing"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
)
func TestUsers_BuiltinAuth(t *testing.T) {

12
cmd/frontend/db/users_test.go
View File

@ -7,12 +7,12 @@ import (
"time"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/db/dbconn"
"github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
"github.com/sourcegraph/sourcegraph/pkg/db/globalstatedb"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/db/dbconn"
"github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
"github.com/sourcegraph/sourcegraph/internal/db/globalstatedb"
"github.com/sourcegraph/sourcegraph/internal/errcode"
)
// usernamesForTests is a list of test cases containing valid and invalid usernames and org names.

2
cmd/frontend/envvar/envvar.go
View File

@ -4,7 +4,7 @@ package envvar
import (
"strconv"
"github.com/sourcegraph/sourcegraph/pkg/env"
"github.com/sourcegraph/sourcegraph/internal/env"
)
var sourcegraphDotComMode, _ = strconv.ParseBool(env.Get("SOURCEGRAPHDOTCOM_MODE", "false", "run as Sourcegraph.com, with add'l marketing and redirects"))

2
cmd/frontend/globals/globals.go
View File

@ -6,7 +6,7 @@ import (
"reflect"
"sync/atomic"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/internal/conf"
"gopkg.in/inconshreveable/log15.v2"
)

2
cmd/frontend/graphqlbackend/a8n.go
View File

@ -8,7 +8,7 @@ import (
graphql "github.com/graph-gophers/graphql-go"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/externallink"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/a8n"
"github.com/sourcegraph/sourcegraph/internal/a8n"
)
// NewA8NResolver will be set by enterprise

4
cmd/frontend/graphqlbackend/access_tokens.go
View File

@ -12,8 +12,8 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/conf"
)
type createAccessTokenInput struct {

2
cmd/frontend/graphqlbackend/access_tokens_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/actor"
"github.com/sourcegraph/sourcegraph/internal/actor"
)
// 🚨 SECURITY: This tests that users can't create tokens for users they aren't allowed to do so for.

2
cmd/frontend/graphqlbackend/client_configuration.go
View File

@ -3,7 +3,7 @@ package graphqlbackend
import (
"context"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/internal/conf"
)
type clientConfigurationResolver struct {

8
cmd/frontend/graphqlbackend/codemod.go
View File

@ -20,10 +20,10 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/goroutine"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
"github.com/sourcegraph/sourcegraph/pkg/env"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/env"
"github.com/sourcegraph/sourcegraph/internal/errcode"
"github.com/sourcegraph/sourcegraph/internal/trace"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
"golang.org/x/net/context/ctxhttp"
log15 "gopkg.in/inconshreveable/log15.v2"
)

2
cmd/frontend/graphqlbackend/db_test.go
View File

@ -1,6 +1,6 @@
package graphqlbackend
import "github.com/sourcegraph/sourcegraph/pkg/db/dbtesting"
import "github.com/sourcegraph/sourcegraph/internal/db/dbtesting"
func init() {
dbtesting.DBNameSuffix = "graphqlbackenddb"

2
cmd/frontend/graphqlbackend/default_settings.go
View File

@ -6,7 +6,7 @@ import (
graphql "github.com/graph-gophers/graphql-go"
"github.com/graph-gophers/graphql-go/relay"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/internal/api"
)
var builtinExtensions = map[string]bool{

4
cmd/frontend/graphqlbackend/discussion_comments.go
View File

@ -15,8 +15,8 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/discussions"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/markdown"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/markdown"
)
func marshalDiscussionCommentID(dbID int64) graphql.ID {

6
cmd/frontend/graphqlbackend/discussion_threads.go
View File

@ -17,9 +17,9 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/discussions"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/discussions/ratelimit"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/jsonc"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/jsonc"
"github.com/sourcegraph/sourcegraph/schema"
)

2
cmd/frontend/graphqlbackend/extension_registry.go
View File

@ -6,7 +6,7 @@ import (
graphql "github.com/graph-gophers/graphql-go"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/internal/conf"
)
var ErrExtensionsDisabled = errors.New("extensions are disabled in site configuration (contact the site admin to enable extensions)")

2
cmd/frontend/graphqlbackend/external_account.go
View File

@ -7,7 +7,7 @@ import (
"github.com/graph-gophers/graphql-go/relay"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
type externalAccountResolver struct {

2
cmd/frontend/graphqlbackend/external_accounts.go
View File

@ -8,7 +8,7 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/extsvc"
"github.com/sourcegraph/sourcegraph/internal/extsvc"
)
func (r *siteResolver) ExternalAccounts(ctx context.Context, args *struct {

8
cmd/frontend/graphqlbackend/external_services.go
View File

@ -14,10 +14,10 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/conf"
"github.com/sourcegraph/sourcegraph/pkg/env"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/conf"
"github.com/sourcegraph/sourcegraph/internal/env"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
)
var extsvcConfigAllowEdits, _ = strconv.ParseBool(env.Get("EXTSVC_CONFIG_ALLOW_EDITS", "false", "When EXTSVC_CONFIG_FILE is in use, allow edits in the application to be made which will be overwritten on next process restart"))

10
cmd/frontend/graphqlbackend/externallink/repository.go
View File

@ -13,11 +13,11 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/errcode"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
log15 "gopkg.in/inconshreveable/log15.v2"
)

8
cmd/frontend/graphqlbackend/externallink/repository_test.go
View File

@ -8,10 +8,10 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater/protocol"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
func TestRepository(t *testing.T) {

2
cmd/frontend/graphqlbackend/externallink/util_test.go
View File

@ -3,7 +3,7 @@ package externallink
import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/pkg/repoupdater"
"github.com/sourcegraph/sourcegraph/internal/repoupdater"
)
func resetMocks() {

8
cmd/frontend/graphqlbackend/file.go
View File

@ -8,10 +8,10 @@ import (
"time"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/highlight"
"github.com/sourcegraph/sourcegraph/pkg/markdown"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/highlight"
"github.com/sourcegraph/sourcegraph/internal/markdown"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
func (r *gitTreeEntryResolver) Content(ctx context.Context) (string, error) {

6
cmd/frontend/graphqlbackend/git_blob.go
View File

@ -3,9 +3,9 @@ package graphqlbackend
import (
"context"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/gitserver"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
func (r *gitTreeEntryResolver) Blame(ctx context.Context,

2
cmd/frontend/graphqlbackend/git_blob_test.go
View File

@ -3,7 +3,7 @@ package graphqlbackend
import (
"testing"
"github.com/sourcegraph/sourcegraph/pkg/highlight"
"github.com/sourcegraph/sourcegraph/internal/highlight"
)
func TestIsBinary(t *testing.T) {

4
cmd/frontend/graphqlbackend/git_commit.go
View File

@ -8,8 +8,8 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/externallink"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
graphql "github.com/graph-gophers/graphql-go"
"github.com/graph-gophers/graphql-go/relay"

2
cmd/frontend/graphqlbackend/git_commits.go
View File

@ -6,7 +6,7 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
type gitCommitConnectionResolver struct {

2
cmd/frontend/graphqlbackend/git_object.go
View File

@ -6,7 +6,7 @@ import (
"sync"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
type gitObjectType string

2
cmd/frontend/graphqlbackend/git_revision.go
View File

@ -6,7 +6,7 @@ import (
"strings"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
type gitRevSpecExpr struct {

4
cmd/frontend/graphqlbackend/git_tree.go
View File

@ -9,8 +9,8 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/internal/api"
"github.com/sourcegraph/sourcegraph/internal/vcs/git"
)
func (r *gitTreeEntryResolver) IsRoot() bool {

Some files were not shown because too many files have changed in this diff Show More