diff --git a/.github/test.CODEOWNERS b/.github/test.CODEOWNERS index 19303c6d413..8f355ddcef5 100644 --- a/.github/test.CODEOWNERS +++ b/.github/test.CODEOWNERS @@ -83,15 +83,15 @@ /cmd/executor/**/* @efritz -/enterprise/cmd/frontend/internal/auth/**/* @unknwon +/cmd/frontend/internal/auth/**/* @unknwon -/enterprise/cmd/frontend/internal/authz/**/* @unknwon +/cmd/frontend/internal/authz/**/* @unknwon -/enterprise/cmd/frontend/internal/codeintel/**/* @efritz +/cmd/frontend/internal/codeintel/**/* @efritz -/enterprise/cmd/frontend/internal/executorqueue/**/* @efritz @eseliger +/cmd/frontend/internal/executorqueue/**/* @efritz @eseliger -/enterprise/cmd/frontend/internal/licensing/**/* @unknwon +/cmd/frontend/internal/licensing/**/* @unknwon /enterprise/cmd/migrator/**/* @efritz @@ -228,7 +228,7 @@ /enterprise/internal/own/ @sourcegraph/own /enterprise/internal/database/codeowners* @sourcegraph/own -/enterprise/cmd/frontend/internal/own/ @sourcegraph/own +/cmd/frontend/internal/own/ @sourcegraph/own /client/web/src/**/own/ @sourcegraph/own /cmd/frontend/graphqlbackend/own* @sourcegraph/own /internal/usagestats/own* @sourcegraph/own diff --git a/client/browser/src/shared/platform/worker.ts b/client/browser/src/shared/platform/worker.ts index 5cea7f37830..615ef50f4a0 100644 --- a/client/browser/src/shared/platform/worker.ts +++ b/client/browser/src/shared/platform/worker.ts @@ -3,7 +3,7 @@ import { checkOk } from '@sourcegraph/http-client' import { isDefaultSourcegraphUrl } from '../util/context' /* - * See [freeze_legacy_extensions.go](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@e8abca577d556b557372518170aaf045093ea760/-/blob/enterprise/cmd/frontend/internal/registry/scripts/freeze_legacy_extensions.go) + * See [freeze_legacy_extensions.go](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@e8abca577d556b557372518170aaf045093ea760/-/blob/cmd/frontend/internal/registry/scripts/freeze_legacy_extensions.go) * and [sourcegraph/pull/45923](https://github.com/sourcegraph/sourcegraph/pull/45923) for more context. */ const LEGACY_EXTENSIONS_BUCKET_URL = 'https://storage.googleapis.com/sourcegraph-legacy-extensions/' diff --git a/cmd/frontend/BUILD.bazel b/cmd/frontend/BUILD.bazel index 97634d89f09..a1278d9a3f7 100644 --- a/cmd/frontend/BUILD.bazel +++ b/cmd/frontend/BUILD.bazel @@ -1,7 +1,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball") +load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@container_structure_test//:defs.bzl", "container_structure_test") +load("//dev:oci_defs.bzl", "image_repository") go_library( name = "frontend_lib", @@ -10,10 +11,12 @@ go_library( visibility = ["//visibility:private"], deps = [ "//cmd/frontend/shared", - "//cmd/sourcegraph/osscmd", + "//internal/conf", "//internal/sanitycheck", + "//internal/service/svcmain", + "//internal/tracer", "//ui/assets", - "//ui/assets/oss", + "//ui/assets/enterprise", ], ) @@ -35,6 +38,7 @@ pkg_tar( oci_image( name = "image", base = "@wolfi_base", + cmd = ["serve"], entrypoint = [ "/sbin/tini", "--", @@ -72,7 +76,12 @@ container_structure_test( image = ":image", tags = [ "exclusive", - "manual", # avoid building the oss frontend "requires-network", ], ) + +oci_push( + name = "candidate_push", + image = ":image", + repository = image_repository("frontend"), +) diff --git a/cmd/frontend/graphqlbackend/BUILD.bazel b/cmd/frontend/graphqlbackend/BUILD.bazel index 075762b3518..ceda70d3c06 100644 --- a/cmd/frontend/graphqlbackend/BUILD.bazel +++ b/cmd/frontend/graphqlbackend/BUILD.bazel @@ -6,7 +6,6 @@ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = [ "//client/shared:__subpackages__", "//cmd/frontend:__subpackages__", - "//enterprise:__subpackages__", ]) js_library( diff --git a/cmd/frontend/graphqlbackend/external_accounts_test.go b/cmd/frontend/graphqlbackend/external_accounts_test.go index 2689581c5f3..072886201c8 100644 --- a/cmd/frontend/graphqlbackend/external_accounts_test.go +++ b/cmd/frontend/graphqlbackend/external_accounts_test.go @@ -116,7 +116,7 @@ func TestExternalAccounts_AddExternalAccount(t *testing.T) { // OSS packages cannot import enterprise packages, but when we build the entire // application this will be implemented. // - // See enterprise/cmd/frontend/internal/auth/sourcegraphoperator for more details + // See cmd/frontend/internal/auth/sourcegraphoperator for more details // and additional test coverage on the functionality. "Sourcegraph operator unimplemented in OSS": { user: &types.User{ID: 1, SiteAdmin: true}, diff --git a/cmd/frontend/graphqlbackend/githubapps.go b/cmd/frontend/graphqlbackend/githubapps.go index aa5b9dacc38..69d6fb65f53 100644 --- a/cmd/frontend/graphqlbackend/githubapps.go +++ b/cmd/frontend/graphqlbackend/githubapps.go @@ -13,7 +13,7 @@ import ( // This file just contains stub GraphQL resolvers and data types for GitHub apps which merely // return an error if not running in enterprise mode. The actual resolvers can be found in -// enterprise/cmd/frontend/internal/auth/githubappauth/ +// cmd/frontend/internal/auth/githubappauth/ type GitHubAppsResolver interface { NodeResolvers() map[string]NodeByIDFunc diff --git a/cmd/frontend/internal/app/BUILD.bazel b/cmd/frontend/internal/app/BUILD.bazel index bb39959057c..0da7fe60580 100644 --- a/cmd/frontend/internal/app/BUILD.bazel +++ b/cmd/frontend/internal/app/BUILD.bazel @@ -9,6 +9,7 @@ go_library( "debug.go", "doc.go", "editor.go", + "init.go", "misc_handlers.go", "one_click_export.go", "opensearch.go", @@ -22,12 +23,14 @@ go_library( deps = [ "//cmd/frontend/auth", "//cmd/frontend/backend", + "//cmd/frontend/enterprise", "//cmd/frontend/envvar", "//cmd/frontend/globals", "//cmd/frontend/internal/app/assetsutil", "//cmd/frontend/internal/app/debugproxies", "//cmd/frontend/internal/app/errorutil", "//cmd/frontend/internal/app/otlpadapter", + "//cmd/frontend/internal/app/resolvers", "//cmd/frontend/internal/app/router", "//cmd/frontend/internal/app/ui", "//cmd/frontend/internal/routevar", @@ -39,6 +42,7 @@ go_library( "//internal/auth/userpasswd", "//internal/authz", "//internal/cloneurls", + "//internal/codeintel", "//internal/conf", "//internal/conf/conftypes", "//internal/conf/deploy", @@ -48,6 +52,7 @@ go_library( "//internal/env", "//internal/gitserver", "//internal/httpcli", + "//internal/observation", "//internal/otlpenv", "//internal/session", "//internal/src-prometheus", diff --git a/enterprise/cmd/frontend/internal/app/init.go b/cmd/frontend/internal/app/init.go similarity index 91% rename from enterprise/cmd/frontend/internal/app/init.go rename to cmd/frontend/internal/app/init.go index e3b16a1ba7d..a7e6a3ebe02 100644 --- a/enterprise/cmd/frontend/internal/app/init.go +++ b/cmd/frontend/internal/app/init.go @@ -4,7 +4,7 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/app/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/conf/deploy" diff --git a/enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel b/cmd/frontend/internal/app/resolvers/BUILD.bazel similarity index 87% rename from enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel rename to cmd/frontend/internal/app/resolvers/BUILD.bazel index c33d6a96de6..ef87bc47aa5 100644 --- a/enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/app/resolvers/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "app.go", "progress.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/app/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/backend", "//cmd/frontend/envvar", diff --git a/enterprise/cmd/frontend/internal/app/resolvers/app.go b/cmd/frontend/internal/app/resolvers/app.go similarity index 100% rename from enterprise/cmd/frontend/internal/app/resolvers/app.go rename to cmd/frontend/internal/app/resolvers/app.go diff --git a/enterprise/cmd/frontend/internal/app/resolvers/progress.go b/cmd/frontend/internal/app/resolvers/progress.go similarity index 100% rename from enterprise/cmd/frontend/internal/app/resolvers/progress.go rename to cmd/frontend/internal/app/resolvers/progress.go diff --git a/enterprise/cmd/frontend/internal/app/resolvers/progress_test.go b/cmd/frontend/internal/app/resolvers/progress_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/app/resolvers/progress_test.go rename to cmd/frontend/internal/app/resolvers/progress_test.go diff --git a/cmd/frontend/internal/auth/BUILD.bazel b/cmd/frontend/internal/auth/BUILD.bazel new file mode 100644 index 00000000000..0308f875411 --- /dev/null +++ b/cmd/frontend/internal/auth/BUILD.bazel @@ -0,0 +1,29 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "auth", + srcs = ["init.go"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth", + visibility = ["//cmd/frontend:__subpackages__"], + deps = [ + "//cmd/frontend/auth", + "//cmd/frontend/external/app", + "//cmd/frontend/graphqlbackend", + "//cmd/frontend/internal/auth/azureoauth", + "//cmd/frontend/internal/auth/bitbucketcloudoauth", + "//cmd/frontend/internal/auth/confauth", + "//cmd/frontend/internal/auth/gerrit", + "//cmd/frontend/internal/auth/githubappauth", + "//cmd/frontend/internal/auth/githuboauth", + "//cmd/frontend/internal/auth/gitlaboauth", + "//cmd/frontend/internal/auth/httpheader", + "//cmd/frontend/internal/auth/openidconnect", + "//cmd/frontend/internal/auth/saml", + "//cmd/frontend/internal/auth/sourcegraphoperator", + "//internal/auth", + "//internal/conf", + "//internal/database", + "//internal/licensing", + "@com_github_sourcegraph_log//:log", + ], +) diff --git a/enterprise/cmd/frontend/internal/auth/CODENOTIFY b/cmd/frontend/internal/auth/CODENOTIFY similarity index 100% rename from enterprise/cmd/frontend/internal/auth/CODENOTIFY rename to cmd/frontend/internal/auth/CODENOTIFY diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/BUILD.bazel b/cmd/frontend/internal/auth/azureoauth/BUILD.bazel similarity index 84% rename from enterprise/cmd/frontend/internal/auth/azureoauth/BUILD.bazel rename to cmd/frontend/internal/auth/azureoauth/BUILD.bazel index f0b174e7412..7e2e74f8425 100644 --- a/enterprise/cmd/frontend/internal/auth/azureoauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/azureoauth/BUILD.bazel @@ -9,11 +9,11 @@ go_library( "provider.go", "session.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/azureoauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/azureoauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/collections", @@ -46,7 +46,7 @@ go_test( "requires-network", ], deps = [ - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/conf", "//internal/database", "//internal/database/dbtest", diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/login.go b/cmd/frontend/internal/auth/azureoauth/login.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/azureoauth/login.go rename to cmd/frontend/internal/auth/azureoauth/login.go diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/middleware.go b/cmd/frontend/internal/auth/azureoauth/middleware.go similarity index 89% rename from enterprise/cmd/frontend/internal/auth/azureoauth/middleware.go rename to cmd/frontend/internal/auth/azureoauth/middleware.go index c2e44bf43b3..62f5f6881db 100644 --- a/enterprise/cmd/frontend/internal/auth/azureoauth/middleware.go +++ b/cmd/frontend/internal/auth/azureoauth/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/schema" diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/provider.go b/cmd/frontend/internal/auth/azureoauth/provider.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/azureoauth/provider.go rename to cmd/frontend/internal/auth/azureoauth/provider.go index c2f99e0c2dd..60687b62eba 100644 --- a/enterprise/cmd/frontend/internal/auth/azureoauth/provider.go +++ b/cmd/frontend/internal/auth/azureoauth/provider.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/collections" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/provider_test.go b/cmd/frontend/internal/auth/azureoauth/provider_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/azureoauth/provider_test.go rename to cmd/frontend/internal/auth/azureoauth/provider_test.go index ab96442480e..36523884cb8 100644 --- a/enterprise/cmd/frontend/internal/auth/azureoauth/provider_test.go +++ b/cmd/frontend/internal/auth/azureoauth/provider_test.go @@ -5,13 +5,14 @@ import ( "github.com/google/go-cmp/cmp" "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "golang.org/x/oauth2" + + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/schema" - "golang.org/x/oauth2" ) func newOauthProvider(oauth2Config oauth2.Config) *oauth.Provider { diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/session.go b/cmd/frontend/internal/auth/azureoauth/session.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/azureoauth/session.go rename to cmd/frontend/internal/auth/azureoauth/session.go index 9616c8c1689..2aa1022776c 100644 --- a/enterprise/cmd/frontend/internal/auth/azureoauth/session.go +++ b/cmd/frontend/internal/auth/azureoauth/session.go @@ -8,7 +8,7 @@ import ( "golang.org/x/oauth2" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/auth/azureoauth/session_test.go b/cmd/frontend/internal/auth/azureoauth/session_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/azureoauth/session_test.go rename to cmd/frontend/internal/auth/azureoauth/session_test.go diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel b/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel similarity index 87% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel rename to cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel index 3e8c6b979ce..34ac35ebfe3 100644 --- a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel @@ -9,13 +9,13 @@ go_library( "provider.go", "session.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/bitbucketcloudoauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/collections", @@ -55,7 +55,7 @@ go_test( "//cmd/frontend/auth", "//cmd/frontend/envvar", "//cmd/frontend/external/session", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/conf", diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/config.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/config.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/config.go diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go index dab7da79d3a..2b8760db9f1 100644 --- a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware.go similarity index 90% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/middleware.go index a138169b05e..dd4f373d15a 100644 --- a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/schema" diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go index b3e9b89dafd..1fa5209dbf0 100644 --- a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go similarity index 97% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go index 3ad274e0e76..73f4e3a78f3 100644 --- a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go @@ -14,7 +14,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/lazyregexp" diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/provider_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/provider_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/provider_test.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/provider_test.go diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/session.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/session.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/session.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/session.go index b4a3b9583a1..1a5c192ad80 100644 --- a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/session.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/session.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go rename to cmd/frontend/internal/auth/bitbucketcloudoauth/session_test.go diff --git a/enterprise/cmd/frontend/internal/auth/confauth/BUILD.bazel b/cmd/frontend/internal/auth/confauth/BUILD.bazel similarity index 76% rename from enterprise/cmd/frontend/internal/auth/confauth/BUILD.bazel rename to cmd/frontend/internal/auth/confauth/BUILD.bazel index 4182cbc8f2e..b8f8bad4d0d 100644 --- a/enterprise/cmd/frontend/internal/auth/confauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/confauth/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "confauth", srcs = ["middleware.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/confauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/confauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//internal/licensing", diff --git a/enterprise/cmd/frontend/internal/auth/confauth/middleware.go b/cmd/frontend/internal/auth/confauth/middleware.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/confauth/middleware.go rename to cmd/frontend/internal/auth/confauth/middleware.go diff --git a/enterprise/cmd/frontend/internal/auth/confauth/middleware_test.go b/cmd/frontend/internal/auth/confauth/middleware_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/confauth/middleware_test.go rename to cmd/frontend/internal/auth/confauth/middleware_test.go diff --git a/enterprise/cmd/frontend/internal/auth/gerrit/BUILD.bazel b/cmd/frontend/internal/auth/gerrit/BUILD.bazel similarity index 79% rename from enterprise/cmd/frontend/internal/auth/gerrit/BUILD.bazel rename to cmd/frontend/internal/auth/gerrit/BUILD.bazel index e603e7964fc..fe900800164 100644 --- a/enterprise/cmd/frontend/internal/auth/gerrit/BUILD.bazel +++ b/cmd/frontend/internal/auth/gerrit/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "gerrit", srcs = ["config.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/gerrit", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/gerrit", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/auth/providers", "//internal/collections", diff --git a/enterprise/cmd/frontend/internal/auth/gerrit/config.go b/cmd/frontend/internal/auth/gerrit/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gerrit/config.go rename to cmd/frontend/internal/auth/gerrit/config.go diff --git a/enterprise/cmd/frontend/internal/auth/gerrit/config_test.go b/cmd/frontend/internal/auth/gerrit/config_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gerrit/config_test.go rename to cmd/frontend/internal/auth/gerrit/config_test.go diff --git a/enterprise/cmd/frontend/internal/auth/githubappauth/BUILD.bazel b/cmd/frontend/internal/auth/githubappauth/BUILD.bazel similarity index 89% rename from enterprise/cmd/frontend/internal/auth/githubappauth/BUILD.bazel rename to cmd/frontend/internal/auth/githubappauth/BUILD.bazel index 403848d2889..e582305364c 100644 --- a/enterprise/cmd/frontend/internal/auth/githubappauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/githubappauth/BUILD.bazel @@ -8,14 +8,14 @@ go_library( "middleware.go", "resolver.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githubappauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githubappauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/backend", "//cmd/frontend/enterprise", "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/repos/webhooks/resolvers", + "//cmd/frontend/internal/repos/webhooks/resolvers", "//internal/auth", "//internal/codeintel", "//internal/conf/conftypes", diff --git a/enterprise/cmd/frontend/internal/auth/githubappauth/init.go b/cmd/frontend/internal/auth/githubappauth/init.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githubappauth/init.go rename to cmd/frontend/internal/auth/githubappauth/init.go diff --git a/enterprise/cmd/frontend/internal/auth/githubappauth/middleware.go b/cmd/frontend/internal/auth/githubappauth/middleware.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githubappauth/middleware.go rename to cmd/frontend/internal/auth/githubappauth/middleware.go diff --git a/enterprise/cmd/frontend/internal/auth/githubappauth/middleware_test.go b/cmd/frontend/internal/auth/githubappauth/middleware_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githubappauth/middleware_test.go rename to cmd/frontend/internal/auth/githubappauth/middleware_test.go diff --git a/enterprise/cmd/frontend/internal/auth/githubappauth/resolver.go b/cmd/frontend/internal/auth/githubappauth/resolver.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/githubappauth/resolver.go rename to cmd/frontend/internal/auth/githubappauth/resolver.go index d2c6a7edee6..6010b3eb415 100644 --- a/enterprise/cmd/frontend/internal/auth/githubappauth/resolver.go +++ b/cmd/frontend/internal/auth/githubappauth/resolver.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/repos/webhooks/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/repos/webhooks/resolvers" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/encryption/keyring" diff --git a/enterprise/cmd/frontend/internal/auth/githubappauth/resolver_test.go b/cmd/frontend/internal/auth/githubappauth/resolver_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githubappauth/resolver_test.go rename to cmd/frontend/internal/auth/githubappauth/resolver_test.go diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/BUILD.bazel b/cmd/frontend/internal/auth/githuboauth/BUILD.bazel similarity index 88% rename from enterprise/cmd/frontend/internal/auth/githuboauth/BUILD.bazel rename to cmd/frontend/internal/auth/githuboauth/BUILD.bazel index c729f4c8b1b..1fd4eb0b797 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/githuboauth/BUILD.bazel @@ -9,14 +9,14 @@ go_library( "provider.go", "session.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githuboauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githuboauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/envvar", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/collections", @@ -58,7 +58,7 @@ go_test( "//cmd/frontend/auth", "//cmd/frontend/envvar", "//cmd/frontend/external/session", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/conf", diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/config.go b/cmd/frontend/internal/auth/githuboauth/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githuboauth/config.go rename to cmd/frontend/internal/auth/githuboauth/config.go diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/config_test.go b/cmd/frontend/internal/auth/githuboauth/config_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/githuboauth/config_test.go rename to cmd/frontend/internal/auth/githuboauth/config_test.go index 6a90ed1e5d2..d67b12c415b 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/config_test.go +++ b/cmd/frontend/internal/auth/githuboauth/config_test.go @@ -9,7 +9,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/main_test.go b/cmd/frontend/internal/auth/githuboauth/main_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githuboauth/main_test.go rename to cmd/frontend/internal/auth/githuboauth/main_test.go diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/middleware.go b/cmd/frontend/internal/auth/githuboauth/middleware.go similarity index 90% rename from enterprise/cmd/frontend/internal/auth/githuboauth/middleware.go rename to cmd/frontend/internal/auth/githuboauth/middleware.go index 2ee3ef7db0d..cf173f15397 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/middleware.go +++ b/cmd/frontend/internal/auth/githuboauth/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/schema" diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/middleware_test.go b/cmd/frontend/internal/auth/githuboauth/middleware_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/githuboauth/middleware_test.go rename to cmd/frontend/internal/auth/githuboauth/middleware_test.go index 342c681cb46..645dbffb486 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/middleware_test.go +++ b/cmd/frontend/internal/auth/githuboauth/middleware_test.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/provider.go b/cmd/frontend/internal/auth/githuboauth/provider.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/githuboauth/provider.go rename to cmd/frontend/internal/auth/githuboauth/provider.go index b554b88e0e1..eb5415cc31f 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/provider.go +++ b/cmd/frontend/internal/auth/githuboauth/provider.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/lazyregexp" diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/provider_test.go b/cmd/frontend/internal/auth/githuboauth/provider_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githuboauth/provider_test.go rename to cmd/frontend/internal/auth/githuboauth/provider_test.go diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/session.go b/cmd/frontend/internal/auth/githuboauth/session.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/githuboauth/session.go rename to cmd/frontend/internal/auth/githuboauth/session.go index 8c03182108f..95651d8a63d 100644 --- a/enterprise/cmd/frontend/internal/auth/githuboauth/session.go +++ b/cmd/frontend/internal/auth/githuboauth/session.go @@ -17,7 +17,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/enterprise/cmd/frontend/internal/auth/githuboauth/session_test.go b/cmd/frontend/internal/auth/githuboauth/session_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/githuboauth/session_test.go rename to cmd/frontend/internal/auth/githuboauth/session_test.go diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel b/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel similarity index 87% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel rename to cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel index c4a64d5df32..b6d77b752c1 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel @@ -11,13 +11,13 @@ go_library( "session.go", "user.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/gitlaboauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/gitlaboauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/collections", @@ -54,7 +54,7 @@ go_test( "//cmd/frontend/auth", "//cmd/frontend/envvar", "//cmd/frontend/external/session", - "//enterprise/cmd/frontend/internal/auth/oauth", + "//cmd/frontend/internal/auth/oauth", "//internal/actor", "//internal/auth/providers", "//internal/conf", diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/config.go b/cmd/frontend/internal/auth/gitlaboauth/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/config.go rename to cmd/frontend/internal/auth/gitlaboauth/config.go diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/config_test.go b/cmd/frontend/internal/auth/gitlaboauth/config_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/config_test.go rename to cmd/frontend/internal/auth/gitlaboauth/config_test.go index 9a95f5e9a95..72c032e8101 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/config_test.go +++ b/cmd/frontend/internal/auth/gitlaboauth/config_test.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/login.go b/cmd/frontend/internal/auth/gitlaboauth/login.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/login.go rename to cmd/frontend/internal/auth/gitlaboauth/login.go diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/login_test.go b/cmd/frontend/internal/auth/gitlaboauth/login_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/login_test.go rename to cmd/frontend/internal/auth/gitlaboauth/login_test.go diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/middleware.go b/cmd/frontend/internal/auth/gitlaboauth/middleware.go similarity index 90% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/middleware.go rename to cmd/frontend/internal/auth/gitlaboauth/middleware.go index 8e56e534333..0bb5fbe386d 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/middleware.go +++ b/cmd/frontend/internal/auth/gitlaboauth/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/schema" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go b/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go rename to cmd/frontend/internal/auth/gitlaboauth/middleware_test.go index 10500f07917..921b1d38fd8 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go +++ b/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/provider.go b/cmd/frontend/internal/auth/gitlaboauth/provider.go similarity index 96% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/provider.go rename to cmd/frontend/internal/auth/gitlaboauth/provider.go index dc2f97f38f1..81ed6a2c79f 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/provider.go +++ b/cmd/frontend/internal/auth/gitlaboauth/provider.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go b/cmd/frontend/internal/auth/gitlaboauth/session.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go rename to cmd/frontend/internal/auth/gitlaboauth/session.go index fb31da2f1ce..a448835ebde 100644 --- a/enterprise/cmd/frontend/internal/auth/gitlaboauth/session.go +++ b/cmd/frontend/internal/auth/gitlaboauth/session.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/session_test.go b/cmd/frontend/internal/auth/gitlaboauth/session_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/session_test.go rename to cmd/frontend/internal/auth/gitlaboauth/session_test.go diff --git a/enterprise/cmd/frontend/internal/auth/gitlaboauth/user.go b/cmd/frontend/internal/auth/gitlaboauth/user.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/gitlaboauth/user.go rename to cmd/frontend/internal/auth/gitlaboauth/user.go diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/BUILD.bazel b/cmd/frontend/internal/auth/httpheader/BUILD.bazel similarity index 87% rename from enterprise/cmd/frontend/internal/auth/httpheader/BUILD.bazel rename to cmd/frontend/internal/auth/httpheader/BUILD.bazel index c4934b09f75..a983ad53b48 100644 --- a/enterprise/cmd/frontend/internal/auth/httpheader/BUILD.bazel +++ b/cmd/frontend/internal/auth/httpheader/BUILD.bazel @@ -8,8 +8,8 @@ go_library( "middleware.go", "provider.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/httpheader", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/httpheader", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//internal/actor", diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/config.go b/cmd/frontend/internal/auth/httpheader/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/httpheader/config.go rename to cmd/frontend/internal/auth/httpheader/config.go diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/config_test.go b/cmd/frontend/internal/auth/httpheader/config_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/httpheader/config_test.go rename to cmd/frontend/internal/auth/httpheader/config_test.go diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/middleware.go b/cmd/frontend/internal/auth/httpheader/middleware.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/httpheader/middleware.go rename to cmd/frontend/internal/auth/httpheader/middleware.go diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/middleware_test.go b/cmd/frontend/internal/auth/httpheader/middleware_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/httpheader/middleware_test.go rename to cmd/frontend/internal/auth/httpheader/middleware_test.go diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/provider.go b/cmd/frontend/internal/auth/httpheader/provider.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/httpheader/provider.go rename to cmd/frontend/internal/auth/httpheader/provider.go diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/testproxy.go b/cmd/frontend/internal/auth/httpheader/testproxy.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/httpheader/testproxy.go rename to cmd/frontend/internal/auth/httpheader/testproxy.go diff --git a/enterprise/cmd/frontend/internal/auth/init.go b/cmd/frontend/internal/auth/init.go similarity index 79% rename from enterprise/cmd/frontend/internal/auth/init.go rename to cmd/frontend/internal/auth/init.go index 9799216c35f..fca5d080245 100644 --- a/enterprise/cmd/frontend/internal/auth/init.go +++ b/cmd/frontend/internal/auth/init.go @@ -12,18 +12,18 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/app" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/azureoauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/confauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/azureoauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/bitbucketcloudoauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/confauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/gerrit" - githubapp "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githubappauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githuboauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/gitlaboauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/httpheader" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/openidconnect" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/saml" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/sourcegraphoperator" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/gerrit" + githubapp "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githubappauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githuboauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/gitlaboauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/httpheader" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/saml" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/sourcegraphoperator" internalauth "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/auth/oauth/BUILD.bazel b/cmd/frontend/internal/auth/oauth/BUILD.bazel similarity index 88% rename from enterprise/cmd/frontend/internal/auth/oauth/BUILD.bazel rename to cmd/frontend/internal/auth/oauth/BUILD.bazel index 340fd1cee48..28da187c08b 100644 --- a/enterprise/cmd/frontend/internal/auth/oauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/oauth/BUILD.bazel @@ -10,8 +10,8 @@ go_library( "session.go", "utils.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/oauth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/external/session", diff --git a/enterprise/cmd/frontend/internal/auth/oauth/cookie.go b/cmd/frontend/internal/auth/oauth/cookie.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/oauth/cookie.go rename to cmd/frontend/internal/auth/oauth/cookie.go diff --git a/enterprise/cmd/frontend/internal/auth/oauth/middleware.go b/cmd/frontend/internal/auth/oauth/middleware.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/oauth/middleware.go rename to cmd/frontend/internal/auth/oauth/middleware.go diff --git a/enterprise/cmd/frontend/internal/auth/oauth/provider.go b/cmd/frontend/internal/auth/oauth/provider.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/oauth/provider.go rename to cmd/frontend/internal/auth/oauth/provider.go diff --git a/enterprise/cmd/frontend/internal/auth/oauth/provider_test.go b/cmd/frontend/internal/auth/oauth/provider_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/oauth/provider_test.go rename to cmd/frontend/internal/auth/oauth/provider_test.go diff --git a/enterprise/cmd/frontend/internal/auth/oauth/session.go b/cmd/frontend/internal/auth/oauth/session.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/oauth/session.go rename to cmd/frontend/internal/auth/oauth/session.go diff --git a/enterprise/cmd/frontend/internal/auth/oauth/utils.go b/cmd/frontend/internal/auth/oauth/utils.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/oauth/utils.go rename to cmd/frontend/internal/auth/oauth/utils.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/BUILD.bazel b/cmd/frontend/internal/auth/openidconnect/BUILD.bazel similarity index 90% rename from enterprise/cmd/frontend/internal/auth/openidconnect/BUILD.bazel rename to cmd/frontend/internal/auth/openidconnect/BUILD.bazel index e6e869958a4..974de54f305 100644 --- a/enterprise/cmd/frontend/internal/auth/openidconnect/BUILD.bazel +++ b/cmd/frontend/internal/auth/openidconnect/BUILD.bazel @@ -10,8 +10,8 @@ go_library( "session.go", "user.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/openidconnect", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/external/globals", diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/config.go b/cmd/frontend/internal/auth/openidconnect/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/config.go rename to cmd/frontend/internal/auth/openidconnect/config.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/config_test.go b/cmd/frontend/internal/auth/openidconnect/config_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/config_test.go rename to cmd/frontend/internal/auth/openidconnect/config_test.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/middleware.go b/cmd/frontend/internal/auth/openidconnect/middleware.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/middleware.go rename to cmd/frontend/internal/auth/openidconnect/middleware.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/middleware_test.go b/cmd/frontend/internal/auth/openidconnect/middleware_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/middleware_test.go rename to cmd/frontend/internal/auth/openidconnect/middleware_test.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/provider.go b/cmd/frontend/internal/auth/openidconnect/provider.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/provider.go rename to cmd/frontend/internal/auth/openidconnect/provider.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/session.go b/cmd/frontend/internal/auth/openidconnect/session.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/session.go rename to cmd/frontend/internal/auth/openidconnect/session.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/user.go b/cmd/frontend/internal/auth/openidconnect/user.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/user.go rename to cmd/frontend/internal/auth/openidconnect/user.go diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/user_test.go b/cmd/frontend/internal/auth/openidconnect/user_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/openidconnect/user_test.go rename to cmd/frontend/internal/auth/openidconnect/user_test.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/BUILD.bazel b/cmd/frontend/internal/auth/saml/BUILD.bazel similarity index 92% rename from enterprise/cmd/frontend/internal/auth/saml/BUILD.bazel rename to cmd/frontend/internal/auth/saml/BUILD.bazel index 30969c19985..f62ef536b90 100644 --- a/enterprise/cmd/frontend/internal/auth/saml/BUILD.bazel +++ b/cmd/frontend/internal/auth/saml/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "session.go", "user.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/saml", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/saml", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/external/session", diff --git a/enterprise/cmd/frontend/internal/auth/saml/config.go b/cmd/frontend/internal/auth/saml/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/config.go rename to cmd/frontend/internal/auth/saml/config.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/config_test.go b/cmd/frontend/internal/auth/saml/config_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/config_test.go rename to cmd/frontend/internal/auth/saml/config_test.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/doc.go b/cmd/frontend/internal/auth/saml/doc.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/doc.go rename to cmd/frontend/internal/auth/saml/doc.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/middleware.go b/cmd/frontend/internal/auth/saml/middleware.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/middleware.go rename to cmd/frontend/internal/auth/saml/middleware.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/middleware_test.go b/cmd/frontend/internal/auth/saml/middleware_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/middleware_test.go rename to cmd/frontend/internal/auth/saml/middleware_test.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/provider.go b/cmd/frontend/internal/auth/saml/provider.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/provider.go rename to cmd/frontend/internal/auth/saml/provider.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/provider_test.go b/cmd/frontend/internal/auth/saml/provider_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/provider_test.go rename to cmd/frontend/internal/auth/saml/provider_test.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/session.go b/cmd/frontend/internal/auth/saml/session.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/session.go rename to cmd/frontend/internal/auth/saml/session.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/user.go b/cmd/frontend/internal/auth/saml/user.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/user.go rename to cmd/frontend/internal/auth/saml/user.go diff --git a/enterprise/cmd/frontend/internal/auth/saml/user_test.go b/cmd/frontend/internal/auth/saml/user_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/saml/user_test.go rename to cmd/frontend/internal/auth/saml/user_test.go diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel b/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel similarity index 85% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel rename to cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel index f98dfc6ecdc..60b927bfe7d 100644 --- a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel +++ b/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel @@ -9,12 +9,12 @@ go_library( "middleware.go", "provider.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/sourcegraphoperator", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/sourcegraphoperator", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", "//cmd/frontend/external/session", - "//enterprise/cmd/frontend/internal/auth/openidconnect", + "//cmd/frontend/internal/auth/openidconnect", "//enterprise/cmd/worker/shared/sourcegraphoperator", "//internal/actor", "//internal/auth", @@ -46,7 +46,7 @@ go_test( deps = [ "//cmd/frontend/auth", "//cmd/frontend/external/session", - "//enterprise/cmd/frontend/internal/auth/openidconnect", + "//cmd/frontend/internal/auth/openidconnect", "//enterprise/cmd/worker/shared/sourcegraphoperator", "//internal/actor", "//internal/auth", diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/associate.go b/cmd/frontend/internal/auth/sourcegraphoperator/associate.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/associate.go rename to cmd/frontend/internal/auth/sourcegraphoperator/associate.go diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go b/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go rename to cmd/frontend/internal/auth/sourcegraphoperator/associate_test.go diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/config.go b/cmd/frontend/internal/auth/sourcegraphoperator/config.go similarity index 95% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/config.go rename to cmd/frontend/internal/auth/sourcegraphoperator/config.go index 7fb7b948729..bbc17f53fc6 100644 --- a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/config.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/config.go @@ -5,7 +5,7 @@ import ( "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/openidconnect" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" osssourcegraphoperator "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/auth/providers" diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/config_test.go b/cmd/frontend/internal/auth/sourcegraphoperator/config_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/config_test.go rename to cmd/frontend/internal/auth/sourcegraphoperator/config_test.go diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go b/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go similarity index 98% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go rename to cmd/frontend/internal/auth/sourcegraphoperator/middleware.go index 5648b039b14..5a728cd2da0 100644 --- a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/openidconnect" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator" "github.com/sourcegraph/sourcegraph/internal/actor" internalauth "github.com/sourcegraph/sourcegraph/internal/auth" diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go b/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go rename to cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go index c49ccf1cb42..65381b38c56 100644 --- a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go @@ -20,7 +20,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/openidconnect" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" "github.com/sourcegraph/sourcegraph/internal/actor" internalauth "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/auth/providers" diff --git a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/provider.go b/cmd/frontend/internal/auth/sourcegraphoperator/provider.go similarity index 96% rename from enterprise/cmd/frontend/internal/auth/sourcegraphoperator/provider.go rename to cmd/frontend/internal/auth/sourcegraphoperator/provider.go index 032498ca1e1..057ebb3251b 100644 --- a/enterprise/cmd/frontend/internal/auth/sourcegraphoperator/provider.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/provider.go @@ -4,7 +4,7 @@ import ( "path" feAuth "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/openidconnect" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/auth/providers" "github.com/sourcegraph/sourcegraph/internal/cloud" diff --git a/enterprise/cmd/frontend/internal/authz/BUILD.bazel b/cmd/frontend/internal/authz/BUILD.bazel similarity index 68% rename from enterprise/cmd/frontend/internal/authz/BUILD.bazel rename to cmd/frontend/internal/authz/BUILD.bazel index f1100437ff3..c891b14ddaf 100644 --- a/enterprise/cmd/frontend/internal/authz/BUILD.bazel +++ b/cmd/frontend/internal/authz/BUILD.bazel @@ -3,15 +3,15 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "authz", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/authz", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/authz", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/graphqlbackend", "//cmd/frontend/hooks", - "//enterprise/cmd/frontend/internal/authz/resolvers", - "//enterprise/cmd/frontend/internal/authz/webhooks", - "//enterprise/cmd/frontend/internal/licensing/enforcement", + "//cmd/frontend/internal/authz/resolvers", + "//cmd/frontend/internal/authz/webhooks", + "//cmd/frontend/internal/licensing/enforcement", "//internal/actor", "//internal/auth", "//internal/authz", diff --git a/enterprise/cmd/frontend/internal/authz/CODENOTIFY b/cmd/frontend/internal/authz/CODENOTIFY similarity index 100% rename from enterprise/cmd/frontend/internal/authz/CODENOTIFY rename to cmd/frontend/internal/authz/CODENOTIFY diff --git a/enterprise/cmd/frontend/internal/authz/init.go b/cmd/frontend/internal/authz/init.go similarity index 97% rename from enterprise/cmd/frontend/internal/authz/init.go rename to cmd/frontend/internal/authz/init.go index 37be6dafdba..b1619eae030 100644 --- a/enterprise/cmd/frontend/internal/authz/init.go +++ b/cmd/frontend/internal/authz/init.go @@ -12,9 +12,9 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/cmd/frontend/hooks" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/authz/resolvers" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/authz/webhooks" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/enforcement" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/authz/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/authz/webhooks" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/enforcement" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/BUILD.bazel b/cmd/frontend/internal/authz/resolvers/BUILD.bazel similarity index 93% rename from enterprise/cmd/frontend/internal/authz/resolvers/BUILD.bazel rename to cmd/frontend/internal/authz/resolvers/BUILD.bazel index 4f0800ea6d3..29223a98727 100644 --- a/enterprise/cmd/frontend/internal/authz/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/authz/resolvers/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "resolver.go", "users.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/authz/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/authz/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/envvar", "//cmd/frontend/globals", diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/bitbucket_projects_permission_jobs.go b/cmd/frontend/internal/authz/resolvers/bitbucket_projects_permission_jobs.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/bitbucket_projects_permission_jobs.go rename to cmd/frontend/internal/authz/resolvers/bitbucket_projects_permission_jobs.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/permissions_info.go b/cmd/frontend/internal/authz/resolvers/permissions_info.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/permissions_info.go rename to cmd/frontend/internal/authz/resolvers/permissions_info.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/permissions_sync_jobs.go b/cmd/frontend/internal/authz/resolvers/permissions_sync_jobs.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/permissions_sync_jobs.go rename to cmd/frontend/internal/authz/resolvers/permissions_sync_jobs.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/permissions_sync_jobs_test.go b/cmd/frontend/internal/authz/resolvers/permissions_sync_jobs_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/permissions_sync_jobs_test.go rename to cmd/frontend/internal/authz/resolvers/permissions_sync_jobs_test.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/repositories.go b/cmd/frontend/internal/authz/resolvers/repositories.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/repositories.go rename to cmd/frontend/internal/authz/resolvers/repositories.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/resolver.go b/cmd/frontend/internal/authz/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/resolver.go rename to cmd/frontend/internal/authz/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/resolver_test.go b/cmd/frontend/internal/authz/resolvers/resolver_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/resolver_test.go rename to cmd/frontend/internal/authz/resolvers/resolver_test.go diff --git a/enterprise/cmd/frontend/internal/authz/resolvers/users.go b/cmd/frontend/internal/authz/resolvers/users.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/resolvers/users.go rename to cmd/frontend/internal/authz/resolvers/users.go diff --git a/enterprise/cmd/frontend/internal/authz/webhooks/BUILD.bazel b/cmd/frontend/internal/authz/webhooks/BUILD.bazel similarity index 88% rename from enterprise/cmd/frontend/internal/authz/webhooks/BUILD.bazel rename to cmd/frontend/internal/authz/webhooks/BUILD.bazel index 87505febd79..4c72c0915c8 100644 --- a/enterprise/cmd/frontend/internal/authz/webhooks/BUILD.bazel +++ b/cmd/frontend/internal/authz/webhooks/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "webhooks", srcs = ["github.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/authz/webhooks", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/authz/webhooks", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/webhooks", "//internal/api", diff --git a/enterprise/cmd/frontend/internal/authz/webhooks/github.go b/cmd/frontend/internal/authz/webhooks/github.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/webhooks/github.go rename to cmd/frontend/internal/authz/webhooks/github.go diff --git a/enterprise/cmd/frontend/internal/authz/webhooks/github_test.go b/cmd/frontend/internal/authz/webhooks/github_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/authz/webhooks/github_test.go rename to cmd/frontend/internal/authz/webhooks/github_test.go diff --git a/enterprise/cmd/frontend/internal/batches/BUILD.bazel b/cmd/frontend/internal/batches/BUILD.bazel similarity index 60% rename from enterprise/cmd/frontend/internal/batches/BUILD.bazel rename to cmd/frontend/internal/batches/BUILD.bazel index 7d9de40edcb..884ae996e36 100644 --- a/enterprise/cmd/frontend/internal/batches/BUILD.bazel +++ b/cmd/frontend/internal/batches/BUILD.bazel @@ -3,13 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "batches", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/batches/httpapi", - "//enterprise/cmd/frontend/internal/batches/resolvers", - "//enterprise/cmd/frontend/internal/batches/webhooks", + "//cmd/frontend/internal/batches/httpapi", + "//cmd/frontend/internal/batches/resolvers", + "//cmd/frontend/internal/batches/webhooks", "//internal/batches/store", "//internal/batches/types/scheduler/window", "//internal/codeintel", diff --git a/enterprise/cmd/frontend/internal/batches/httpapi/BUILD.bazel b/cmd/frontend/internal/batches/httpapi/BUILD.bazel similarity index 89% rename from enterprise/cmd/frontend/internal/batches/httpapi/BUILD.bazel rename to cmd/frontend/internal/batches/httpapi/BUILD.bazel index dc8fbbf7ea8..ce0eb75b617 100644 --- a/enterprise/cmd/frontend/internal/batches/httpapi/BUILD.bazel +++ b/cmd/frontend/internal/batches/httpapi/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "file_handler.go", "observability.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/httpapi", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/httpapi", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/batches/store", "//internal/batches/types", diff --git a/enterprise/cmd/frontend/internal/batches/httpapi/file_handler.go b/cmd/frontend/internal/batches/httpapi/file_handler.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/httpapi/file_handler.go rename to cmd/frontend/internal/batches/httpapi/file_handler.go diff --git a/enterprise/cmd/frontend/internal/batches/httpapi/file_handler_test.go b/cmd/frontend/internal/batches/httpapi/file_handler_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/httpapi/file_handler_test.go rename to cmd/frontend/internal/batches/httpapi/file_handler_test.go index f6dc7fc3efa..48751f90ab2 100644 --- a/enterprise/cmd/frontend/internal/batches/httpapi/file_handler_test.go +++ b/cmd/frontend/internal/batches/httpapi/file_handler_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/httpapi" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/httpapi" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/internal/batches/testing" diff --git a/enterprise/cmd/frontend/internal/batches/httpapi/observability.go b/cmd/frontend/internal/batches/httpapi/observability.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/httpapi/observability.go rename to cmd/frontend/internal/batches/httpapi/observability.go diff --git a/enterprise/cmd/frontend/internal/batches/init.go b/cmd/frontend/internal/batches/init.go similarity index 90% rename from enterprise/cmd/frontend/internal/batches/init.go rename to cmd/frontend/internal/batches/init.go index a0c04919e52..038808e96da 100644 --- a/enterprise/cmd/frontend/internal/batches/init.go +++ b/cmd/frontend/internal/batches/init.go @@ -6,9 +6,9 @@ import ( sglog "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/httpapi" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/webhooks" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/httpapi" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/webhooks" "github.com/sourcegraph/sourcegraph/internal/batches/store" "github.com/sourcegraph/sourcegraph/internal/batches/types/scheduler/window" "github.com/sourcegraph/sourcegraph/internal/codeintel" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/BUILD.bazel b/cmd/frontend/internal/batches/resolvers/BUILD.bazel similarity index 94% rename from enterprise/cmd/frontend/internal/batches/resolvers/BUILD.bazel rename to cmd/frontend/internal/batches/resolvers/BUILD.bazel index b719a4d605e..2e142ff85c3 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/batches/resolvers/BUILD.bazel @@ -36,15 +36,15 @@ go_library( "resolver.go", "urls.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/globals", "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/externallink", "//cmd/frontend/graphqlbackend/graphqlutil", - "//enterprise/cmd/frontend/internal/auth/githubappauth", + "//cmd/frontend/internal/auth/githubappauth", "//internal/actor", "//internal/api", "//internal/auth", @@ -131,8 +131,8 @@ go_test( "//cmd/frontend/globals", "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/externallink", - "//enterprise/cmd/frontend/internal/auth/githubappauth", - "//enterprise/cmd/frontend/internal/batches/resolvers/apitest", + "//cmd/frontend/internal/auth/githubappauth", + "//cmd/frontend/internal/batches/resolvers/apitest", "//internal/actor", "//internal/api", "//internal/batches/graphql", diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/apitest/BUILD.bazel b/cmd/frontend/internal/batches/resolvers/apitest/BUILD.bazel similarity index 73% rename from enterprise/cmd/frontend/internal/batches/resolvers/apitest/BUILD.bazel rename to cmd/frontend/internal/batches/resolvers/apitest/BUILD.bazel index cd2f01d869d..478e77e228b 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/apitest/BUILD.bazel +++ b/cmd/frontend/internal/batches/resolvers/apitest/BUILD.bazel @@ -6,8 +6,8 @@ go_library( "exec.go", "types.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/batches/types", diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/apitest/exec.go b/cmd/frontend/internal/batches/resolvers/apitest/exec.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/apitest/exec.go rename to cmd/frontend/internal/batches/resolvers/apitest/exec.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/apitest/types.go b/cmd/frontend/internal/batches/resolvers/apitest/types.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/apitest/types.go rename to cmd/frontend/internal/batches/resolvers/apitest/types.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change.go b/cmd/frontend/internal/batches/resolvers/batch_change.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_change.go rename to cmd/frontend/internal/batches/resolvers/batch_change.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection.go b/cmd/frontend/internal/batches/resolvers/batch_change_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection.go rename to cmd/frontend/internal/batches/resolvers/batch_change_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go b/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go rename to cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go index e055d7e6596..3f6d1d90839 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" bstore "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_test.go b/cmd/frontend/internal/batches/resolvers/batch_change_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_change_test.go rename to cmd/frontend/internal/batches/resolvers/batch_change_test.go index 61eba9b920a..a13636b7849 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_test.go +++ b/cmd/frontend/internal/batches/resolvers/batch_change_test.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec.go b/cmd/frontend/internal/batches/resolvers/batch_spec.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec.go rename to cmd/frontend/internal/batches/resolvers/batch_spec.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_connection.go b/cmd/frontend/internal/batches/resolvers/batch_spec_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_connection.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_test.go b/cmd/frontend/internal/batches/resolvers/batch_spec_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_test.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_test.go index f90e7756ee4..dc335af0b78 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_test.go +++ b/cmd/frontend/internal/batches/resolvers/batch_spec_test.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/service" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_connection.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_connection.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection_test.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection_test.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_connection_test.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_test.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_test.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_file_test.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution_test.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution_test.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_resolution_test.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step_test.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step_test.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_step_test.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_test.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_test.go similarity index 97% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_test.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspace_test.go index 7c6820771a3..f3bc4de5393 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_test.go +++ b/cmd/frontend/internal/batches/resolvers/batch_spec_workspace_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspaces_stats.go b/cmd/frontend/internal/batches/resolvers/batch_spec_workspaces_stats.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/batch_spec_workspaces_stats.go rename to cmd/frontend/internal/batches/resolvers/batch_spec_workspaces_stats.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation.go b/cmd/frontend/internal/batches/resolvers/bulk_operation.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation.go rename to cmd/frontend/internal/batches/resolvers/bulk_operation.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_connection.go b/cmd/frontend/internal/batches/resolvers/bulk_operation_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_connection.go rename to cmd/frontend/internal/batches/resolvers/bulk_operation_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_connection_test.go b/cmd/frontend/internal/batches/resolvers/bulk_operation_connection_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_connection_test.go rename to cmd/frontend/internal/batches/resolvers/bulk_operation_connection_test.go index 639537ce7fa..5b6ed74def9 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/bulk_operation_connection_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_test.go b/cmd/frontend/internal/batches/resolvers/bulk_operation_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_test.go rename to cmd/frontend/internal/batches/resolvers/bulk_operation_test.go index a3b5d50e54b..7654d6bd6e3 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/bulk_operation_test.go +++ b/cmd/frontend/internal/batches/resolvers/bulk_operation_test.go @@ -9,7 +9,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset.go b/cmd/frontend/internal/batches/resolvers/changeset.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset.go rename to cmd/frontend/internal/batches/resolvers/changeset.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview.go b/cmd/frontend/internal/batches/resolvers/changeset_apply_preview.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview.go rename to cmd/frontend/internal/batches/resolvers/changeset_apply_preview.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection.go b/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection.go rename to cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection_test.go b/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection_test.go index b0163b300db..dc5d1646692 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_connection_test.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/internal/batches/testing" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_test.go b/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_apply_preview_test.go index 82b917e877b..c4f025d5799 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_apply_preview_test.go @@ -13,7 +13,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_connection.go b/cmd/frontend/internal/batches/resolvers/changeset_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_connection.go rename to cmd/frontend/internal/batches/resolvers/changeset_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_connection_test.go b/cmd/frontend/internal/batches/resolvers/changeset_connection_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_connection_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_connection_test.go index 223f0f891f0..86c2c090531 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_connection_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_counts.go b/cmd/frontend/internal/batches/resolvers/changeset_counts.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_counts.go rename to cmd/frontend/internal/batches/resolvers/changeset_counts.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_counts_test.go b/cmd/frontend/internal/batches/resolvers/changeset_counts_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_counts_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_counts_test.go index 212b3ee3349..cdcf299ab6a 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_counts_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_counts_test.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/sources" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_event.go b/cmd/frontend/internal/batches/resolvers/changeset_event.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_event.go rename to cmd/frontend/internal/batches/resolvers/changeset_event.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_event_connection.go b/cmd/frontend/internal/batches/resolvers/changeset_event_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_event_connection.go rename to cmd/frontend/internal/batches/resolvers/changeset_event_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_event_connection_test.go b/cmd/frontend/internal/batches/resolvers/changeset_event_connection_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_event_connection_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_event_connection_test.go index c708d41936a..3e954f899fc 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_event_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_event_connection_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_job_error.go b/cmd/frontend/internal/batches/resolvers/changeset_job_error.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_job_error.go rename to cmd/frontend/internal/batches/resolvers/changeset_job_error.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec.go b/cmd/frontend/internal/batches/resolvers/changeset_spec.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec.go rename to cmd/frontend/internal/batches/resolvers/changeset_spec.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_connection.go b/cmd/frontend/internal/batches/resolvers/changeset_spec_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_connection.go rename to cmd/frontend/internal/batches/resolvers/changeset_spec_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_connection_test.go b/cmd/frontend/internal/batches/resolvers/changeset_spec_connection_test.go similarity index 97% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_connection_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_spec_connection_test.go index fa62065187e..d3645fe4d45 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_spec_connection_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/internal/batches/testing" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_test.go b/cmd/frontend/internal/batches/resolvers/changeset_spec_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_spec_test.go index 0a8b37732da..b804e3f14a9 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_spec_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_spec_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_test.go b/cmd/frontend/internal/batches/resolvers/changeset_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/changeset_test.go rename to cmd/frontend/internal/batches/resolvers/changeset_test.go index 63e3b72ab72..b25ac05967c 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset_test.go +++ b/cmd/frontend/internal/batches/resolvers/changeset_test.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changesets_stats.go b/cmd/frontend/internal/batches/resolvers/changesets_stats.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changesets_stats.go rename to cmd/frontend/internal/batches/resolvers/changesets_stats.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changesets_stats_test.go b/cmd/frontend/internal/batches/resolvers/changesets_stats_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/changesets_stats_test.go rename to cmd/frontend/internal/batches/resolvers/changesets_stats_test.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/code_host.go b/cmd/frontend/internal/batches/resolvers/code_host.go similarity index 96% rename from enterprise/cmd/frontend/internal/batches/resolvers/code_host.go rename to cmd/frontend/internal/batches/resolvers/code_host.go index 837062040ba..2f57e95940c 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/code_host.go +++ b/cmd/frontend/internal/batches/resolvers/code_host.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - githubapp "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githubappauth" + githubapp "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githubappauth" "github.com/sourcegraph/sourcegraph/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/code_host_connection.go b/cmd/frontend/internal/batches/resolvers/code_host_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/code_host_connection.go rename to cmd/frontend/internal/batches/resolvers/code_host_connection.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/code_host_connection_test.go b/cmd/frontend/internal/batches/resolvers/code_host_connection_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/code_host_connection_test.go rename to cmd/frontend/internal/batches/resolvers/code_host_connection_test.go index 2578a6a8d95..4206556c7ba 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/code_host_connection_test.go +++ b/cmd/frontend/internal/batches/resolvers/code_host_connection_test.go @@ -10,7 +10,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/internal/batches/testing" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/credential.go b/cmd/frontend/internal/batches/resolvers/credential.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/credential.go rename to cmd/frontend/internal/batches/resolvers/credential.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/credential_test.go b/cmd/frontend/internal/batches/resolvers/credential_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/credential_test.go rename to cmd/frontend/internal/batches/resolvers/credential_test.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/errors.go b/cmd/frontend/internal/batches/resolvers/errors.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/errors.go rename to cmd/frontend/internal/batches/resolvers/errors.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/main_test.go b/cmd/frontend/internal/batches/resolvers/main_test.go similarity index 97% rename from enterprise/cmd/frontend/internal/batches/resolvers/main_test.go rename to cmd/frontend/internal/batches/resolvers/main_test.go index 41e87f457ae..a31864407d2 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/main_test.go +++ b/cmd/frontend/internal/batches/resolvers/main_test.go @@ -18,8 +18,8 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - githubapp "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githubappauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + githubapp "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githubappauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/batches/store" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/permissions_test.go b/cmd/frontend/internal/batches/resolvers/permissions_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/permissions_test.go rename to cmd/frontend/internal/batches/resolvers/permissions_test.go index 4d2d50215f3..291859420e5 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/permissions_test.go +++ b/cmd/frontend/internal/batches/resolvers/permissions_test.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/resolved_batch_spec_workspace.go b/cmd/frontend/internal/batches/resolvers/resolved_batch_spec_workspace.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/resolved_batch_spec_workspace.go rename to cmd/frontend/internal/batches/resolvers/resolved_batch_spec_workspace.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go b/cmd/frontend/internal/batches/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/resolver.go rename to cmd/frontend/internal/batches/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/resolver_test.go b/cmd/frontend/internal/batches/resolvers/resolver_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/batches/resolvers/resolver_test.go rename to cmd/frontend/internal/batches/resolvers/resolver_test.go index 054de41bdb8..5bb4eee6d9e 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/resolver_test.go +++ b/cmd/frontend/internal/batches/resolvers/resolver_test.go @@ -19,7 +19,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" bgql "github.com/sourcegraph/sourcegraph/internal/batches/graphql" diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/testdata/vcr/test-changeset-counts-over-time.yaml b/cmd/frontend/internal/batches/resolvers/testdata/vcr/test-changeset-counts-over-time.yaml similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/testdata/vcr/test-changeset-counts-over-time.yaml rename to cmd/frontend/internal/batches/resolvers/testdata/vcr/test-changeset-counts-over-time.yaml diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/urls.go b/cmd/frontend/internal/batches/resolvers/urls.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/resolvers/urls.go rename to cmd/frontend/internal/batches/resolvers/urls.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/BUILD.bazel b/cmd/frontend/internal/batches/webhooks/BUILD.bazel similarity index 94% rename from enterprise/cmd/frontend/internal/batches/webhooks/BUILD.bazel rename to cmd/frontend/internal/batches/webhooks/BUILD.bazel index e4d827aab09..a406cfc6076 100644 --- a/enterprise/cmd/frontend/internal/batches/webhooks/BUILD.bazel +++ b/cmd/frontend/internal/batches/webhooks/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "gitlab.go", "webhooks.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/webhooks", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/webhooks", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/webhooks", "//internal/actor", diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/azuredevops.go b/cmd/frontend/internal/batches/webhooks/azuredevops.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/azuredevops.go rename to cmd/frontend/internal/batches/webhooks/azuredevops.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/bitbucketcloud.go b/cmd/frontend/internal/batches/webhooks/bitbucketcloud.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/bitbucketcloud.go rename to cmd/frontend/internal/batches/webhooks/bitbucketcloud.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/bitbucketcloud_test.go b/cmd/frontend/internal/batches/webhooks/bitbucketcloud_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/bitbucketcloud_test.go rename to cmd/frontend/internal/batches/webhooks/bitbucketcloud_test.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/bitbucketserver.go b/cmd/frontend/internal/batches/webhooks/bitbucketserver.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/bitbucketserver.go rename to cmd/frontend/internal/batches/webhooks/bitbucketserver.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/bitbucketserver_test.go b/cmd/frontend/internal/batches/webhooks/bitbucketserver_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/bitbucketserver_test.go rename to cmd/frontend/internal/batches/webhooks/bitbucketserver_test.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/github.go b/cmd/frontend/internal/batches/webhooks/github.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/github.go rename to cmd/frontend/internal/batches/webhooks/github.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/github_test.go b/cmd/frontend/internal/batches/webhooks/github_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/github_test.go rename to cmd/frontend/internal/batches/webhooks/github_test.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/gitlab.go b/cmd/frontend/internal/batches/webhooks/gitlab.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/gitlab.go rename to cmd/frontend/internal/batches/webhooks/gitlab.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/gitlab_test.go b/cmd/frontend/internal/batches/webhooks/gitlab_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/gitlab_test.go rename to cmd/frontend/internal/batches/webhooks/gitlab_test.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/main_test.go b/cmd/frontend/internal/batches/webhooks/main_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/main_test.go rename to cmd/frontend/internal/batches/webhooks/main_test.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-comment.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-comment.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-comment.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-comment.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-review.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-review.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-review.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/add-review.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/needswork-to-unapproved.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/needswork-to-unapproved.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/needswork-to-unapproved.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/bitbucketserver/needswork-to-unapproved.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/add-review.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/add-review.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/add-review.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/add-review.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-run.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-run.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-run.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-run.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-suite.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-suite.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-suite.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/check-suite.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/converted-to-draft.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/converted-to-draft.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/converted-to-draft.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/converted-to-draft.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/existing-changeset-event.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/existing-changeset-event.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/existing-changeset-event.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/existing-changeset-event.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/merge.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/merge.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/merge.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/merge.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset-event.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset-event.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset-event.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset-event.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/non-existent-changeset.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/ready-for-review.json b/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/ready-for-review.json similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/ready-for-review.json rename to cmd/frontend/internal/batches/webhooks/testdata/fixtures/webhooks/github/ready-for-review.json diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/vcr/bitbucket-webhooks.yaml b/cmd/frontend/internal/batches/webhooks/testdata/vcr/bitbucket-webhooks.yaml similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/vcr/bitbucket-webhooks.yaml rename to cmd/frontend/internal/batches/webhooks/testdata/vcr/bitbucket-webhooks.yaml diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/testdata/vcr/github-webhooks.yaml b/cmd/frontend/internal/batches/webhooks/testdata/vcr/github-webhooks.yaml similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/testdata/vcr/github-webhooks.yaml rename to cmd/frontend/internal/batches/webhooks/testdata/vcr/github-webhooks.yaml diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/webhooks.go b/cmd/frontend/internal/batches/webhooks/webhooks.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/webhooks.go rename to cmd/frontend/internal/batches/webhooks/webhooks.go diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/webhooks_integration_test.go b/cmd/frontend/internal/batches/webhooks/webhooks_integration_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/batches/webhooks/webhooks_integration_test.go rename to cmd/frontend/internal/batches/webhooks/webhooks_integration_test.go diff --git a/enterprise/cmd/frontend/internal/codeintel/BUILD.bazel b/cmd/frontend/internal/codeintel/BUILD.bazel similarity index 87% rename from enterprise/cmd/frontend/internal/codeintel/BUILD.bazel rename to cmd/frontend/internal/codeintel/BUILD.bazel index 7751cec8aa4..170543982d2 100644 --- a/enterprise/cmd/frontend/internal/codeintel/BUILD.bazel +++ b/cmd/frontend/internal/codeintel/BUILD.bazel @@ -6,8 +6,8 @@ go_library( "config.go", "init.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codeintel", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codeintel", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/graphqlbackend", diff --git a/enterprise/cmd/frontend/internal/codeintel/CODENOTIFY b/cmd/frontend/internal/codeintel/CODENOTIFY similarity index 100% rename from enterprise/cmd/frontend/internal/codeintel/CODENOTIFY rename to cmd/frontend/internal/codeintel/CODENOTIFY diff --git a/enterprise/cmd/frontend/internal/codeintel/config.go b/cmd/frontend/internal/codeintel/config.go similarity index 100% rename from enterprise/cmd/frontend/internal/codeintel/config.go rename to cmd/frontend/internal/codeintel/config.go diff --git a/enterprise/cmd/frontend/internal/codeintel/init.go b/cmd/frontend/internal/codeintel/init.go similarity index 100% rename from enterprise/cmd/frontend/internal/codeintel/init.go rename to cmd/frontend/internal/codeintel/init.go diff --git a/enterprise/cmd/frontend/internal/codemonitors/BUILD.bazel b/cmd/frontend/internal/codemonitors/BUILD.bazel similarity index 60% rename from enterprise/cmd/frontend/internal/codemonitors/BUILD.bazel rename to cmd/frontend/internal/codemonitors/BUILD.bazel index 597970c8f5d..9483f24da3e 100644 --- a/enterprise/cmd/frontend/internal/codemonitors/BUILD.bazel +++ b/cmd/frontend/internal/codemonitors/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "codemonitors", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codemonitors", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codemonitors", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/codemonitors/resolvers", + "//cmd/frontend/internal/codemonitors/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/codemonitors/init.go b/cmd/frontend/internal/codemonitors/init.go similarity index 87% rename from enterprise/cmd/frontend/internal/codemonitors/init.go rename to cmd/frontend/internal/codemonitors/init.go index 6ac93b397e7..e5c82d4bde0 100644 --- a/enterprise/cmd/frontend/internal/codemonitors/init.go +++ b/cmd/frontend/internal/codemonitors/init.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codemonitors/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codemonitors/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel b/cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel similarity index 84% rename from enterprise/cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel rename to cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel index db663977b1f..6c9dda72bf0 100644 --- a/enterprise/cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/codemonitors/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolvers.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codemonitors/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codemonitors/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/graphqlutil", @@ -37,8 +37,8 @@ go_test( ], deps = [ "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/batches/resolvers/apitest", - "//enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest", + "//cmd/frontend/internal/batches/resolvers/apitest", + "//cmd/frontend/internal/codemonitors/resolvers/apitest", "//internal/actor", "//internal/auth", "//internal/codemonitors/background", diff --git a/cmd/frontend/internal/codemonitors/resolvers/apitest/BUILD.bazel b/cmd/frontend/internal/codemonitors/resolvers/apitest/BUILD.bazel new file mode 100644 index 00000000000..875b83d84bb --- /dev/null +++ b/cmd/frontend/internal/codemonitors/resolvers/apitest/BUILD.bazel @@ -0,0 +1,9 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "apitest", + srcs = ["types.go"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codemonitors/resolvers/apitest", + visibility = ["//cmd/frontend:__subpackages__"], + deps = ["//lib/errors"], +) diff --git a/enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest/types.go b/cmd/frontend/internal/codemonitors/resolvers/apitest/types.go similarity index 100% rename from enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest/types.go rename to cmd/frontend/internal/codemonitors/resolvers/apitest/types.go diff --git a/enterprise/cmd/frontend/internal/codemonitors/resolvers/main_test.go b/cmd/frontend/internal/codemonitors/resolvers/main_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/codemonitors/resolvers/main_test.go rename to cmd/frontend/internal/codemonitors/resolvers/main_test.go diff --git a/enterprise/cmd/frontend/internal/codemonitors/resolvers/resolvers.go b/cmd/frontend/internal/codemonitors/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/codemonitors/resolvers/resolvers.go rename to cmd/frontend/internal/codemonitors/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/codemonitors/resolvers/resolvers_test.go b/cmd/frontend/internal/codemonitors/resolvers/resolvers_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/codemonitors/resolvers/resolvers_test.go rename to cmd/frontend/internal/codemonitors/resolvers/resolvers_test.go index b410f07142f..df04738f45d 100644 --- a/enterprise/cmd/frontend/internal/codemonitors/resolvers/resolvers_test.go +++ b/cmd/frontend/internal/codemonitors/resolvers/resolvers_test.go @@ -14,8 +14,8 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - batchesApitest "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest" + batchesApitest "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codemonitors/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/codemonitors/background" diff --git a/enterprise/cmd/frontend/internal/completions/BUILD.bazel b/cmd/frontend/internal/completions/BUILD.bazel similarity index 64% rename from enterprise/cmd/frontend/internal/completions/BUILD.bazel rename to cmd/frontend/internal/completions/BUILD.bazel index c87c0053a4b..9909d37bf99 100644 --- a/enterprise/cmd/frontend/internal/completions/BUILD.bazel +++ b/cmd/frontend/internal/completions/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "completions", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/completions", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/completions", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/completions/resolvers", + "//cmd/frontend/internal/completions/resolvers", "//internal/codeintel", "//internal/cody", "//internal/completions/httpapi", diff --git a/enterprise/cmd/frontend/internal/completions/init.go b/cmd/frontend/internal/completions/init.go similarity index 95% rename from enterprise/cmd/frontend/internal/completions/init.go rename to cmd/frontend/internal/completions/init.go index 85cb2af0b8e..26112473bc7 100644 --- a/enterprise/cmd/frontend/internal/completions/init.go +++ b/cmd/frontend/internal/completions/init.go @@ -7,7 +7,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/completions/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/completions/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/cody" "github.com/sourcegraph/sourcegraph/internal/completions/httpapi" diff --git a/enterprise/cmd/frontend/internal/completions/resolvers/BUILD.bazel b/cmd/frontend/internal/completions/resolvers/BUILD.bazel similarity index 73% rename from enterprise/cmd/frontend/internal/completions/resolvers/BUILD.bazel rename to cmd/frontend/internal/completions/resolvers/BUILD.bazel index 5e91764b57b..95b89e1a821 100644 --- a/enterprise/cmd/frontend/internal/completions/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/completions/resolvers/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolver.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/completions/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/completions/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/cody", diff --git a/enterprise/cmd/frontend/internal/completions/resolvers/resolver.go b/cmd/frontend/internal/completions/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/completions/resolvers/resolver.go rename to cmd/frontend/internal/completions/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/compute/BUILD.bazel b/cmd/frontend/internal/compute/BUILD.bazel similarity index 54% rename from enterprise/cmd/frontend/internal/compute/BUILD.bazel rename to cmd/frontend/internal/compute/BUILD.bazel index c7f6c40e4bf..9cdbf6e3636 100644 --- a/enterprise/cmd/frontend/internal/compute/BUILD.bazel +++ b/cmd/frontend/internal/compute/BUILD.bazel @@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "compute", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/compute", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/compute/resolvers", - "//enterprise/cmd/frontend/internal/compute/streaming", + "//cmd/frontend/internal/compute/resolvers", + "//cmd/frontend/internal/compute/streaming", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/compute/init.go b/cmd/frontend/internal/compute/init.go similarity index 82% rename from enterprise/cmd/frontend/internal/compute/init.go rename to cmd/frontend/internal/compute/init.go index b726849cab0..5dbf417630b 100644 --- a/enterprise/cmd/frontend/internal/compute/init.go +++ b/cmd/frontend/internal/compute/init.go @@ -7,8 +7,8 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute/resolvers" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute/streaming" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/compute/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/compute/streaming" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/compute/resolvers/BUILD.bazel b/cmd/frontend/internal/compute/resolvers/BUILD.bazel similarity index 83% rename from enterprise/cmd/frontend/internal/compute/resolvers/BUILD.bazel rename to cmd/frontend/internal/compute/resolvers/BUILD.bazel index 06145927c5c..1a171e367c0 100644 --- a/enterprise/cmd/frontend/internal/compute/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/compute/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolvers.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/compute/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/compute", diff --git a/enterprise/cmd/frontend/internal/compute/resolvers/resolvers.go b/cmd/frontend/internal/compute/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/compute/resolvers/resolvers.go rename to cmd/frontend/internal/compute/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/compute/resolvers/resolvers_test.go b/cmd/frontend/internal/compute/resolvers/resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/compute/resolvers/resolvers_test.go rename to cmd/frontend/internal/compute/resolvers/resolvers_test.go diff --git a/enterprise/cmd/frontend/internal/compute/streaming/BUILD.bazel b/cmd/frontend/internal/compute/streaming/BUILD.bazel similarity index 81% rename from enterprise/cmd/frontend/internal/compute/streaming/BUILD.bazel rename to cmd/frontend/internal/compute/streaming/BUILD.bazel index f05f60765f5..7d425937c05 100644 --- a/enterprise/cmd/frontend/internal/compute/streaming/BUILD.bazel +++ b/cmd/frontend/internal/compute/streaming/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "event.go", "stream.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute/streaming", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/compute/streaming", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/compute", "//internal/conf", diff --git a/enterprise/cmd/frontend/internal/compute/streaming/compute.go b/cmd/frontend/internal/compute/streaming/compute.go similarity index 100% rename from enterprise/cmd/frontend/internal/compute/streaming/compute.go rename to cmd/frontend/internal/compute/streaming/compute.go diff --git a/enterprise/cmd/frontend/internal/compute/streaming/event.go b/cmd/frontend/internal/compute/streaming/event.go similarity index 100% rename from enterprise/cmd/frontend/internal/compute/streaming/event.go rename to cmd/frontend/internal/compute/streaming/event.go diff --git a/enterprise/cmd/frontend/internal/compute/streaming/stream.go b/cmd/frontend/internal/compute/streaming/stream.go similarity index 100% rename from enterprise/cmd/frontend/internal/compute/streaming/stream.go rename to cmd/frontend/internal/compute/streaming/stream.go diff --git a/enterprise/cmd/frontend/internal/contentlibrary/BUILD.bazel b/cmd/frontend/internal/contentlibrary/BUILD.bazel similarity index 70% rename from enterprise/cmd/frontend/internal/contentlibrary/BUILD.bazel rename to cmd/frontend/internal/contentlibrary/BUILD.bazel index ac7e3c3217c..0807f7a0308 100644 --- a/enterprise/cmd/frontend/internal/contentlibrary/BUILD.bazel +++ b/cmd/frontend/internal/contentlibrary/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "contentlibrary", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/contentlibrary", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/contentlibrary", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/graphqlbackend", diff --git a/enterprise/cmd/frontend/internal/contentlibrary/init.go b/cmd/frontend/internal/contentlibrary/init.go similarity index 100% rename from enterprise/cmd/frontend/internal/contentlibrary/init.go rename to cmd/frontend/internal/contentlibrary/init.go diff --git a/enterprise/cmd/frontend/internal/context/BUILD.bazel b/cmd/frontend/internal/context/BUILD.bazel similarity index 66% rename from enterprise/cmd/frontend/internal/context/BUILD.bazel rename to cmd/frontend/internal/context/BUILD.bazel index d5fbf0dbc11..ac7b6fe4a73 100644 --- a/enterprise/cmd/frontend/internal/context/BUILD.bazel +++ b/cmd/frontend/internal/context/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "context", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/context", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/context", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/context/resolvers", + "//cmd/frontend/internal/context/resolvers", "//internal/codeintel", "//internal/codycontext:context", "//internal/conf/conftypes", diff --git a/enterprise/cmd/frontend/internal/context/init.go b/cmd/frontend/internal/context/init.go similarity index 93% rename from enterprise/cmd/frontend/internal/context/init.go rename to cmd/frontend/internal/context/init.go index eb81de489a5..229bff1c7b3 100644 --- a/enterprise/cmd/frontend/internal/context/init.go +++ b/cmd/frontend/internal/context/init.go @@ -4,7 +4,7 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/context/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/context/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" codycontext "github.com/sourcegraph/sourcegraph/internal/codycontext" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" diff --git a/enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel b/cmd/frontend/internal/context/resolvers/BUILD.bazel similarity index 88% rename from enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel rename to cmd/frontend/internal/context/resolvers/BUILD.bazel index 3afff64bdad..ce0c64a52f5 100644 --- a/enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/context/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["context.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/context/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/context/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/authz", diff --git a/enterprise/cmd/frontend/internal/context/resolvers/context.go b/cmd/frontend/internal/context/resolvers/context.go similarity index 100% rename from enterprise/cmd/frontend/internal/context/resolvers/context.go rename to cmd/frontend/internal/context/resolvers/context.go diff --git a/enterprise/cmd/frontend/internal/context/resolvers/context_test.go b/cmd/frontend/internal/context/resolvers/context_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/context/resolvers/context_test.go rename to cmd/frontend/internal/context/resolvers/context_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/BUILD.bazel b/cmd/frontend/internal/dotcom/BUILD.bazel similarity index 65% rename from enterprise/cmd/frontend/internal/dotcom/BUILD.bazel rename to cmd/frontend/internal/dotcom/BUILD.bazel index d896611b6b6..5800944b32e 100644 --- a/enterprise/cmd/frontend/internal/dotcom/BUILD.bazel +++ b/cmd/frontend/internal/dotcom/BUILD.bazel @@ -3,13 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "dotcom", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/dotcom", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/envvar", "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/dotcom/productsubscription", + "//cmd/frontend/internal/dotcom/productsubscription", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/dotcom/init.go b/cmd/frontend/internal/dotcom/init.go similarity index 95% rename from enterprise/cmd/frontend/internal/dotcom/init.go rename to cmd/frontend/internal/dotcom/init.go index aff7f4fbfd3..12a0ebecea9 100644 --- a/enterprise/cmd/frontend/internal/dotcom/init.go +++ b/cmd/frontend/internal/dotcom/init.go @@ -9,7 +9,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/dotcom/productsubscription" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom/productsubscription" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel b/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel similarity index 95% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel rename to cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel index 8364d1f1a35..4bf4d121425 100644 --- a/enterprise/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel +++ b/cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel @@ -21,8 +21,8 @@ go_library( "tokens_db.go", "tokens_graphql.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/dotcom/productsubscription", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom/productsubscription", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/graphqlutil", diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go b/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go rename to cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user_test.go b/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user_test.go rename to cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user_test.go index 87e33a4e1bb..076eb256034 100644 --- a/enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user_test.go +++ b/cmd/frontend/internal/dotcom/productsubscription/codygateway_dotcom_user_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/dotcom/productsubscription" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom/productsubscription" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/audit/audittest" "github.com/sourcegraph/sourcegraph/internal/auth" diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql.go b/cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql.go rename to cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql_test.go b/cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql_test.go rename to cmd/frontend/internal/dotcom/productsubscription/codygateway_graphql_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_service.go b/cmd/frontend/internal/dotcom/productsubscription/codygateway_service.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/codygateway_service.go rename to cmd/frontend/internal/dotcom/productsubscription/codygateway_service.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/doc.go b/cmd/frontend/internal/dotcom/productsubscription/doc.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/doc.go rename to cmd/frontend/internal/dotcom/productsubscription/doc.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/graphql.go b/cmd/frontend/internal/dotcom/productsubscription/graphql.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/graphql.go rename to cmd/frontend/internal/dotcom/productsubscription/graphql.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/license_anomaly.go b/cmd/frontend/internal/dotcom/productsubscription/license_anomaly.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/license_anomaly.go rename to cmd/frontend/internal/dotcom/productsubscription/license_anomaly.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/license_anomaly_test.go b/cmd/frontend/internal/dotcom/productsubscription/license_anomaly_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/license_anomaly_test.go rename to cmd/frontend/internal/dotcom/productsubscription/license_anomaly_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/license_check_handler.go b/cmd/frontend/internal/dotcom/productsubscription/license_check_handler.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/license_check_handler.go rename to cmd/frontend/internal/dotcom/productsubscription/license_check_handler.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/license_check_handler_test.go b/cmd/frontend/internal/dotcom/productsubscription/license_check_handler_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/license_check_handler_test.go rename to cmd/frontend/internal/dotcom/productsubscription/license_check_handler_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/license_expiration.go b/cmd/frontend/internal/dotcom/productsubscription/license_expiration.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/license_expiration.go rename to cmd/frontend/internal/dotcom/productsubscription/license_expiration.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/license_expiration_test.go b/cmd/frontend/internal/dotcom/productsubscription/license_expiration_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/license_expiration_test.go rename to cmd/frontend/internal/dotcom/productsubscription/license_expiration_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go b/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db.go rename to cmd/frontend/internal/dotcom/productsubscription/licenses_db.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db_test.go b/cmd/frontend/internal/dotcom/productsubscription/licenses_db_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_db_test.go rename to cmd/frontend/internal/dotcom/productsubscription/licenses_db_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_graphql.go b/cmd/frontend/internal/dotcom/productsubscription/licenses_graphql.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/licenses_graphql.go rename to cmd/frontend/internal/dotcom/productsubscription/licenses_graphql.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/mock_db.go b/cmd/frontend/internal/dotcom/productsubscription/mock_db.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/mock_db.go rename to cmd/frontend/internal/dotcom/productsubscription/mock_db.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/service_account.go b/cmd/frontend/internal/dotcom/productsubscription/service_account.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/service_account.go rename to cmd/frontend/internal/dotcom/productsubscription/service_account.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/service_account_test.go b/cmd/frontend/internal/dotcom/productsubscription/service_account_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/service_account_test.go rename to cmd/frontend/internal/dotcom/productsubscription/service_account_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go b/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go rename to cmd/frontend/internal/dotcom/productsubscription/subscriptions_db.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db_test.go b/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_db_test.go rename to cmd/frontend/internal/dotcom/productsubscription/subscriptions_db_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go b/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go rename to cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql_test.go b/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql_test.go rename to cmd/frontend/internal/dotcom/productsubscription/subscriptions_graphql_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_db.go b/cmd/frontend/internal/dotcom/productsubscription/tokens_db.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_db.go rename to cmd/frontend/internal/dotcom/productsubscription/tokens_db.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_db_test.go b/cmd/frontend/internal/dotcom/productsubscription/tokens_db_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_db_test.go rename to cmd/frontend/internal/dotcom/productsubscription/tokens_db_test.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_graphql.go b/cmd/frontend/internal/dotcom/productsubscription/tokens_graphql.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_graphql.go rename to cmd/frontend/internal/dotcom/productsubscription/tokens_graphql.go diff --git a/enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_graphql_test.go b/cmd/frontend/internal/dotcom/productsubscription/tokens_graphql_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/dotcom/productsubscription/tokens_graphql_test.go rename to cmd/frontend/internal/dotcom/productsubscription/tokens_graphql_test.go diff --git a/enterprise/cmd/frontend/internal/embeddings/BUILD.bazel b/cmd/frontend/internal/embeddings/BUILD.bazel similarity index 64% rename from enterprise/cmd/frontend/internal/embeddings/BUILD.bazel rename to cmd/frontend/internal/embeddings/BUILD.bazel index 76c88ef6514..ee6c995f8b8 100644 --- a/enterprise/cmd/frontend/internal/embeddings/BUILD.bazel +++ b/cmd/frontend/internal/embeddings/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "embeddings", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/embeddings", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/embeddings", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/embeddings/resolvers", + "//cmd/frontend/internal/embeddings/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/embeddings/init.go b/cmd/frontend/internal/embeddings/init.go similarity index 91% rename from enterprise/cmd/frontend/internal/embeddings/init.go rename to cmd/frontend/internal/embeddings/init.go index 4aa382cfac4..f3ca2eeb77c 100644 --- a/enterprise/cmd/frontend/internal/embeddings/init.go +++ b/cmd/frontend/internal/embeddings/init.go @@ -4,7 +4,7 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/embeddings/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/embeddings/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel b/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel similarity index 90% rename from enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel rename to cmd/frontend/internal/embeddings/resolvers/BUILD.bazel index 0736a24d1f6..6b1450683d5 100644 --- a/enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "repo_embedding_jobs.go", "resolvers.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/embeddings/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/embeddings/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/backend", "//cmd/frontend/graphqlbackend", diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go b/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go similarity index 100% rename from enterprise/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go rename to cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers.go b/cmd/frontend/internal/embeddings/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers.go rename to cmd/frontend/internal/embeddings/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go b/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go rename to cmd/frontend/internal/embeddings/resolvers/resolvers_test.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/BUILD.bazel b/cmd/frontend/internal/executorqueue/BUILD.bazel similarity index 78% rename from enterprise/cmd/frontend/internal/executorqueue/BUILD.bazel rename to cmd/frontend/internal/executorqueue/BUILD.bazel index c18ad67dfd5..2604e974661 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/BUILD.bazel +++ b/cmd/frontend/internal/executorqueue/BUILD.bazel @@ -8,13 +8,13 @@ go_library( "init.go", "queuehandler.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/executorqueue/handler", - "//enterprise/cmd/frontend/internal/executorqueue/queues/batches", - "//enterprise/cmd/frontend/internal/executorqueue/queues/codeintel", + "//cmd/frontend/internal/executorqueue/handler", + "//cmd/frontend/internal/executorqueue/queues/batches", + "//cmd/frontend/internal/executorqueue/queues/codeintel", "//internal/actor", "//internal/api", "//internal/conf", diff --git a/enterprise/cmd/frontend/internal/executorqueue/CODENOTIFY b/cmd/frontend/internal/executorqueue/CODENOTIFY similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/CODENOTIFY rename to cmd/frontend/internal/executorqueue/CODENOTIFY diff --git a/enterprise/cmd/frontend/internal/executorqueue/README.md b/cmd/frontend/internal/executorqueue/README.md similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/README.md rename to cmd/frontend/internal/executorqueue/README.md diff --git a/enterprise/cmd/frontend/internal/executorqueue/gitserverproxy.go b/cmd/frontend/internal/executorqueue/gitserverproxy.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/gitserverproxy.go rename to cmd/frontend/internal/executorqueue/gitserverproxy.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/gitserverproxy_test.go b/cmd/frontend/internal/executorqueue/gitserverproxy_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/gitserverproxy_test.go rename to cmd/frontend/internal/executorqueue/gitserverproxy_test.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/BUILD.bazel b/cmd/frontend/internal/executorqueue/handler/BUILD.bazel similarity index 92% rename from enterprise/cmd/frontend/internal/executorqueue/handler/BUILD.bazel rename to cmd/frontend/internal/executorqueue/handler/BUILD.bazel index 7f5a1935c63..d73d4dc5279 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/handler/BUILD.bazel +++ b/cmd/frontend/internal/executorqueue/handler/BUILD.bazel @@ -8,8 +8,8 @@ go_library( "multihandler.go", "routes.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/batches/types", "//internal/codeintel/uploads/shared", diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/handler.go b/cmd/frontend/internal/executorqueue/handler/handler.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/handler/handler.go rename to cmd/frontend/internal/executorqueue/handler/handler.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go b/cmd/frontend/internal/executorqueue/handler/handler_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go rename to cmd/frontend/internal/executorqueue/handler/handler_test.go index 05ae341d218..4c75667ba7f 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go +++ b/cmd/frontend/internal/executorqueue/handler/handler_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" internalexecutor "github.com/sourcegraph/sourcegraph/internal/executor" executorstore "github.com/sourcegraph/sourcegraph/internal/executor/store" diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/multihandler.go b/cmd/frontend/internal/executorqueue/handler/multihandler.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/handler/multihandler.go rename to cmd/frontend/internal/executorqueue/handler/multihandler.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/multihandler_test.go b/cmd/frontend/internal/executorqueue/handler/multihandler_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/executorqueue/handler/multihandler_test.go rename to cmd/frontend/internal/executorqueue/handler/multihandler_test.go index 8eb4ca8645c..db027d27534 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/handler/multihandler_test.go +++ b/cmd/frontend/internal/executorqueue/handler/multihandler_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" btypes "github.com/sourcegraph/sourcegraph/internal/batches/types" uploadsshared "github.com/sourcegraph/sourcegraph/internal/codeintel/uploads/shared" "github.com/sourcegraph/sourcegraph/internal/conf" diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/routes.go b/cmd/frontend/internal/executorqueue/handler/routes.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/handler/routes.go rename to cmd/frontend/internal/executorqueue/handler/routes.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/routes_test.go b/cmd/frontend/internal/executorqueue/handler/routes_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/executorqueue/handler/routes_test.go rename to cmd/frontend/internal/executorqueue/handler/routes_test.go index f80e039131e..ad01423d959 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/handler/routes_test.go +++ b/cmd/frontend/internal/executorqueue/handler/routes_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" ) func TestSetupRoutes(t *testing.T) { diff --git a/enterprise/cmd/frontend/internal/executorqueue/init.go b/cmd/frontend/internal/executorqueue/init.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/init.go rename to cmd/frontend/internal/executorqueue/init.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/mocks_test.go b/cmd/frontend/internal/executorqueue/mocks_test.go similarity index 98% rename from enterprise/cmd/frontend/internal/executorqueue/mocks_test.go rename to cmd/frontend/internal/executorqueue/mocks_test.go index d8c956b5935..893690f6828 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/mocks_test.go +++ b/cmd/frontend/internal/executorqueue/mocks_test.go @@ -15,7 +15,7 @@ import ( // MockGitserverClient is a mock implementation of the GitserverClient // interface (from the package -// github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue) +// github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue) // used for unit testing. type MockGitserverClient struct { // AddrForRepoFunc is an instance of a mock function object controlling diff --git a/enterprise/cmd/frontend/internal/executorqueue/queuehandler.go b/cmd/frontend/internal/executorqueue/queuehandler.go similarity index 97% rename from enterprise/cmd/frontend/internal/executorqueue/queuehandler.go rename to cmd/frontend/internal/executorqueue/queuehandler.go index 8e43eaf225c..ee061f78251 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queuehandler.go +++ b/cmd/frontend/internal/executorqueue/queuehandler.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/queues/batches" - codeintelqueue "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/queues/batches" + codeintelqueue "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/queues/codeintel" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/executorqueue/queuehandler_test.go b/cmd/frontend/internal/executorqueue/queuehandler_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/queuehandler_test.go rename to cmd/frontend/internal/executorqueue/queuehandler_test.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/BUILD.bazel b/cmd/frontend/internal/executorqueue/queues/batches/BUILD.bazel similarity index 86% rename from enterprise/cmd/frontend/internal/executorqueue/queues/batches/BUILD.bazel rename to cmd/frontend/internal/executorqueue/queues/batches/BUILD.bazel index c48c8138ad5..ffabbef477a 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/BUILD.bazel +++ b/cmd/frontend/internal/executorqueue/queues/batches/BUILD.bazel @@ -7,11 +7,11 @@ go_library( "queue.go", "transform.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/queues/batches", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/queues/batches", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/executorqueue/handler", + "//cmd/frontend/internal/executorqueue/handler", "//internal/actor", "//internal/batches/store", "//internal/batches/types", diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go b/cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go rename to cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go index 3b85b811c84..a4feb04da8a 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go +++ b/cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go @@ -17,7 +17,7 @@ import ( // MockBatchesStore is a mock implementation of the BatchesStore interface // (from the package -// github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/queues/batches) +// github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/queues/batches) // used for unit testing. type MockBatchesStore struct { // DatabaseDBFunc is an instance of a mock function object controlling diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go b/cmd/frontend/internal/executorqueue/queues/batches/queue.go similarity index 92% rename from enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go rename to cmd/frontend/internal/executorqueue/queues/batches/queue.go index eb45909d70d..83eb4af1d2f 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go +++ b/cmd/frontend/internal/executorqueue/queues/batches/queue.go @@ -5,7 +5,7 @@ import ( "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" bstore "github.com/sourcegraph/sourcegraph/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/transform.go b/cmd/frontend/internal/executorqueue/queues/batches/transform.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/queues/batches/transform.go rename to cmd/frontend/internal/executorqueue/queues/batches/transform.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/transform_test.go b/cmd/frontend/internal/executorqueue/queues/batches/transform_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/executorqueue/queues/batches/transform_test.go rename to cmd/frontend/internal/executorqueue/queues/batches/transform_test.go diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/BUILD.bazel b/cmd/frontend/internal/executorqueue/queues/codeintel/BUILD.bazel similarity index 77% rename from enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/BUILD.bazel rename to cmd/frontend/internal/executorqueue/queues/codeintel/BUILD.bazel index 7daa98b5104..be8df5a11e6 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/BUILD.bazel +++ b/cmd/frontend/internal/executorqueue/queues/codeintel/BUILD.bazel @@ -7,10 +7,10 @@ go_library( "queue.go", "transform.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/queues/codeintel", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ - "//enterprise/cmd/frontend/internal/executorqueue/handler", + "//cmd/frontend/internal/executorqueue/handler", "//internal/codeintel/autoindexing", "//internal/codeintel/uploads/shared", "//internal/conf", @@ -31,7 +31,7 @@ go_test( srcs = ["transform_test.go"], embed = [":codeintel"], deps = [ - "//enterprise/cmd/frontend/internal/executorqueue/handler", + "//cmd/frontend/internal/executorqueue/handler", "//internal/codeintel/uploads/shared", "//internal/conf", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go b/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go similarity index 92% rename from enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go rename to cmd/frontend/internal/executorqueue/queues/codeintel/queue.go index 32983fac806..d9f2effc1ec 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go +++ b/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go @@ -3,7 +3,7 @@ package codeintel import ( "context" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" "github.com/sourcegraph/sourcegraph/internal/codeintel/autoindexing" uploadsshared "github.com/sourcegraph/sourcegraph/internal/codeintel/uploads/shared" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go b/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go similarity index 98% rename from enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go rename to cmd/frontend/internal/executorqueue/queues/codeintel/transform.go index f76010a4de2..838138a7b76 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go +++ b/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go @@ -12,7 +12,7 @@ import ( "github.com/c2h5oh/datasize" "github.com/kballard/go-shellquote" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" uploadsshared "github.com/sourcegraph/sourcegraph/internal/codeintel/uploads/shared" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go b/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go rename to cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go index 80565a4ffeb..e6211fd3afb 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go +++ b/cmd/frontend/internal/executorqueue/queues/codeintel/transform_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/handler" uploadsshared "github.com/sourcegraph/sourcegraph/internal/codeintel/uploads/shared" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/guardrails/BUILD.bazel b/cmd/frontend/internal/guardrails/BUILD.bazel similarity index 54% rename from enterprise/cmd/frontend/internal/guardrails/BUILD.bazel rename to cmd/frontend/internal/guardrails/BUILD.bazel index c10b63a91ba..f85b40dd24c 100644 --- a/enterprise/cmd/frontend/internal/guardrails/BUILD.bazel +++ b/cmd/frontend/internal/guardrails/BUILD.bazel @@ -3,14 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "guardrails", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/envvar", - "//enterprise/cmd/frontend/internal/guardrails/attribution", - "//enterprise/cmd/frontend/internal/guardrails/dotcom", - "//enterprise/cmd/frontend/internal/guardrails/resolvers", + "//cmd/frontend/internal/guardrails/attribution", + "//cmd/frontend/internal/guardrails/dotcom", + "//cmd/frontend/internal/guardrails/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/guardrails/attribution/BUILD.bazel b/cmd/frontend/internal/guardrails/attribution/BUILD.bazel similarity index 77% rename from enterprise/cmd/frontend/internal/guardrails/attribution/BUILD.bazel rename to cmd/frontend/internal/guardrails/attribution/BUILD.bazel index f3f71826394..3a7671b1ea5 100644 --- a/enterprise/cmd/frontend/internal/guardrails/attribution/BUILD.bazel +++ b/cmd/frontend/internal/guardrails/attribution/BUILD.bazel @@ -7,10 +7,10 @@ go_library( "attribution.go", "observability.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/attribution", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/attribution", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ - "//enterprise/cmd/frontend/internal/guardrails/dotcom", + "//cmd/frontend/internal/guardrails/dotcom", "//internal/api", "//internal/metrics", "//internal/observation", @@ -29,7 +29,7 @@ go_test( srcs = ["attribution_test.go"], embed = [":attribution"], deps = [ - "//enterprise/cmd/frontend/internal/guardrails/dotcom", + "//cmd/frontend/internal/guardrails/dotcom", "//internal/database/dbmocks", "//internal/observation", "//internal/search/backend", diff --git a/enterprise/cmd/frontend/internal/guardrails/attribution/attribution.go b/cmd/frontend/internal/guardrails/attribution/attribution.go similarity index 98% rename from enterprise/cmd/frontend/internal/guardrails/attribution/attribution.go rename to cmd/frontend/internal/guardrails/attribution/attribution.go index 1bf40131a9c..1a4ebaec860 100644 --- a/enterprise/cmd/frontend/internal/guardrails/attribution/attribution.go +++ b/cmd/frontend/internal/guardrails/attribution/attribution.go @@ -6,14 +6,15 @@ import ( "sync" "github.com/sourcegraph/conc/pool" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom" + "go.opentelemetry.io/otel/attribute" + + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/dotcom" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/search" "github.com/sourcegraph/sourcegraph/internal/search/client" "github.com/sourcegraph/sourcegraph/internal/search/streaming" "github.com/sourcegraph/sourcegraph/lib/errors" - "go.opentelemetry.io/otel/attribute" ) // ServiceOpts configures Service. diff --git a/enterprise/cmd/frontend/internal/guardrails/attribution/attribution_test.go b/cmd/frontend/internal/guardrails/attribution/attribution_test.go similarity index 97% rename from enterprise/cmd/frontend/internal/guardrails/attribution/attribution_test.go rename to cmd/frontend/internal/guardrails/attribution/attribution_test.go index 0d4104ee440..1b7c388e6a9 100644 --- a/enterprise/cmd/frontend/internal/guardrails/attribution/attribution_test.go +++ b/cmd/frontend/internal/guardrails/attribution/attribution_test.go @@ -8,13 +8,14 @@ import ( "github.com/Khan/genqlient/graphql" "github.com/google/go-cmp/cmp" "github.com/sourcegraph/log/logtest" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom" + "github.com/sourcegraph/zoekt" + + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/dotcom" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" "github.com/sourcegraph/sourcegraph/internal/observation" searchbackend "github.com/sourcegraph/sourcegraph/internal/search/backend" "github.com/sourcegraph/sourcegraph/internal/search/client" "github.com/sourcegraph/sourcegraph/internal/types" - "github.com/sourcegraph/zoekt" ) func TestAttribution(t *testing.T) { diff --git a/enterprise/cmd/frontend/internal/guardrails/attribution/observability.go b/cmd/frontend/internal/guardrails/attribution/observability.go similarity index 100% rename from enterprise/cmd/frontend/internal/guardrails/attribution/observability.go rename to cmd/frontend/internal/guardrails/attribution/observability.go diff --git a/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel b/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel similarity index 77% rename from enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel rename to cmd/frontend/internal/guardrails/dotcom/BUILD.bazel index 34017a461f3..e2474ac05e6 100644 --- a/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel +++ b/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel @@ -7,8 +7,8 @@ go_library( "dotcom.go", "operations.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/dotcom", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/httpcli", "//internal/trace", @@ -25,7 +25,7 @@ genrule( "//cmd/frontend/graphqlbackend:guardrails.graphql", ], outs = ["operations.go"], - cmd = "$(execpath @com_github_khan_genqlient//:genqlient) $(location genql.yaml) && mv enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go $@", + cmd = "$(execpath @com_github_khan_genqlient//:genqlient) $(location genql.yaml) && mv cmd/frontend/internal/guardrails/dotcom/operations.go $@", tools = ["@com_github_khan_genqlient//:genqlient"], ) diff --git a/enterprise/cmd/frontend/internal/guardrails/dotcom/dotcom.go b/cmd/frontend/internal/guardrails/dotcom/dotcom.go similarity index 100% rename from enterprise/cmd/frontend/internal/guardrails/dotcom/dotcom.go rename to cmd/frontend/internal/guardrails/dotcom/dotcom.go diff --git a/cmd/frontend/internal/guardrails/dotcom/genql.yaml b/cmd/frontend/internal/guardrails/dotcom/genql.yaml new file mode 100644 index 00000000000..014457dddea --- /dev/null +++ b/cmd/frontend/internal/guardrails/dotcom/genql.yaml @@ -0,0 +1,7 @@ +schema: + - ../../../graphqlbackend/schema.graphql + - ../../../graphqlbackend/guardrails.graphql +operations: + - operations.graphql +generated: operations.go +optional: pointer diff --git a/enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go b/cmd/frontend/internal/guardrails/dotcom/operations.go similarity index 100% rename from enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go rename to cmd/frontend/internal/guardrails/dotcom/operations.go diff --git a/enterprise/cmd/frontend/internal/guardrails/dotcom/operations.graphql b/cmd/frontend/internal/guardrails/dotcom/operations.graphql similarity index 100% rename from enterprise/cmd/frontend/internal/guardrails/dotcom/operations.graphql rename to cmd/frontend/internal/guardrails/dotcom/operations.graphql diff --git a/enterprise/cmd/frontend/internal/guardrails/init.go b/cmd/frontend/internal/guardrails/init.go similarity index 84% rename from enterprise/cmd/frontend/internal/guardrails/init.go rename to cmd/frontend/internal/guardrails/init.go index 80ad55550a8..27607d882a1 100644 --- a/enterprise/cmd/frontend/internal/guardrails/init.go +++ b/cmd/frontend/internal/guardrails/init.go @@ -5,9 +5,9 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/attribution" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/attribution" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/dotcom" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/guardrails/resolvers/BUILD.bazel b/cmd/frontend/internal/guardrails/resolvers/BUILD.bazel new file mode 100644 index 00000000000..70195b97faa --- /dev/null +++ b/cmd/frontend/internal/guardrails/resolvers/BUILD.bazel @@ -0,0 +1,13 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "resolvers", + srcs = ["resolver.go"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], + deps = [ + "//cmd/frontend/graphqlbackend", + "//cmd/frontend/graphqlbackend/graphqlutil", + "//cmd/frontend/internal/guardrails/attribution", + ], +) diff --git a/enterprise/cmd/frontend/internal/guardrails/resolvers/resolver.go b/cmd/frontend/internal/guardrails/resolvers/resolver.go similarity index 94% rename from enterprise/cmd/frontend/internal/guardrails/resolvers/resolver.go rename to cmd/frontend/internal/guardrails/resolvers/resolver.go index 5a9ba1731da..699524f196a 100644 --- a/enterprise/cmd/frontend/internal/guardrails/resolvers/resolver.go +++ b/cmd/frontend/internal/guardrails/resolvers/resolver.go @@ -5,7 +5,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/attribution" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/attribution" ) var _ graphqlbackend.GuardrailsResolver = &GuardrailsResolver{} diff --git a/enterprise/cmd/frontend/internal/insights/BUILD.bazel b/cmd/frontend/internal/insights/BUILD.bazel similarity index 58% rename from enterprise/cmd/frontend/internal/insights/BUILD.bazel rename to cmd/frontend/internal/insights/BUILD.bazel index 3132a8dfc2c..9fd29daba93 100644 --- a/enterprise/cmd/frontend/internal/insights/BUILD.bazel +++ b/cmd/frontend/internal/insights/BUILD.bazel @@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "insights", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/insights", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/insights", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/insights/httpapi", - "//enterprise/cmd/frontend/internal/insights/resolvers", + "//cmd/frontend/internal/insights/httpapi", + "//cmd/frontend/internal/insights/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/conf/deploy", diff --git a/enterprise/cmd/frontend/internal/insights/httpapi/BUILD.bazel b/cmd/frontend/internal/insights/httpapi/BUILD.bazel similarity index 75% rename from enterprise/cmd/frontend/internal/insights/httpapi/BUILD.bazel rename to cmd/frontend/internal/insights/httpapi/BUILD.bazel index 08b4f2a45b9..542c91a6b0b 100644 --- a/enterprise/cmd/frontend/internal/insights/httpapi/BUILD.bazel +++ b/cmd/frontend/internal/insights/httpapi/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "httpapi", srcs = ["export.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/insights/httpapi", - visibility = ["//enterprise:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/insights/httpapi", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/actor", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/insights/httpapi/export.go b/cmd/frontend/internal/insights/httpapi/export.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/httpapi/export.go rename to cmd/frontend/internal/insights/httpapi/export.go diff --git a/enterprise/cmd/frontend/internal/insights/init.go b/cmd/frontend/internal/insights/init.go similarity index 90% rename from enterprise/cmd/frontend/internal/insights/init.go rename to cmd/frontend/internal/insights/init.go index 9599589ab10..48687689a53 100644 --- a/enterprise/cmd/frontend/internal/insights/init.go +++ b/cmd/frontend/internal/insights/init.go @@ -4,8 +4,8 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/insights/httpapi" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/insights/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/insights/httpapi" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/insights/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/conf/deploy" diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/BUILD.bazel b/cmd/frontend/internal/insights/resolvers/BUILD.bazel similarity index 95% rename from enterprise/cmd/frontend/internal/insights/resolvers/BUILD.bazel rename to cmd/frontend/internal/insights/resolvers/BUILD.bazel index ebb53daadf2..cbac7cba08e 100644 --- a/enterprise/cmd/frontend/internal/insights/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/insights/resolvers/BUILD.bazel @@ -16,8 +16,8 @@ go_library( "scoped_insight_resolvers.go", "validator.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/insights/resolvers", - visibility = ["//enterprise:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/insights/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/graphqlutil", diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/admin_resolver.go b/cmd/frontend/internal/insights/resolvers/admin_resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/admin_resolver.go rename to cmd/frontend/internal/insights/resolvers/admin_resolver.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go b/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go rename to cmd/frontend/internal/insights/resolvers/aggregates_resolvers.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/aggregates_resolvers_test.go b/cmd/frontend/internal/insights/resolvers/aggregates_resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/aggregates_resolvers_test.go rename to cmd/frontend/internal/insights/resolvers/aggregates_resolvers_test.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/dashboard_id.go b/cmd/frontend/internal/insights/resolvers/dashboard_id.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/dashboard_id.go rename to cmd/frontend/internal/insights/resolvers/dashboard_id.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/dashboard_resolvers.go b/cmd/frontend/internal/insights/resolvers/dashboard_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/dashboard_resolvers.go rename to cmd/frontend/internal/insights/resolvers/dashboard_resolvers.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/dashboard_resolvers_test.go b/cmd/frontend/internal/insights/resolvers/dashboard_resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/dashboard_resolvers_test.go rename to cmd/frontend/internal/insights/resolvers/dashboard_resolvers_test.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/disabled_resolver.go b/cmd/frontend/internal/insights/resolvers/disabled_resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/disabled_resolver.go rename to cmd/frontend/internal/insights/resolvers/disabled_resolver.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/insight_series_resolver.go b/cmd/frontend/internal/insights/resolvers/insight_series_resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/insight_series_resolver.go rename to cmd/frontend/internal/insights/resolvers/insight_series_resolver.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/insight_series_resolver_test.go b/cmd/frontend/internal/insights/resolvers/insight_series_resolver_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/insight_series_resolver_test.go rename to cmd/frontend/internal/insights/resolvers/insight_series_resolver_test.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go b/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go rename to cmd/frontend/internal/insights/resolvers/insight_view_resolvers.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/insight_view_resolvers_test.go b/cmd/frontend/internal/insights/resolvers/insight_view_resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/insight_view_resolvers_test.go rename to cmd/frontend/internal/insights/resolvers/insight_view_resolvers_test.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/live_preview_resolvers.go b/cmd/frontend/internal/insights/resolvers/live_preview_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/live_preview_resolvers.go rename to cmd/frontend/internal/insights/resolvers/live_preview_resolvers.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/resolver.go b/cmd/frontend/internal/insights/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/resolver.go rename to cmd/frontend/internal/insights/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/resolver_test.go b/cmd/frontend/internal/insights/resolvers/resolver_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/resolver_test.go rename to cmd/frontend/internal/insights/resolvers/resolver_test.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/scoped_insight_resolvers.go b/cmd/frontend/internal/insights/resolvers/scoped_insight_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/scoped_insight_resolvers.go rename to cmd/frontend/internal/insights/resolvers/scoped_insight_resolvers.go diff --git a/enterprise/cmd/frontend/internal/insights/resolvers/validator.go b/cmd/frontend/internal/insights/resolvers/validator.go similarity index 100% rename from enterprise/cmd/frontend/internal/insights/resolvers/validator.go rename to cmd/frontend/internal/insights/resolvers/validator.go diff --git a/enterprise/cmd/frontend/internal/licensing/CODENOTIFY b/cmd/frontend/internal/licensing/CODENOTIFY similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/CODENOTIFY rename to cmd/frontend/internal/licensing/CODENOTIFY diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/BUILD.bazel b/cmd/frontend/internal/licensing/enforcement/BUILD.bazel similarity index 88% rename from enterprise/cmd/frontend/internal/licensing/enforcement/BUILD.bazel rename to cmd/frontend/internal/licensing/enforcement/BUILD.bazel index 3e60ade5c49..aa12542b0e8 100644 --- a/enterprise/cmd/frontend/internal/licensing/enforcement/BUILD.bazel +++ b/cmd/frontend/internal/licensing/enforcement/BUILD.bazel @@ -10,8 +10,8 @@ go_library( "monitoring.go", "users.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/enforcement", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/enforcement", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/envvar", "//internal/actor", diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/doc.go b/cmd/frontend/internal/licensing/enforcement/doc.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/doc.go rename to cmd/frontend/internal/licensing/enforcement/doc.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/enforcement.go b/cmd/frontend/internal/licensing/enforcement/enforcement.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/enforcement.go rename to cmd/frontend/internal/licensing/enforcement/enforcement.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/external_services.go b/cmd/frontend/internal/licensing/enforcement/external_services.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/external_services.go rename to cmd/frontend/internal/licensing/enforcement/external_services.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/external_services_test.go b/cmd/frontend/internal/licensing/enforcement/external_services_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/external_services_test.go rename to cmd/frontend/internal/licensing/enforcement/external_services_test.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/main_test.go b/cmd/frontend/internal/licensing/enforcement/main_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/main_test.go rename to cmd/frontend/internal/licensing/enforcement/main_test.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/monitoring.go b/cmd/frontend/internal/licensing/enforcement/monitoring.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/monitoring.go rename to cmd/frontend/internal/licensing/enforcement/monitoring.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/users.go b/cmd/frontend/internal/licensing/enforcement/users.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/users.go rename to cmd/frontend/internal/licensing/enforcement/users.go diff --git a/enterprise/cmd/frontend/internal/licensing/enforcement/users_test.go b/cmd/frontend/internal/licensing/enforcement/users_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/enforcement/users_test.go rename to cmd/frontend/internal/licensing/enforcement/users_test.go diff --git a/enterprise/cmd/frontend/internal/licensing/init/BUILD.bazel b/cmd/frontend/internal/licensing/init/BUILD.bazel similarity index 55% rename from enterprise/cmd/frontend/internal/licensing/init/BUILD.bazel rename to cmd/frontend/internal/licensing/init/BUILD.bazel index fa0ea47e412..f81f615abe0 100644 --- a/enterprise/cmd/frontend/internal/licensing/init/BUILD.bazel +++ b/cmd/frontend/internal/licensing/init/BUILD.bazel @@ -3,18 +3,18 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "init", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/init", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/init", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//cmd/frontend/envvar", "//cmd/frontend/graphqlbackend", "//cmd/frontend/hooks", - "//enterprise/cmd/frontend/internal/auth", - "//enterprise/cmd/frontend/internal/dotcom/productsubscription", - "//enterprise/cmd/frontend/internal/licensing/enforcement", - "//enterprise/cmd/frontend/internal/licensing/resolvers", - "//enterprise/cmd/frontend/internal/registry", + "//cmd/frontend/internal/auth", + "//cmd/frontend/internal/dotcom/productsubscription", + "//cmd/frontend/internal/licensing/enforcement", + "//cmd/frontend/internal/licensing/resolvers", + "//cmd/frontend/internal/registry", "//internal/codeintel", "//internal/conf", "//internal/conf/conftypes", diff --git a/enterprise/cmd/frontend/internal/licensing/init/init.go b/cmd/frontend/internal/licensing/init/init.go similarity index 93% rename from enterprise/cmd/frontend/internal/licensing/init/init.go rename to cmd/frontend/internal/licensing/init/init.go index 8c369b2b275..f590014e839 100644 --- a/enterprise/cmd/frontend/internal/licensing/init/init.go +++ b/cmd/frontend/internal/licensing/init/init.go @@ -10,11 +10,11 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/cmd/frontend/hooks" - _ "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/dotcom/productsubscription" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/enforcement" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/resolvers" - _ "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/registry" + _ "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom/productsubscription" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/enforcement" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/resolvers" + _ "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/registry" "github.com/sourcegraph/sourcegraph/internal/codeintel" confLib "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" diff --git a/enterprise/cmd/frontend/internal/licensing/resolvers/BUILD.bazel b/cmd/frontend/internal/licensing/resolvers/BUILD.bazel similarity index 68% rename from enterprise/cmd/frontend/internal/licensing/resolvers/BUILD.bazel rename to cmd/frontend/internal/licensing/resolvers/BUILD.bazel index bd222dfc7e5..462a47d54b8 100644 --- a/enterprise/cmd/frontend/internal/licensing/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/licensing/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolvers.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/licensing", @@ -19,7 +19,7 @@ go_test( embed = [":resolvers"], deps = [ "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/batches/resolvers/apitest", + "//cmd/frontend/internal/batches/resolvers/apitest", "//internal/actor", "//internal/licensing", "//lib/errors", diff --git a/enterprise/cmd/frontend/internal/licensing/resolvers/resolvers.go b/cmd/frontend/internal/licensing/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/licensing/resolvers/resolvers.go rename to cmd/frontend/internal/licensing/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/licensing/resolvers/resolvers_test.go b/cmd/frontend/internal/licensing/resolvers/resolvers_test.go similarity index 96% rename from enterprise/cmd/frontend/internal/licensing/resolvers/resolvers_test.go rename to cmd/frontend/internal/licensing/resolvers/resolvers_test.go index 6bd47cb3ecd..c6fde773c29 100644 --- a/enterprise/cmd/frontend/internal/licensing/resolvers/resolvers_test.go +++ b/cmd/frontend/internal/licensing/resolvers/resolvers_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/licensing" "github.com/sourcegraph/sourcegraph/lib/errors" diff --git a/enterprise/cmd/frontend/internal/notebooks/BUILD.bazel b/cmd/frontend/internal/notebooks/BUILD.bazel similarity index 57% rename from enterprise/cmd/frontend/internal/notebooks/BUILD.bazel rename to cmd/frontend/internal/notebooks/BUILD.bazel index 8ef15ea3616..7b47f6c0ab0 100644 --- a/enterprise/cmd/frontend/internal/notebooks/BUILD.bazel +++ b/cmd/frontend/internal/notebooks/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "notebooks", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/notebooks/resolvers", + "//cmd/frontend/internal/notebooks/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/notebooks/init.go b/cmd/frontend/internal/notebooks/init.go similarity index 87% rename from enterprise/cmd/frontend/internal/notebooks/init.go rename to cmd/frontend/internal/notebooks/init.go index 69893199b16..9868dd64e0d 100644 --- a/enterprise/cmd/frontend/internal/notebooks/init.go +++ b/cmd/frontend/internal/notebooks/init.go @@ -4,7 +4,7 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/BUILD.bazel b/cmd/frontend/internal/notebooks/resolvers/BUILD.bazel similarity index 80% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/BUILD.bazel rename to cmd/frontend/internal/notebooks/resolvers/BUILD.bazel index 175478a8e49..688652c10ab 100644 --- a/enterprise/cmd/frontend/internal/notebooks/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/notebooks/resolvers/BUILD.bazel @@ -8,8 +8,8 @@ go_library( "resolvers.go", "stars_resolvers.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/envvar", "//cmd/frontend/graphqlbackend", @@ -37,8 +37,8 @@ go_test( ], deps = [ "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/batches/resolvers/apitest", - "//enterprise/cmd/frontend/internal/notebooks/resolvers/apitest", + "//cmd/frontend/internal/batches/resolvers/apitest", + "//cmd/frontend/internal/notebooks/resolvers/apitest", "//internal/actor", "//internal/database", "//internal/database/dbtest", diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/BUILD.bazel b/cmd/frontend/internal/notebooks/resolvers/apitest/BUILD.bazel similarity index 62% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/BUILD.bazel rename to cmd/frontend/internal/notebooks/resolvers/apitest/BUILD.bazel index 628a3628ce6..0668ea91f56 100644 --- a/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/BUILD.bazel +++ b/cmd/frontend/internal/notebooks/resolvers/apitest/BUILD.bazel @@ -6,8 +6,8 @@ go_library( "convert.go", "types.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks/resolvers/apitest", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/notebooks", diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/convert.go b/cmd/frontend/internal/notebooks/resolvers/apitest/convert.go similarity index 100% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/convert.go rename to cmd/frontend/internal/notebooks/resolvers/apitest/convert.go diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/types.go b/cmd/frontend/internal/notebooks/resolvers/apitest/types.go similarity index 100% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/apitest/types.go rename to cmd/frontend/internal/notebooks/resolvers/apitest/types.go diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/permissions.go b/cmd/frontend/internal/notebooks/resolvers/permissions.go similarity index 100% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/permissions.go rename to cmd/frontend/internal/notebooks/resolvers/permissions.go diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/resolvers.go b/cmd/frontend/internal/notebooks/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/resolvers.go rename to cmd/frontend/internal/notebooks/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/resolvers_test.go b/cmd/frontend/internal/notebooks/resolvers/resolvers_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/resolvers_test.go rename to cmd/frontend/internal/notebooks/resolvers/resolvers_test.go index 71367fffecf..491e73f7128 100644 --- a/enterprise/cmd/frontend/internal/notebooks/resolvers/resolvers_test.go +++ b/cmd/frontend/internal/notebooks/resolvers/resolvers_test.go @@ -12,8 +12,8 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" - notebooksapitest "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" + notebooksapitest "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/stars_resolvers.go b/cmd/frontend/internal/notebooks/resolvers/stars_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/stars_resolvers.go rename to cmd/frontend/internal/notebooks/resolvers/stars_resolvers.go diff --git a/enterprise/cmd/frontend/internal/notebooks/resolvers/stars_resolvers_test.go b/cmd/frontend/internal/notebooks/resolvers/stars_resolvers_test.go similarity index 97% rename from enterprise/cmd/frontend/internal/notebooks/resolvers/stars_resolvers_test.go rename to cmd/frontend/internal/notebooks/resolvers/stars_resolvers_test.go index 7e340e62c78..848ddce8988 100644 --- a/enterprise/cmd/frontend/internal/notebooks/resolvers/stars_resolvers_test.go +++ b/cmd/frontend/internal/notebooks/resolvers/stars_resolvers_test.go @@ -11,8 +11,8 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" - notebooksapitest "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches/resolvers/apitest" + notebooksapitest "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/enterprise/cmd/frontend/internal/own/BUILD.bazel b/cmd/frontend/internal/own/BUILD.bazel similarity index 60% rename from enterprise/cmd/frontend/internal/own/BUILD.bazel rename to cmd/frontend/internal/own/BUILD.bazel index 35a329d131d..2a351235579 100644 --- a/enterprise/cmd/frontend/internal/own/BUILD.bazel +++ b/cmd/frontend/internal/own/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "own", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/own", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/own", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/own/resolvers", + "//cmd/frontend/internal/own/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/own/init.go b/cmd/frontend/internal/own/init.go similarity index 90% rename from enterprise/cmd/frontend/internal/own/init.go rename to cmd/frontend/internal/own/init.go index a9b8cbce982..637c746595f 100644 --- a/enterprise/cmd/frontend/internal/own/init.go +++ b/cmd/frontend/internal/own/init.go @@ -4,7 +4,7 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/own/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/own/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/own/resolvers/BUILD.bazel b/cmd/frontend/internal/own/resolvers/BUILD.bazel similarity index 93% rename from enterprise/cmd/frontend/internal/own/resolvers/BUILD.bazel rename to cmd/frontend/internal/own/resolvers/BUILD.bazel index c4ecb1c3a4d..7ca1d38e295 100644 --- a/enterprise/cmd/frontend/internal/own/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/own/resolvers/BUILD.bazel @@ -11,8 +11,8 @@ go_library( "recent_view_signal.go", "resolvers.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/own/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/own/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/envvar", "//cmd/frontend/graphqlbackend", diff --git a/enterprise/cmd/frontend/internal/own/resolvers/assigned_owners.go b/cmd/frontend/internal/own/resolvers/assigned_owners.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/assigned_owners.go rename to cmd/frontend/internal/own/resolvers/assigned_owners.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/codeowners.go b/cmd/frontend/internal/own/resolvers/codeowners.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/codeowners.go rename to cmd/frontend/internal/own/resolvers/codeowners.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/codeowners_resolvers.go b/cmd/frontend/internal/own/resolvers/codeowners_resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/codeowners_resolvers.go rename to cmd/frontend/internal/own/resolvers/codeowners_resolvers.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/codeowners_resolvers_test.go b/cmd/frontend/internal/own/resolvers/codeowners_resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/codeowners_resolvers_test.go rename to cmd/frontend/internal/own/resolvers/codeowners_resolvers_test.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/recent_contributors_signal.go b/cmd/frontend/internal/own/resolvers/recent_contributors_signal.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/recent_contributors_signal.go rename to cmd/frontend/internal/own/resolvers/recent_contributors_signal.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/recent_view_signal.go b/cmd/frontend/internal/own/resolvers/recent_view_signal.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/recent_view_signal.go rename to cmd/frontend/internal/own/resolvers/recent_view_signal.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/resolvers.go b/cmd/frontend/internal/own/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/own/resolvers/resolvers.go rename to cmd/frontend/internal/own/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/own/resolvers/resolvers_test.go b/cmd/frontend/internal/own/resolvers/resolvers_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/own/resolvers/resolvers_test.go rename to cmd/frontend/internal/own/resolvers/resolvers_test.go index 0cd771a9f97..32dc4a32e9f 100644 --- a/enterprise/cmd/frontend/internal/own/resolvers/resolvers_test.go +++ b/cmd/frontend/internal/own/resolvers/resolvers_test.go @@ -20,7 +20,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/own/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/own/resolvers" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/enterprise/cmd/frontend/internal/rbac/BUILD.bazel b/cmd/frontend/internal/rbac/BUILD.bazel similarity index 61% rename from enterprise/cmd/frontend/internal/rbac/BUILD.bazel rename to cmd/frontend/internal/rbac/BUILD.bazel index 33e85454540..2d8b7c96b78 100644 --- a/enterprise/cmd/frontend/internal/rbac/BUILD.bazel +++ b/cmd/frontend/internal/rbac/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "rbac", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/rbac", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/rbac", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/rbac/resolvers", + "//cmd/frontend/internal/rbac/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/rbac/init.go b/cmd/frontend/internal/rbac/init.go similarity index 89% rename from enterprise/cmd/frontend/internal/rbac/init.go rename to cmd/frontend/internal/rbac/init.go index 37084ffff03..a396e5f6cbc 100644 --- a/enterprise/cmd/frontend/internal/rbac/init.go +++ b/cmd/frontend/internal/rbac/init.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/rbac/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/rbac/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/BUILD.bazel b/cmd/frontend/internal/rbac/resolvers/BUILD.bazel similarity index 82% rename from enterprise/cmd/frontend/internal/rbac/resolvers/BUILD.bazel rename to cmd/frontend/internal/rbac/resolvers/BUILD.bazel index 9bbfa7f0b1f..c375de31e36 100644 --- a/enterprise/cmd/frontend/internal/rbac/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/rbac/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolver.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/rbac/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/rbac/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//internal/actor", @@ -33,7 +33,7 @@ go_test( ], deps = [ "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/rbac/resolvers/apitest", + "//cmd/frontend/internal/rbac/resolvers/apitest", "//internal/actor", "//internal/database", "//internal/database/dbtest", diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/apitest/BUILD.bazel b/cmd/frontend/internal/rbac/resolvers/apitest/BUILD.bazel similarity index 68% rename from enterprise/cmd/frontend/internal/rbac/resolvers/apitest/BUILD.bazel rename to cmd/frontend/internal/rbac/resolvers/apitest/BUILD.bazel index 98dea5b1fa3..b21258ed3e5 100644 --- a/enterprise/cmd/frontend/internal/rbac/resolvers/apitest/BUILD.bazel +++ b/cmd/frontend/internal/rbac/resolvers/apitest/BUILD.bazel @@ -6,8 +6,8 @@ go_library( "exec.go", "types.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/rbac/resolvers/apitest", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/rbac/resolvers/apitest", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/gqlutil", "//internal/jsonc", diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/apitest/exec.go b/cmd/frontend/internal/rbac/resolvers/apitest/exec.go similarity index 100% rename from enterprise/cmd/frontend/internal/rbac/resolvers/apitest/exec.go rename to cmd/frontend/internal/rbac/resolvers/apitest/exec.go diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/apitest/types.go b/cmd/frontend/internal/rbac/resolvers/apitest/types.go similarity index 100% rename from enterprise/cmd/frontend/internal/rbac/resolvers/apitest/types.go rename to cmd/frontend/internal/rbac/resolvers/apitest/types.go diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/main_test.go b/cmd/frontend/internal/rbac/resolvers/main_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/rbac/resolvers/main_test.go rename to cmd/frontend/internal/rbac/resolvers/main_test.go diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/resolver.go b/cmd/frontend/internal/rbac/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/rbac/resolvers/resolver.go rename to cmd/frontend/internal/rbac/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/rbac/resolvers/resolver_test.go b/cmd/frontend/internal/rbac/resolvers/resolver_test.go similarity index 99% rename from enterprise/cmd/frontend/internal/rbac/resolvers/resolver_test.go rename to cmd/frontend/internal/rbac/resolvers/resolver_test.go index 88c21f61703..c15ec441280 100644 --- a/enterprise/cmd/frontend/internal/rbac/resolvers/resolver_test.go +++ b/cmd/frontend/internal/rbac/resolvers/resolver_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" gql "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/rbac/resolvers/apitest" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/rbac/resolvers/apitest" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" diff --git a/enterprise/cmd/frontend/internal/registry/BUILD.bazel b/cmd/frontend/internal/registry/BUILD.bazel similarity index 76% rename from enterprise/cmd/frontend/internal/registry/BUILD.bazel rename to cmd/frontend/internal/registry/BUILD.bazel index 3fabb18f915..6ee4f3cf220 100644 --- a/enterprise/cmd/frontend/internal/registry/BUILD.bazel +++ b/cmd/frontend/internal/registry/BUILD.bazel @@ -8,8 +8,8 @@ go_library( "http_api.go", ], embedsrcs = ["frozen_legacy_extensions.json"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/registry", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/registry", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/envvar", "//cmd/frontend/registry/api", diff --git a/enterprise/cmd/frontend/internal/registry/frozen.go b/cmd/frontend/internal/registry/frozen.go similarity index 100% rename from enterprise/cmd/frontend/internal/registry/frozen.go rename to cmd/frontend/internal/registry/frozen.go diff --git a/enterprise/cmd/frontend/internal/registry/frozen_legacy_extensions.json b/cmd/frontend/internal/registry/frozen_legacy_extensions.json similarity index 100% rename from enterprise/cmd/frontend/internal/registry/frozen_legacy_extensions.json rename to cmd/frontend/internal/registry/frozen_legacy_extensions.json diff --git a/enterprise/cmd/frontend/internal/registry/http_api.go b/cmd/frontend/internal/registry/http_api.go similarity index 100% rename from enterprise/cmd/frontend/internal/registry/http_api.go rename to cmd/frontend/internal/registry/http_api.go diff --git a/enterprise/cmd/frontend/internal/registry/http_api_test.go b/cmd/frontend/internal/registry/http_api_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/registry/http_api_test.go rename to cmd/frontend/internal/registry/http_api_test.go diff --git a/enterprise/cmd/frontend/internal/registry/scripts/BUILD.bazel b/cmd/frontend/internal/registry/scripts/BUILD.bazel similarity index 100% rename from enterprise/cmd/frontend/internal/registry/scripts/BUILD.bazel rename to cmd/frontend/internal/registry/scripts/BUILD.bazel diff --git a/enterprise/cmd/frontend/internal/registry/stores/BUILD.bazel b/cmd/frontend/internal/registry/stores/BUILD.bazel similarity index 100% rename from enterprise/cmd/frontend/internal/registry/stores/BUILD.bazel rename to cmd/frontend/internal/registry/stores/BUILD.bazel diff --git a/enterprise/cmd/frontend/internal/registry/stores/dbmocks/BUILD.bazel b/cmd/frontend/internal/registry/stores/dbmocks/BUILD.bazel similarity index 100% rename from enterprise/cmd/frontend/internal/registry/stores/dbmocks/BUILD.bazel rename to cmd/frontend/internal/registry/stores/dbmocks/BUILD.bazel diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/BUILD.bazel b/cmd/frontend/internal/repos/webhooks/BUILD.bazel similarity index 89% rename from enterprise/cmd/frontend/internal/repos/webhooks/BUILD.bazel rename to cmd/frontend/internal/repos/webhooks/BUILD.bazel index fe131803ad5..2ac53d2a5b1 100644 --- a/enterprise/cmd/frontend/internal/repos/webhooks/BUILD.bazel +++ b/cmd/frontend/internal/repos/webhooks/BUILD.bazel @@ -4,12 +4,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "webhooks", srcs = ["handlers.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/repos/webhooks", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/repos/webhooks", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", + "//cmd/frontend/internal/repos/webhooks/resolvers", "//cmd/frontend/webhooks", - "//enterprise/cmd/frontend/internal/repos/webhooks/resolvers", "//internal/cloneurls", "//internal/codeintel", "//internal/conf/conftypes", diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/handlers.go b/cmd/frontend/internal/repos/webhooks/handlers.go similarity index 98% rename from enterprise/cmd/frontend/internal/repos/webhooks/handlers.go rename to cmd/frontend/internal/repos/webhooks/handlers.go index fa09fa4e058..a7ff3ca1ec7 100644 --- a/enterprise/cmd/frontend/internal/repos/webhooks/handlers.go +++ b/cmd/frontend/internal/repos/webhooks/handlers.go @@ -7,8 +7,8 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/repos/webhooks/resolvers" "github.com/sourcegraph/sourcegraph/cmd/frontend/webhooks" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/repos/webhooks/resolvers" "github.com/sourcegraph/sourcegraph/internal/cloneurls" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/handlers_test.go b/cmd/frontend/internal/repos/webhooks/handlers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/handlers_test.go rename to cmd/frontend/internal/repos/webhooks/handlers_test.go diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/resolvers/BUILD.bazel b/cmd/frontend/internal/repos/webhooks/resolvers/BUILD.bazel similarity index 88% rename from enterprise/cmd/frontend/internal/repos/webhooks/resolvers/BUILD.bazel rename to cmd/frontend/internal/repos/webhooks/resolvers/BUILD.bazel index eb5b03cd8a5..a49720ec8fc 100644 --- a/enterprise/cmd/frontend/internal/repos/webhooks/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/repos/webhooks/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolver.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/repos/webhooks/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/repos/webhooks/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/backend", "//cmd/frontend/graphqlbackend", diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/resolvers/resolver.go b/cmd/frontend/internal/repos/webhooks/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/resolvers/resolver.go rename to cmd/frontend/internal/repos/webhooks/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/resolvers/resolver_test.go b/cmd/frontend/internal/repos/webhooks/resolvers/resolver_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/resolvers/resolver_test.go rename to cmd/frontend/internal/repos/webhooks/resolvers/resolver_test.go diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/testdata/bitbucket-cloud-push.json b/cmd/frontend/internal/repos/webhooks/testdata/bitbucket-cloud-push.json similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/testdata/bitbucket-cloud-push.json rename to cmd/frontend/internal/repos/webhooks/testdata/bitbucket-cloud-push.json diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/testdata/bitbucket-server-push.json b/cmd/frontend/internal/repos/webhooks/testdata/bitbucket-server-push.json similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/testdata/bitbucket-server-push.json rename to cmd/frontend/internal/repos/webhooks/testdata/bitbucket-server-push.json diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/testdata/github-push.json b/cmd/frontend/internal/repos/webhooks/testdata/github-push.json similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/testdata/github-push.json rename to cmd/frontend/internal/repos/webhooks/testdata/github-push.json diff --git a/enterprise/cmd/frontend/internal/repos/webhooks/testdata/gitlab-push.json b/cmd/frontend/internal/repos/webhooks/testdata/gitlab-push.json similarity index 100% rename from enterprise/cmd/frontend/internal/repos/webhooks/testdata/gitlab-push.json rename to cmd/frontend/internal/repos/webhooks/testdata/gitlab-push.json diff --git a/enterprise/cmd/frontend/internal/scim/BUILD.bazel b/cmd/frontend/internal/scim/BUILD.bazel similarity index 67% rename from enterprise/cmd/frontend/internal/scim/BUILD.bazel rename to cmd/frontend/internal/scim/BUILD.bazel index 55385a99e78..a0a157ca0d8 100644 --- a/enterprise/cmd/frontend/internal/scim/BUILD.bazel +++ b/cmd/frontend/internal/scim/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "scim", srcs = ["scim.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/scim", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/scim", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", "//internal/codeintel", diff --git a/enterprise/cmd/frontend/internal/scim/scim.go b/cmd/frontend/internal/scim/scim.go similarity index 100% rename from enterprise/cmd/frontend/internal/scim/scim.go rename to cmd/frontend/internal/scim/scim.go diff --git a/cmd/frontend/internal/search/BUILD.bazel b/cmd/frontend/internal/search/BUILD.bazel index ce920226526..78f939aa470 100644 --- a/cmd/frontend/internal/search/BUILD.bazel +++ b/cmd/frontend/internal/search/BUILD.bazel @@ -5,21 +5,31 @@ go_library( name = "search", srcs = [ "event_writer.go", + "init.go", "metadata.go", "search.go", ], importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search", visibility = ["//cmd/frontend:__subpackages__"], deps = [ + "//cmd/frontend/enterprise", + "//cmd/frontend/internal/search/httpapi", "//cmd/frontend/internal/search/logs", + "//cmd/frontend/internal/search/resolvers", "//internal/api", + "//internal/codeintel", "//internal/conf", + "//internal/conf/conftypes", "//internal/database", "//internal/honey", "//internal/honey/search", "//internal/lazyregexp", + "//internal/observation", "//internal/search", "//internal/search/client", + "//internal/search/exhaustive/service", + "//internal/search/exhaustive/store", + "//internal/search/exhaustive/uploadstore", "//internal/search/result", "//internal/search/streaming", "//internal/search/streaming/api", diff --git a/enterprise/cmd/frontend/internal/search/httpapi/BUILD.bazel b/cmd/frontend/internal/search/httpapi/BUILD.bazel similarity index 62% rename from enterprise/cmd/frontend/internal/search/httpapi/BUILD.bazel rename to cmd/frontend/internal/search/httpapi/BUILD.bazel index ea222a4f8f8..579a9bd23d6 100644 --- a/enterprise/cmd/frontend/internal/search/httpapi/BUILD.bazel +++ b/cmd/frontend/internal/search/httpapi/BUILD.bazel @@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "httpapi", srcs = ["export.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search/httpapi", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search/httpapi", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/auth", "//internal/search/exhaustive/service", diff --git a/enterprise/cmd/frontend/internal/search/httpapi/export.go b/cmd/frontend/internal/search/httpapi/export.go similarity index 100% rename from enterprise/cmd/frontend/internal/search/httpapi/export.go rename to cmd/frontend/internal/search/httpapi/export.go diff --git a/enterprise/cmd/frontend/internal/search/init.go b/cmd/frontend/internal/search/init.go similarity index 87% rename from enterprise/cmd/frontend/internal/search/init.go rename to cmd/frontend/internal/search/init.go index 39335a76d88..4a18f33214f 100644 --- a/enterprise/cmd/frontend/internal/search/init.go +++ b/cmd/frontend/internal/search/init.go @@ -4,8 +4,8 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search/httpapi" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search/httpapi" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/search/resolvers/BUILD.bazel b/cmd/frontend/internal/search/resolvers/BUILD.bazel similarity index 81% rename from enterprise/cmd/frontend/internal/search/resolvers/BUILD.bazel rename to cmd/frontend/internal/search/resolvers/BUILD.bazel index 0667976d57f..3dbbbb534e3 100644 --- a/enterprise/cmd/frontend/internal/search/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/search/resolvers/BUILD.bazel @@ -8,8 +8,8 @@ go_library( "search_job_stats.go", "search_jobs_connection.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/graphqlutil", diff --git a/enterprise/cmd/frontend/internal/search/resolvers/resolver.go b/cmd/frontend/internal/search/resolvers/resolver.go similarity index 100% rename from enterprise/cmd/frontend/internal/search/resolvers/resolver.go rename to cmd/frontend/internal/search/resolvers/resolver.go diff --git a/enterprise/cmd/frontend/internal/search/resolvers/search_job.go b/cmd/frontend/internal/search/resolvers/search_job.go similarity index 100% rename from enterprise/cmd/frontend/internal/search/resolvers/search_job.go rename to cmd/frontend/internal/search/resolvers/search_job.go diff --git a/enterprise/cmd/frontend/internal/search/resolvers/search_job_stats.go b/cmd/frontend/internal/search/resolvers/search_job_stats.go similarity index 100% rename from enterprise/cmd/frontend/internal/search/resolvers/search_job_stats.go rename to cmd/frontend/internal/search/resolvers/search_job_stats.go diff --git a/enterprise/cmd/frontend/internal/search/resolvers/search_jobs_connection.go b/cmd/frontend/internal/search/resolvers/search_jobs_connection.go similarity index 100% rename from enterprise/cmd/frontend/internal/search/resolvers/search_jobs_connection.go rename to cmd/frontend/internal/search/resolvers/search_jobs_connection.go diff --git a/enterprise/cmd/frontend/internal/searchcontexts/BUILD.bazel b/cmd/frontend/internal/searchcontexts/BUILD.bazel similarity index 56% rename from enterprise/cmd/frontend/internal/searchcontexts/BUILD.bazel rename to cmd/frontend/internal/searchcontexts/BUILD.bazel index 43137ff80e8..4921c432deb 100644 --- a/enterprise/cmd/frontend/internal/searchcontexts/BUILD.bazel +++ b/cmd/frontend/internal/searchcontexts/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "searchcontexts", srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/searchcontexts", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/searchcontexts", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/searchcontexts/resolvers", + "//cmd/frontend/internal/searchcontexts/resolvers", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", diff --git a/enterprise/cmd/frontend/internal/searchcontexts/init.go b/cmd/frontend/internal/searchcontexts/init.go similarity index 86% rename from enterprise/cmd/frontend/internal/searchcontexts/init.go rename to cmd/frontend/internal/searchcontexts/init.go index a409a611e38..932128ac910 100644 --- a/enterprise/cmd/frontend/internal/searchcontexts/init.go +++ b/cmd/frontend/internal/searchcontexts/init.go @@ -4,7 +4,7 @@ import ( "context" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/searchcontexts/resolvers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/searchcontexts/resolvers" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/enterprise/cmd/frontend/internal/searchcontexts/resolvers/BUILD.bazel b/cmd/frontend/internal/searchcontexts/resolvers/BUILD.bazel similarity index 87% rename from enterprise/cmd/frontend/internal/searchcontexts/resolvers/BUILD.bazel rename to cmd/frontend/internal/searchcontexts/resolvers/BUILD.bazel index 2e6caa15048..420be35dc52 100644 --- a/enterprise/cmd/frontend/internal/searchcontexts/resolvers/BUILD.bazel +++ b/cmd/frontend/internal/searchcontexts/resolvers/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "resolvers", srcs = ["resolvers.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/searchcontexts/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/searchcontexts/resolvers", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/graphqlutil", diff --git a/enterprise/cmd/frontend/internal/searchcontexts/resolvers/resolvers.go b/cmd/frontend/internal/searchcontexts/resolvers/resolvers.go similarity index 100% rename from enterprise/cmd/frontend/internal/searchcontexts/resolvers/resolvers.go rename to cmd/frontend/internal/searchcontexts/resolvers/resolvers.go diff --git a/enterprise/cmd/frontend/internal/searchcontexts/resolvers/resolvers_test.go b/cmd/frontend/internal/searchcontexts/resolvers/resolvers_test.go similarity index 100% rename from enterprise/cmd/frontend/internal/searchcontexts/resolvers/resolvers_test.go rename to cmd/frontend/internal/searchcontexts/resolvers/resolvers_test.go diff --git a/cmd/frontend/main.go b/cmd/frontend/main.go index 30b17d5352b..7d05c9a0cbe 100644 --- a/cmd/frontend/main.go +++ b/cmd/frontend/main.go @@ -5,18 +5,24 @@ import ( "os" "github.com/sourcegraph/sourcegraph/cmd/frontend/shared" - "github.com/sourcegraph/sourcegraph/cmd/sourcegraph/osscmd" + "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/sanitycheck" + "github.com/sourcegraph/sourcegraph/internal/service/svcmain" + "github.com/sourcegraph/sourcegraph/internal/tracer" "github.com/sourcegraph/sourcegraph/ui/assets" - _ "github.com/sourcegraph/sourcegraph/ui/assets/oss" // Select oss assets + _ "github.com/sourcegraph/sourcegraph/ui/assets/enterprise" // Select enterprise assets ) func main() { sanitycheck.Pass() - if os.Getenv("WEBPACK_DEV_SERVER") == "1" { assets.UseDevAssetsProvider() } - osscmd.SingleServiceMainOSS(shared.Service) + svcmain.SingleServiceMainWithoutConf(shared.Service, svcmain.Config{}, svcmain.OutOfBandConfiguration{ + // use a switchable config here so we can switch it out for a proper conf client + // once we can use it after autoupgrading + Logging: conf.NewLogsSinksSource(shared.SwitchableSiteConfig()), + Tracing: tracer.ConfConfigurationSource{WatchableSiteConfig: shared.SwitchableSiteConfig()}, + }) } diff --git a/cmd/frontend/shared/BUILD.bazel b/cmd/frontend/shared/BUILD.bazel index 4648efc98e1..aa6f3e7c798 100644 --- a/cmd/frontend/shared/BUILD.bazel +++ b/cmd/frontend/shared/BUILD.bazel @@ -5,17 +5,51 @@ go_library( srcs = [ "debug.go", "service.go", + "shared.go", ], importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/shared", visibility = ["//visibility:public"], deps = [ "//cmd/frontend/enterprise", + "//cmd/frontend/internal/app", + "//cmd/frontend/internal/auth", + "//cmd/frontend/internal/auth/githubappauth", + "//cmd/frontend/internal/authz", + "//cmd/frontend/internal/batches", "//cmd/frontend/internal/cli", + "//cmd/frontend/internal/codeintel", + "//cmd/frontend/internal/codemonitors", + "//cmd/frontend/internal/completions", + "//cmd/frontend/internal/compute", + "//cmd/frontend/internal/contentlibrary", + "//cmd/frontend/internal/context", + "//cmd/frontend/internal/dotcom", + "//cmd/frontend/internal/embeddings", + "//cmd/frontend/internal/executorqueue", + "//cmd/frontend/internal/guardrails", + "//cmd/frontend/internal/insights", + "//cmd/frontend/internal/licensing/init", + "//cmd/frontend/internal/notebooks", + "//cmd/frontend/internal/own", + "//cmd/frontend/internal/rbac", + "//cmd/frontend/internal/registry", + "//cmd/frontend/internal/repos/webhooks", + "//cmd/frontend/internal/scim", + "//cmd/frontend/internal/search", + "//cmd/frontend/internal/searchcontexts", + "//cmd/frontend/registry/api", + "//internal/codeintel", + "//internal/codeintel/shared", + "//internal/conf", "//internal/conf/conftypes", "//internal/database", + "//internal/database/connections/live", "//internal/debugserver", "//internal/env", "//internal/observation", + "//internal/oobmigration/migrations/register", "//internal/service", + "//schema", + "@com_github_sourcegraph_log//:log", ], ) diff --git a/cmd/frontend/shared/service.go b/cmd/frontend/shared/service.go index f08d0c0371d..75c36d9e709 100644 --- a/cmd/frontend/shared/service.go +++ b/cmd/frontend/shared/service.go @@ -4,14 +4,17 @@ package shared import ( "context" - "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cli" - "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" - "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codeintel" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search" "github.com/sourcegraph/sourcegraph/internal/debugserver" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/observation" + "github.com/sourcegraph/sourcegraph/internal/oobmigration/migrations/register" "github.com/sourcegraph/sourcegraph/internal/service" + + _ "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/registry" + _ "github.com/sourcegraph/sourcegraph/cmd/frontend/registry/api" ) type svc struct{} @@ -20,14 +23,13 @@ func (svc) Name() string { return "frontend" } func (svc) Configure() (env.Config, []debugserver.Endpoint) { CLILoadConfig() + codeintel.LoadConfig() + search.LoadConfig() return nil, GRPCWebUIDebugEndpoints() } func (svc) Start(ctx context.Context, observationCtx *observation.Context, ready service.ReadyFunc, config env.Config) error { - ossSetupHook := func(_ database.DB, _ conftypes.UnifiedWatchable) enterprise.Services { - return enterprise.DefaultServices() - } - return CLIMain(ctx, observationCtx, ready, ossSetupHook, nil) + return CLIMain(ctx, observationCtx, ready, EnterpriseSetupHook, register.RegisterEnterpriseMigratorsUsingConfAndStoreFactory) } var Service service.Service = svc{} diff --git a/enterprise/cmd/frontend/shared/shared.go b/cmd/frontend/shared/shared.go similarity index 67% rename from enterprise/cmd/frontend/shared/shared.go rename to cmd/frontend/shared/shared.go index fe93080a4f2..e33e7be472f 100644 --- a/enterprise/cmd/frontend/shared/shared.go +++ b/cmd/frontend/shared/shared.go @@ -12,34 +12,33 @@ import ( "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/contentlibrary" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/contentlibrary" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/search" "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" - "github.com/sourcegraph/sourcegraph/cmd/frontend/shared" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/app" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth" - githubapp "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth/githubappauth" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/authz" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches" - codeintelinit "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codeintel" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codemonitors" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/completions" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/compute" - internalcontext "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/context" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/dotcom" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/embeddings" - executor "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/insights" - licensing "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/licensing/init" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/notebooks" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/own" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/rbac" - _ "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/registry" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/repos/webhooks" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/scim" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/searchcontexts" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth" + githubapp "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/githubappauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/authz" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/batches" + codeintelinit "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codeintel" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/codemonitors" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/completions" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/compute" + internalcontext "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/context" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/embeddings" + executor "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/insights" + licensing "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/licensing/init" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/notebooks" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/own" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/rbac" + _ "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/registry" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/repos/webhooks" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/scim" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/searchcontexts" "github.com/sourcegraph/sourcegraph/internal/codeintel" codeintelshared "github.com/sourcegraph/sourcegraph/internal/codeintel/shared" "github.com/sourcegraph/sourcegraph/internal/conf" @@ -137,7 +136,7 @@ func SwitchableSiteConfig() conftypes.WatchableSiteConfig { switchable.WatchableSiteConfig.(*noopSiteConfig).switcher = switchable go func() { - <-shared.AutoUpgradeDone + <-AutoUpgradeDone conf.EnsureHTTPClientIsConfigured() switchable.WatchableSiteConfig = confClient for _, watcher := range switchable.watchers { diff --git a/cmd/sourcegraph/BUILD.bazel b/cmd/sourcegraph/BUILD.bazel index e3496c5fc6b..19b97055568 100644 --- a/cmd/sourcegraph/BUILD.bazel +++ b/cmd/sourcegraph/BUILD.bazel @@ -8,6 +8,7 @@ go_library( deps = [ "//cmd/blobstore/shared", "//cmd/executor/singlebinary", + "//cmd/frontend/shared", "//cmd/github-proxy/shared", "//cmd/gitserver/shared", "//cmd/precise-code-intel-worker/shared", @@ -15,7 +16,6 @@ go_library( "//cmd/searcher/shared", "//cmd/sourcegraph/osscmd", "//enterprise/cmd/embeddings/shared", - "//enterprise/cmd/frontend/shared", "//enterprise/cmd/symbols/shared", "//enterprise/cmd/worker/shared", "//internal/sanitycheck", diff --git a/cmd/sourcegraph/main.go b/cmd/sourcegraph/main.go index e079dbe0ba1..838bdb10b6c 100644 --- a/cmd/sourcegraph/main.go +++ b/cmd/sourcegraph/main.go @@ -11,13 +11,13 @@ import ( blobstore_shared "github.com/sourcegraph/sourcegraph/cmd/blobstore/shared" executor_singlebinary "github.com/sourcegraph/sourcegraph/cmd/executor/singlebinary" + frontend_shared "github.com/sourcegraph/sourcegraph/cmd/frontend/shared" githubproxy_shared "github.com/sourcegraph/sourcegraph/cmd/github-proxy/shared" gitserver_shared "github.com/sourcegraph/sourcegraph/cmd/gitserver/shared" precise_code_intel_worker_shared "github.com/sourcegraph/sourcegraph/cmd/precise-code-intel-worker/shared" repoupdater_shared "github.com/sourcegraph/sourcegraph/cmd/repo-updater/shared" searcher_shared "github.com/sourcegraph/sourcegraph/cmd/searcher/shared" embeddings_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/shared" - frontend_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/shared" symbols_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/symbols/shared" worker_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared" diff --git a/dev/BUILD.bazel b/dev/BUILD.bazel index ee604086b0d..54c0bec983f 100644 --- a/dev/BUILD.bazel +++ b/dev/BUILD.bazel @@ -15,7 +15,7 @@ write_source_files( "//doc/admin/observability:write_monitoring_docs", "//doc/cli/references:write_doc_files", "//doc/dev/background-information/sg:write_cli_reference_doc", - "//enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml", + "//cmd/frontend/internal/guardrails/dotcom:write_genql_yaml", "//internal/batches/search/syntax:write_token_type", "//internal/rbac:write_generated", "//internal/rbac/types:write_generated", diff --git a/dev/backcompat/flakes.json b/dev/backcompat/flakes.json index 879c3a7b2fa..8cccac3c0df 100644 --- a/dev/backcompat/flakes.json +++ b/dev/backcompat/flakes.json @@ -1,7 +1,7 @@ { "5.0.0": [ { - "path": "enterprise/cmd/frontend/internal/batches/resolvers", + "path": "cmd/frontend/internal/batches/resolvers", "prefix": "TestRepositoryPermissions", "reason": "Test was having incomplete data, fails now that constraints are in place" }, diff --git a/dev/check/go-dbconn-import.sh b/dev/check/go-dbconn-import.sh index 07af3f774c1..efc37d99bf9 100755 --- a/dev/check/go-dbconn-import.sh +++ b/dev/check/go-dbconn-import.sh @@ -16,7 +16,6 @@ allowed_prefix=( github.com/sourcegraph/sourcegraph/cmd/worker github.com/sourcegraph/sourcegraph/cmd/repo-updater github.com/sourcegraph/sourcegraph/cmd/migrator - github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend github.com/sourcegraph/sourcegraph/enterprise/cmd/worker github.com/sourcegraph/sourcegraph/enterprise/cmd/migrator github.com/sourcegraph/sourcegraph/cmd/precise-code-intel-worker diff --git a/dev/codecov.yml b/dev/codecov.yml index e7295512ef9..7204e832601 100644 --- a/dev/codecov.yml +++ b/dev/codecov.yml @@ -15,7 +15,7 @@ coverage: paths: - cmd/frontend/graphqlbackend/batches.go - internal/usagestats/batches.go - - enterprise/cmd/frontend/internal/batches + - cmd/frontend/internal/batches - internal/batches - client/web/src/enterprise/batches insights: diff --git a/dev/sg/internal/sgconf/config_test.go b/dev/sg/internal/sgconf/config_test.go index 3e24cc6aaa6..490e3708e0e 100644 --- a/dev/sg/internal/sgconf/config_test.go +++ b/dev/sg/internal/sgconf/config_test.go @@ -78,10 +78,10 @@ commandsets: func TestParseAndMerge(t *testing.T) { a := ` commands: - enterprise-frontend: - cmd: .bin/enterprise-frontend - install: go build .bin/enterprise-frontend github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend - checkBinary: .bin/enterprise-frontend + frontend: + cmd: .bin/frontend + install: go build .bin/frontend github.com/sourcegraph/sourcegraph/cmd/frontend + checkBinary: .bin/frontend env: ENTERPRISE: 1 EXTSVC_CONFIG_FILE: '../dev-private/enterprise/dev/external-services-config.json' @@ -90,7 +90,6 @@ commands: - internal - cmd/frontend - enterprise/internal - - enterprise/cmd/frontend ` config, err := parseConfig([]byte(a)) if err != nil { @@ -99,7 +98,7 @@ commands: b := ` commands: - enterprise-frontend: + frontend: env: EXTSVC_CONFIG_FILE: '' ` @@ -111,23 +110,22 @@ commands: config.Merge(overwrite) - cmd, ok := config.Commands["enterprise-frontend"] + cmd, ok := config.Commands["frontend"] if !ok { t.Fatalf("command not found") } want := run.Command{ - Name: "enterprise-frontend", - Cmd: ".bin/enterprise-frontend", - Install: "go build .bin/enterprise-frontend github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend", - CheckBinary: ".bin/enterprise-frontend", + Name: "frontend", + Cmd: ".bin/frontend", + Install: "go build .bin/frontend github.com/sourcegraph/sourcegraph/cmd/frontend", + CheckBinary: ".bin/frontend", Env: map[string]string{"ENTERPRISE": "1", "EXTSVC_CONFIG_FILE": ""}, Watch: []string{ "lib", "internal", "cmd/frontend", "enterprise/internal", - "enterprise/cmd/frontend", }, } diff --git a/dev/sg/sg.config.example.yaml b/dev/sg/sg.config.example.yaml index ac91c949589..ce876758301 100644 --- a/dev/sg/sg.config.example.yaml +++ b/dev/sg/sg.config.example.yaml @@ -30,17 +30,6 @@ commands: - internal - cmd/frontend - enterprise-frontend: - cmd: .bin/enterprise-frontend - install: go build -o .bin/enterprise-frontend github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend - env: - CONFIGURATION_MODE: server - USE_ENHANCED_LANGUAGE_DETECTION: false - watch: - - internal - - cmd/frontend - - enterprise/cmd/frontend - gitserver: cmd: .bin/gitserver install: go build -o .bin/gitserver github.com/sourcegraph/sourcegraph/cmd/gitserver diff --git a/doc/cody/overview/app/integrations.md b/doc/cody/overview/app/integrations.md index 400e1ab81f0..58c2ae67b99 100644 --- a/doc/cody/overview/app/integrations.md +++ b/doc/cody/overview/app/integrations.md @@ -6,7 +6,7 @@ This page outlines how extensions and other clients can integrate with Cody app. The Cody app API is a GraphQL API exposed on the localhost port which is `http://localhost:3080` by default. -The GraphQL resolvers for app-specific API calls are defined in [frontend/internal/app/resolvers/app.go](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@main/-/blob/enterprise/cmd/frontend/internal/app/resolvers/app.go). +The GraphQL resolvers for app-specific API calls are defined in [frontend/internal/app/resolvers/app.go](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@main/-/blob/cmd/frontend/internal/app/resolvers/app.go). ## App.json file diff --git a/doc/dev/background-information/backgroundroutine.md b/doc/dev/background-information/backgroundroutine.md index c19ea8b99b6..cadf16baed8 100644 --- a/doc/dev/background-information/backgroundroutine.md +++ b/doc/dev/background-information/backgroundroutine.md @@ -9,7 +9,7 @@ Examples: - [`worker.NewWorker`](https://sourcegraph.com/search?q=repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+worker.NewWorker&patternType=literal), for example, produces a background routine, which in this case is a background worker. - [`batches.newSpecExpireWorker`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/internal/batches/background/spec_expire.go?subtree=true#L13-27) returns a [`goroutine.PeriodicGoroutine`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@b946a20362ee7dfedb3b1fbc7f8bb002135d7283/-/blob/internal/goroutine/periodic.go?subtree=true#L14:78), which means it's invoked periodically. - [out-of-band migrations](oobmigrations.md) are implemented as background routines. -- [`HardDeleter`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@b946a20362ee7dfedb3b1fbc7f8bb002135d7283/-/blob/enterprise/cmd/frontend/internal/codeintel/background/janitor/hard_delete.go?subtree=true#L33) is a periodic background routine that periodically hard-deletes soft-deleted upload records. +- [`HardDeleter`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@b946a20362ee7dfedb3b1fbc7f8bb002135d7283/-/blob/cmd/frontend/internal/codeintel/background/janitor/hard_delete.go?subtree=true#L33) is a periodic background routine that periodically hard-deletes soft-deleted upload records. See also the [godocs.io examples for the `goroutine` package](https://godocs.io/github.com/sourcegraph/sourcegraph/internal/goroutine). diff --git a/doc/dev/background-information/batch_changes/index.md b/doc/dev/background-information/batch_changes/index.md index d5473851695..9ccadedea58 100644 --- a/doc/dev/background-information/batch_changes/index.md +++ b/doc/dev/background-information/batch_changes/index.md @@ -49,10 +49,10 @@ When you then click the "Preview the batch change" link that `src-cli` printed, 1. Once you hit the **Apply** button, the component [uses the `applyBatchChange`](https://github.com/sourcegraph/sourcegraph/blob/e7f26c0d7bc965892669a5fc9835ec65211943aa/client/web/src/enterprise/batches/preview/backend.ts#L140-L159) to apply the batch spec and create a batch change. 1. You're then redirected to the [`BatchChangeDetailsPage` component](https://github.com/sourcegraph/sourcegraph/blob/e7f26c0d7bc965892669a5fc9835ec65211943aa/client/web/src/enterprise/batches/detail/BatchChangeDetailsPage.tsx#L65) that shows you you're newly-created batch change. -In the backend, all Batch Changes related GraphQL queries and mutations start in the [`Resolver` package](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go): +In the backend, all Batch Changes related GraphQL queries and mutations start in the [`Resolver` package](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/cmd/frontend/internal/batches/resolvers/resolver.go): -1. The [`CreateChangesetSpec`](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go#L545) and [`CreateBatchSpec`](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go#L489) mutations that `src-cli` called to create the changeset and batch specs are defined here. -1. When you clicked **Apply** the [`ApplyBatchChange` resolver](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go#L404) was executed to create the batch change. +1. The [`CreateChangesetSpec`](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/cmd/frontend/internal/batches/resolvers/resolver.go#L545) and [`CreateBatchSpec`](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/cmd/frontend/internal/batches/resolvers/resolver.go#L489) mutations that `src-cli` called to create the changeset and batch specs are defined here. +1. When you clicked **Apply** the [`ApplyBatchChange` resolver](https://github.com/sourcegraph/sourcegraph/blob/8b99439e21aaa000443382f03f92e532b0445858/cmd/frontend/internal/batches/resolvers/resolver.go#L404) was executed to create the batch change. 1. Most of that doesn't happen in the resolver layer, but in the service layer: [here is the `(*Service).ApplyBatchChange` method](https://github.com/sourcegraph/sourcegraph/blob/e7f26c0d7bc965892669a5fc9835ec65211943aa/enterprise/internal/batches/service/service_apply_batch_change.go#L48:19) that talks to the database to create an entry in the `batch_changes` table. 1. The most important thing that happens in `(*Service).ApplyBatchChange` is that [it calls the `rewirer`](https://github.com/sourcegraph/sourcegraph/blob/e7f26c0d7bc965892669a5fc9835ec65211943aa/enterprise/internal/batches/service/service_apply_batch_change.go#L119-L135) to wire the entries in the `changesets` table to the correct `changeset_specs`. 1. Once that is done, the `changesets` are created or updated to point to the new `changeset_specs` that you created with `src-cli`. @@ -108,10 +108,10 @@ The following is a list of Go packages in the [`sourcegraph/sourcegraph`](https: - `enterprise/internal/batches/search/syntax`: The old Sourcegraph-search-query parser we inherited from the search team a week or two back (the plan is _not_ to keep it, but switch to the new one when we have time) -- `enterprise/cmd/frontend/internal/batches/resolvers`: +- `cmd/frontend/internal/batches/resolvers`: - The GraphQL resolvers that are injected into the `enterprise/frontend` in `enterprise/cmd/frontend/internal/batches/init.go`. They mostly concern themselves with input/argument parsing/validation, (bulk-)reading (and paginating) from the database via the `batches/store`, but delegate most business logic to `batches/service`. -- `enterprise/cmd/frontend/internal/batches/resolvers/apitest`: + The GraphQL resolvers that are injected into the `enterprise/frontend` in `cmd/frontend/internal/batches/init.go`. They mostly concern themselves with input/argument parsing/validation, (bulk-)reading (and paginating) from the database via the `batches/store`, but delegate most business logic to `batches/service`. +- `cmd/frontend/internal/batches/resolvers/apitest`: A package that helps with testing the resolvers by defining types that match the GraphQL schema. - `enterprise/internal/batches/testing`: @@ -126,7 +126,7 @@ The following is a list of Go packages in the [`sourcegraph/sourcegraph`](https: - `enterprise/internal/batches/service`: This is what's often called the "service layer" in web architectures and contains a lot of the business logic: creating a batch change and validating whether the user can create one, applying new batch specs, calling the `rewirer`, deleting batch changes, closing batch changes, etc. -- `enterprise/cmd/frontend/internal/batches/webhooks`: +- `cmd/frontend/internal/batches/webhooks`: These `webhooks` endpoints are injected by `InitFrontend` into the `frontend` and implement the `cmd/frontend/webhooks` interfaces. - `enterprise/internal/batches/store`: diff --git a/doc/dev/background-information/bazel/go_generate.md b/doc/dev/background-information/bazel/go_generate.md index ba9b14149af..907de4f099a 100644 --- a/doc/dev/background-information/bazel/go_generate.md +++ b/doc/dev/background-information/bazel/go_generate.md @@ -102,18 +102,18 @@ genrule( ) ``` -When we build our defined target `enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml` we get the following: +When we build our defined target `cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml` we get the following: ``` -$ bazel build enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (1 packages loaded, 2 targets configured). +$ bazel build cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (1 packages loaded, 2 targets configured). INFO: Found 1 target... -ERROR: /Users/tech/work/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: Executing genrule //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: (Exit 1): bash failed: - error executing command (from target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml) /bin/bash -c ... (remaining 1 argument skipped) +ERROR: /Users/tech/work/sourcegraph/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: Executing genrule //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: (Exit 1): bash failed: + error executing command (from target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml) /bin/bash -c ... (remaining 1 argument skipped) Use --sandbox_debug to see verbose messages from the sandbox and retain the sandbox build root for debugging cmd/frontend/graphqlbackend/schema.graphql did not match any files -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed to build +Target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed to build Use --verbose_failures to see the command lines of failed build steps. INFO: Elapsed time: 0.543s, Critical Path: 0.16s INFO: 2 processes: 2 internal. @@ -164,14 +164,14 @@ genrule( This time round, when we build out target , we get: ``` -$ bazel build enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (2 packages loaded, 5 targets configured). +$ bazel build cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (2 packages loaded, 5 targets configured). INFO: Found 1 target... -ERROR: /Users/tech/work/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: declared output 'enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go' was not created by genrule. This is pr +ERROR: /Users/tech/work/sourcegraph/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: declared output 'cmd/frontend/internal/guardrails/dotcom/operations.go' was not created by genrule. This is pr obably because the genrule actually didn't create this output, or because the output was a directory and the genrule was run remotely (note that only the contents of declared file outputs are copied from genrules run remotely) -ERROR: /Users/tech/work/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: Executing genrule //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: not all outputs were c +ERROR: /Users/tech/work/sourcegraph/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: Executing genrule //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: not all outputs were c reated or valid -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed to build +Target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed to build Use --verbose_failures to see the command lines of failed build steps. INFO: Elapsed time: 0.315s, Critical Path: 0.05s INFO: 2 processes: 1 internal, 1 darwin-sandbox. @@ -195,18 +195,18 @@ genrule( And we get: ``` -$ bazel build enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml --sandbox_debug -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (1 packages loaded, 3 targets configured). +$ bazel build cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml --sandbox_debug +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (1 packages loaded, 3 targets configured). INFO: Found 1 target... -INFO: From Executing genrule //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml: +INFO: From Executing genrule //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml: HERE -./enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go +./cmd/frontend/internal/guardrails/dotcom/operations.go HERE -ERROR: /Users/tech/work/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: declared output 'enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go' was not created by genrule. This is pr +ERROR: /Users/tech/work/sourcegraph/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: declared output 'cmd/frontend/internal/guardrails/dotcom/operations.go' was not created by genrule. This is pr obably because the genrule actually didn't create this output, or because the output was a directory and the genrule was run remotely (note that only the contents of declared file outputs are copied from genrules run remotely) -ERROR: /Users/tech/work/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: Executing genrule //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: not all outputs were c +ERROR: /Users/tech/work/sourcegraph/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:32:8: Executing genrule //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: not all outputs were c reated or valid -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed to build +Target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed to build Use --verbose_failures to see the command lines of failed build steps. INFO: Elapsed time: 0.191s, Critical Path: 0.05s INFO: 2 processes: 1 internal, 1 darwin-sandbox. @@ -217,7 +217,7 @@ Ah! We see it now: ``` HERE -./enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go +./cmd/frontend/internal/guardrails/dotcom/operations.go HERE ``` @@ -228,7 +228,7 @@ We can edit the `cmd` attribute as following: ``` genrule( # ... - cmd = "$(execpath @com_github_khan_genqlient//:genqlient) $(location genql.yaml) && mv enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go $@", + cmd = "$(execpath @com_github_khan_genqlient//:genqlient) $(location genql.yaml) && mv cmd/frontend/internal/guardrails/dotcom/operations.go $@", # ... ) ``` @@ -236,11 +236,11 @@ genrule( And this time, when we build it, it works: ``` -$ bazel build enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (0 packages loaded, 0 targets configured). +$ bazel build cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml (0 packages loaded, 0 targets configured). INFO: Found 1 target... -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml up-to-date: - bazel-bin/enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go +Target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml up-to-date: + bazel-bin/cmd/frontend/internal/guardrails/dotcom/operations.go INFO: Elapsed time: 0.132s, Critical Path: 0.00s INFO: 1 process: 1 internal. INFO: Build completed successfully, 1 total action @@ -258,8 +258,8 @@ go_library( # "operations.go", ":generate_gengql_yaml" ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails/dotcom", + visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//internal/httpcli", "//internal/trace", @@ -271,12 +271,12 @@ go_library( And then build it: ``` -$ rm enterprise/cmd/frontend/internal/guardrails/operations.go -$ bazel build enterprise/cmd/frontend/internal/guardrails/dotcom:dotcom -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:dotcom (0 packages loaded, 0 targets configured). +$ rm cmd/frontend/internal/guardrails/operations.go +$ bazel build cmd/frontend/internal/guardrails/dotcom:dotcom +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:dotcom (0 packages loaded, 0 targets configured). INFO: Found 1 target... -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:dotcom up-to-date: - bazel-bin/enterprise/cmd/frontend/internal/guardrails/dotcom/dotcom.a +Target //cmd/frontend/internal/guardrails/dotcom:dotcom up-to-date: + bazel-bin/cmd/frontend/internal/guardrails/dotcom/dotcom.a INFO: Elapsed time: 0.120s, Critical Path: 0.00s INFO: 1 process: 1 internal. INFO: Build completed successfully, 1 total action @@ -322,17 +322,17 @@ write_generated_to_source_files( We can ask Bazel to copy our files to the source tree with `bazel run`: ``` -$ bazel run enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml (0 packages loaded, 0 targets configured). +$ bazel run cmd/frontend/internal/guardrails/dotcom:write_genql_yaml +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:write_genql_yaml (0 packages loaded, 0 targets configured). INFO: Found 1 target... -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml up-to-date: - bazel-bin/enterprise/cmd/frontend/internal/guardrails/dotcom/write_genql_yaml_update.sh +Target //cmd/frontend/internal/guardrails/dotcom:write_genql_yaml up-to-date: + bazel-bin/cmd/frontend/internal/guardrails/dotcom/write_genql_yaml_update.sh INFO: Elapsed time: 0.109s, Critical Path: 0.00s INFO: 1 process: 1 internal. -INFO: Running command line: bazel-bin/enterprise/cmd/frontend/internal/guardrails/dotcom/write_genql_yaml_update.sh +INFO: Running command line: bazel-bin/cmd/frontend/internal/guardrails/dotcom/write_genql_yaml_update.sh INFO: Build completed successfully, 1 total action -Copying file /private/var/tmp/_bazel_tech/3eea80c6015362974b7d423d1f30cb62/execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/enterprise/cmd/frontend/internal/guardrails/dotcom/write_genql_yaml_update.sh.runfiles/__main__/ -enterprise/cmd/frontend/internal/guardrails/dotcom/copy_write_genql_yaml/operations.go to enterprise/cmd/frontend/internal/guardrails/dotcom/operations.go in /Users/tech/work/sourcegraph +Copying file /private/var/tmp/_bazel_tech/3eea80c6015362974b7d423d1f30cb62/execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/cmd/frontend/internal/guardrails/dotcom/write_genql_yaml_update.sh.runfiles/__main__/ +cmd/frontend/internal/guardrails/dotcom/copy_write_genql_yaml/operations.go to cmd/frontend/internal/guardrails/dotcom/operations.go in /Users/tech/work/sourcegraph ``` As a convenience for everyone, we can add our target to `dev/BUILD.bazel`, in the `write_all_generated` rule: @@ -345,7 +345,7 @@ write_source_files( "//lib/codeintel/lsif/protocol:write_symbol_kind", # ... # We add this: - "//enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml", + "//cmd/frontend/internal/guardrails/dotcom:write_genql_yaml", ], ) ``` @@ -363,10 +363,10 @@ The macro `write_generated_to_source_files`, doesn't just wrap a few details abo Let's see it in action: we drop a schema in `genql.yaml`, making the current `operations.go` out of sync: ``` -diff --git a/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml b/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml +diff --git a/cmd/frontend/internal/guardrails/dotcom/genql.yaml b/cmd/frontend/internal/guardrails/dotcom/genql.yaml index 21b7290a62..9a17d30852 100644 ---- a/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml -+++ b/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml +--- a/cmd/frontend/internal/guardrails/dotcom/genql.yaml ++++ b/cmd/frontend/internal/guardrails/dotcom/genql.yaml @@ -1,6 +1,5 @@ schema: - ../../../../../../cmd/frontend/graphqlbackend/schema.graphql @@ -379,24 +379,24 @@ index 21b7290a62..9a17d30852 100644 Now lets run the following test: ``` -$ bazel test //enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test -INFO: Analyzed target //enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test (0 packages loaded, 0 targets configured). +$ bazel test //cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test +INFO: Analyzed target //cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test (0 packages loaded, 0 targets configured). INFO: Found 1 test target... -ERROR: /Users/tech/work/sourcegraph/enterprise/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:19:8: Executing genrule //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: (Exit 1): bash failed: - error executing command (from target //enterprise/cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml) /bin/bash -c ... (remaining 1 argument skipped) +ERROR: /Users/tech/work/sourcegraph/cmd/frontend/internal/guardrails/dotcom/BUILD.bazel:19:8: Executing genrule //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml failed: (Exit 1): bash failed: + error executing command (from target //cmd/frontend/internal/guardrails/dotcom:generate_genql_yaml) /bin/bash -c ... (remaining 1 argument skipped) Use --sandbox_debug to see verbose messages from the sandbox and retain the sandbox build root for debugging operations.graphql:3: query-spec does not match schema: Cannot query field "snippetAttribution" on type "Query". -Target //enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test failed to build +Target //cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test failed to build Use --verbose_failures to see the command lines of failed build steps. INFO: Elapsed time: 0.197s, Critical Path: 0.05s INFO: 2 processes: 2 internal. -//enterprise/cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test FAILED TO BUILD +//cmd/frontend/internal/guardrails/dotcom:write_genql_yaml_test FAILED TO BUILD Executed 0 out of 1 test: 1 fails to build. FAILED: Build did NOT complete successfully ``` -Yup it fails. Please note that we don't have to remember the name of that target, we could simply run `bazel test //enterprise/cmd/frontend/internal/guardrails/...` to get the same results (along with a few other tests). +Yup it fails. Please note that we don't have to remember the name of that target, we could simply run `bazel test //cmd/frontend/internal/guardrails/...` to get the same results (along with a few other tests). > 💡 This is how the CI works, it simply runs `bazel test //...` so it will automatically catch any target getting out of sync. diff --git a/doc/dev/background-information/codeintel/auto-indexing.md b/doc/dev/background-information/codeintel/auto-indexing.md index e04c4f13111..d8ba5b2ce52 100644 --- a/doc/dev/background-information/codeintel/auto-indexing.md +++ b/doc/dev/background-information/codeintel/auto-indexing.md @@ -36,5 +36,5 @@ Once the executor receives a job, it will clone the target repository and checko ### Code appendix - Executor: [Handle](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/executor/internal/worker/handler%5C.go+func+%28h+*handler%29+Handle%28&patternType=literal) -- Frontend: [newExecutorQueueHandler](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%401198fda+file:%5Eenterprise/cmd/frontend/internal/executorqueue/queuehandler%5C.go%24+newExecutorQueueHandler&patternType=literal), [handleDequeue](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleDequeue%28&patternType=literal), [handleHeartbeat](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleHeartbeat%28&patternType=literal), [handleAddExecutionLogEntry](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleAddExecutionLogEntry%28&patternType=literal), [handleMarkComplete](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleMarkComplete%28&patternType=literal), [transformRecord](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/executorqueue/queues/codeintel/transform.go%24+func+transformRecord%28&patternType=literal) +- Frontend: [newExecutorQueueHandler](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%401198fda+file:%5Ecmd/frontend/internal/executorqueue/queuehandler%5C.go%24+newExecutorQueueHandler&patternType=literal), [handleDequeue](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleDequeue%28&patternType=literal), [handleHeartbeat](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleHeartbeat%28&patternType=literal), [handleAddExecutionLogEntry](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleAddExecutionLogEntry%28&patternType=literal), [handleMarkComplete](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/executorqueue/handler/routes.go%24+func+%28h+*handler%29+handleMarkComplete%28&patternType=literal), [transformRecord](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/executorqueue/queues/codeintel/transform.go%24+func+transformRecord%28&patternType=literal) - Firecracker: [setupFirecracker](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/executor/internal/command/firecracker%5C.go+func+setupFirecracker%28&patternType=literal), [teardownFirecracker](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/executor/internal/command/firecracker%5C.go+func+teardownFirecracker%28&patternType=literal), [formatFirecrackerCommand](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/executor/internal/command/firecracker%5C.go+func+formatFirecrackerCommand%28&patternType=literal) diff --git a/doc/dev/background-information/codeintel/index.md b/doc/dev/background-information/codeintel/index.md index 6d181539b89..0d675227df8 100644 --- a/doc/dev/background-information/codeintel/index.md +++ b/doc/dev/background-information/codeintel/index.md @@ -12,8 +12,8 @@ Code navigation-specific code: - [dev/codeintel-qa](https://github.com/sourcegraph/sourcegraph/tree/main/dev/codeintel-qa) - [enterprise/internal/codeintel](https://github.com/sourcegraph/sourcegraph/tree/main/enterprise/internal/codeintel) - [enterprise/cmd/worker/internal/codeintel](https://github.com/sourcegraph/sourcegraph/tree/main/enterprise/cmd/worker/internal/codeintel) -- [enterprise/cmd/frontend/internal/codeintel](https://github.com/sourcegraph/sourcegraph/tree/main/enterprise/cmd/frontend/internal/codeintel) -- [enterprise/cmd/frontend/internal/executorqueue/queues/codeintel](https://github.com/sourcegraph/sourcegraph/tree/main/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel) +- [cmd/frontend/internal/codeintel](https://github.com/sourcegraph/sourcegraph/tree/main/cmd/frontend/internal/codeintel) +- [cmd/frontend/internal/executorqueue/queues/codeintel](https://github.com/sourcegraph/sourcegraph/tree/main/cmd/frontend/internal/executorqueue/queues/codeintel) Docs: diff --git a/doc/dev/background-information/codeintel/queries.md b/doc/dev/background-information/codeintel/queries.md index afe0fbdd978..a8a167094ca 100644 --- a/doc/dev/background-information/codeintel/queries.md +++ b/doc/dev/background-information/codeintel/queries.md @@ -21,11 +21,11 @@ If the resulting locations were provided by an upload that was indexed on a comm ### Code appendix -- Resolvers: [QueryResolver](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/resolver%5C.go+func+%28r+*resolver%29+QueryResolver%28&patternType=literal) +- Resolvers: [QueryResolver](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/resolver%5C.go+func+%28r+*resolver%29+QueryResolver%28&patternType=literal) - DB store: [FindClosestDumps](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/dumps%5C.go+func+%28s+*Store%29+FindClosestDumps%28&patternType=literal), [DefinitionDumps](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/xrepo%5C.go+func+%28s+*Store%29+DefinitionDumps%28&patternType=literal) -- QueryResolver: [Definitions](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/query_definitions%5C.go+func+%28r+*queryResolver%29+Definitions%28&patternType=literal) +- QueryResolver: [Definitions](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/query_definitions%5C.go+func+%28r+*queryResolver%29+Definitions%28&patternType=literal) - Upload store: [Definitions](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/locations%5C.go+func+%28s+*Store%29+Definitions%28&patternType=literal), [MonikersByPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/monikers%5C.go+func+%28s+*Store%29+MonikersByPosition%28&patternType=literal), [BulkMonikerResults](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/monikers%5C.go+func+%28s+*Store%29+BulkMonikerResults%28&patternType=literal) -- Position adjuster: [AdjustPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustPosition%28&patternType=literal), [AdjustRange](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustRange%28&patternType=literal) +- Position adjuster: [AdjustPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustPosition%28&patternType=literal), [AdjustRange](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustRange%28&patternType=literal) ## References @@ -47,11 +47,11 @@ For each returned batch of locations, if the resulting locations were provided b ### Code appendix -- Resolvers: [QueryResolver](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/resolver%5C.go+func+%28r+*resolver%29+QueryResolver%28&patternType=literal) +- Resolvers: [QueryResolver](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/resolver%5C.go+func+%28r+*resolver%29+QueryResolver%28&patternType=literal) - DB store: [FindClosestDumps](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/dumps%5C.go+func+%28s+*Store%29+FindClosestDumps%28&patternType=literal), [DefinitionDumps](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/xrepo%5C.go+func+%28s+*Store%29+DefinitionDumps%28&patternType=literal), [ReferenceIDs](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/xrepo%5C.go+func+%28s+*Store%29+ReferenceIDs%28&patternType=literal), [GetDumpsByIDs](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/dumps%5C.go+func+%28s+*Store%29+GetDumpsByIDs%28&patternType=literal) -- QueryResolver: [References](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/query_references%5C.go+func+%28r+*queryResolver%29+References%28&patternType=literal) +- QueryResolver: [References](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/query_references%5C.go+func+%28r+*queryResolver%29+References%28&patternType=literal) - Upload store: [References](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/locations%5C.go+func+%28s+*Store%29+References%28&patternType=literal), [MonikersByPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/monikers%5C.go+func+%28s+*Store%29+MonikersByPosition%28&patternType=literal), [BulkMonikerResults](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/monikers%5C.go+func+%28s+*Store%29+BulkMonikerResults%28&patternType=literal) -- Position adjuster: [AdjustPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustPosition%28&patternType=literal), [AdjustRange](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustRange%28&patternType=literal) +- Position adjuster: [AdjustPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustPosition%28&patternType=literal), [AdjustRange](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustRange%28&patternType=literal) ## Hover @@ -69,8 +69,8 @@ If the resulting locations were provided by an upload that was indexed on a comm ### Code appendix -- Resolvers: [QueryResolver](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/resolver%5C.go+func+%28r+*resolver%29+QueryResolver%28&patternType=literal) +- Resolvers: [QueryResolver](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/resolver%5C.go+func+%28r+*resolver%29+QueryResolver%28&patternType=literal) - DB store: [FindClosestDumps](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/dbstore/dumps%5C.go+func+%28s+*Store%29+FindClosestDumps%28&patternType=literal) -- QueryResolver: [Hover](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/query_hover%5C.go+func+%28r+*queryResolver%29+Hover%28&patternType=literal) +- QueryResolver: [Hover](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/query_hover%5C.go+func+%28r+*queryResolver%29+Hover%28&patternType=literal) - Upload store: [Hover](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/codeintel/stores/lsifstore/hover%5C.go+func+%28s+*Store%29+Hover%28&patternType=literal) -- Position adjuster: [AdjustPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustPosition%28&patternType=literal), [AdjustRange](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustRange%28&patternType=literal) +- Position adjuster: [AdjustPosition](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustPosition%28&patternType=literal), [AdjustRange](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/resolvers/position%5C.go+func+%28p+*positionAdjuster%29+AdjustRange%28&patternType=literal) diff --git a/doc/dev/background-information/codeintel/uploads.md b/doc/dev/background-information/codeintel/uploads.md index 4b1dbc922af..778394a0f87 100644 --- a/doc/dev/background-information/codeintel/uploads.md +++ b/doc/dev/background-information/codeintel/uploads.md @@ -36,7 +36,7 @@ Finally, if the previous steps have all completed without error, the transaction ## Code appendix - src-cli: [lsif upload command](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/src-cli%24%40main+file:%5Ecmd/src/lsif_upload%5C.go+func+handleLSIFUpload%28&patternType=literal) -- Frontend: [handleEnqueue](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/frontend/internal/codeintel/httpapi/upload_handler%5C.go+func+%28h+*UploadHandler%29+handleEnqueue%28&patternType=literal) +- Frontend: [handleEnqueue](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Ecmd/frontend/internal/codeintel/httpapi/upload_handler%5C.go+func+%28h+*UploadHandler%29+handleEnqueue%28&patternType=literal) - Worker store: [Dequeue](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Einternal/workerutil/dbworker/store/store%5C.go+func+%28s+*store%29+Dequeue%28&patternType=literal&case=yes) - Worker: [Handle](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/precise-code-intel-worker/internal/worker/handler%5C.go+func+%28h+*handler%29+Handle%28&patternType=literal&case=yes), [writeData](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%40main+file:%5Eenterprise/cmd/precise-code-intel-worker/internal/worker/handler%5C.go+func+writeData%28&patternType=literal&case=yes) - Conversion: [Correlate](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24%4090b7985+file:%5Elib/codeintel/lsif/conversion/correlate%5C.go+func+Correlate%28&patternType=literal) diff --git a/doc/dev/background-information/security_patterns.md b/doc/dev/background-information/security_patterns.md index 9ffe47ab457..1b5acce5061 100644 --- a/doc/dev/background-information/security_patterns.md +++ b/doc/dev/background-information/security_patterns.md @@ -46,7 +46,7 @@ More specifically, an actor will be one of these three cases: Care must be taken when checking an actor: it's possible to have a context that doesn't have an actor at all, in which case `actor.FromContext()` will return `nil`. -Code in `cmd/frontend` and `enterprise/cmd/frontend` can take advantage of [the helper functions available in `cmd/frontend/backend`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@c764844/-/docs/cmd/frontend/backend#func) such as `CheckCurrentUserIsSiteAdmin` and `CheckSiteAdminOrSameUser`. These functions already take the details of internal and user actors into account, and are the safest way to perform authorization checks at the frontend level (for example, in GraphQL resolvers). +Code in `cmd/frontend` can take advantage of [the helper functions available in `cmd/frontend/backend`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph@c764844/-/docs/cmd/frontend/backend#func) such as `CheckCurrentUserIsSiteAdmin` and `CheckSiteAdminOrSameUser`. These functions already take the details of internal and user actors into account, and are the safest way to perform authorization checks at the frontend level (for example, in GraphQL resolvers). Below the frontend level, or in other commands, you'll need to implement more of your own authorization logic. Two `nil`-safe methods are provided on the `Actor` type: `IsAuthenticated()` and `IsInternal()`, which are always safe to call. The `UID` field must only be accessed after calling `IsAuthenticated()`. diff --git a/doc/dev/background-information/sg/reference.md b/doc/dev/background-information/sg/reference.md index 43103b055b3..f8b307dd3b4 100644 --- a/doc/dev/background-information/sg/reference.md +++ b/doc/dev/background-information/sg/reference.md @@ -111,7 +111,7 @@ Available commands in `sg.config.yaml`: * embeddings * executor-kubernetes-template * executor-template -* frontend: Enterprise frontend +* frontend: Frontend * github-proxy * gitserver * gitserver-0 diff --git a/enterprise/cmd/frontend/BUILD.bazel b/enterprise/cmd/frontend/BUILD.bazel deleted file mode 100644 index 386060fb41c..00000000000 --- a/enterprise/cmd/frontend/BUILD.bazel +++ /dev/null @@ -1,87 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") -load("@rules_oci//oci:defs.bzl", "oci_image", "oci_push", "oci_tarball") -load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("@container_structure_test//:defs.bzl", "container_structure_test") -load("//dev:oci_defs.bzl", "image_repository") - -go_library( - name = "frontend_lib", - srcs = ["main.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend", - visibility = ["//visibility:private"], - deps = [ - "//enterprise/cmd/frontend/shared", - "//internal/conf", - "//internal/sanitycheck", - "//internal/service/svcmain", - "//internal/tracer", - "//ui/assets", - "//ui/assets/enterprise", - ], -) - -go_binary( - name = "frontend", - embed = [":frontend_lib"], - visibility = ["//visibility:public"], - x_defs = { - "github.com/sourcegraph/sourcegraph/internal/version.version": "{STABLE_VERSION}", - "github.com/sourcegraph/sourcegraph/internal/version.timestamp": "{VERSION_TIMESTAMP}", - }, -) - -pkg_tar( - name = "tar_frontend", - srcs = [":frontend"], -) - -oci_image( - name = "image", - base = "@wolfi_base", - cmd = ["serve"], - entrypoint = [ - "/sbin/tini", - "--", - "/frontend", - ], - env = { - "CONFIGURATION_MODE": "server", - "PGDATABASE": "sg", - "PGHOST": "pgsql", - "PGPORT": "5432", - "PGSSLMODE": "disable", - "PGUSER": "sg", - "CODEINTEL_PGDATABASE": "sg", - "CODEINTEL_PGHOST": "codeintel-db", - "CODEINTEL_PGPORT": "5432", - "CODEINTEL_PGSSLMODE": "disable", - "CODEINTEL_PGUSER": "sg", - "PUBLIC_REPO_REDIRECTS": "true", - }, - tars = [":tar_frontend"], - user = "sourcegraph", -) - -oci_tarball( - name = "image_tarball", - image = ":image", - repo_tags = ["frontend:candidate"], -) - -container_structure_test( - name = "image_test", - timeout = "short", - configs = ["image_test.yaml"], - driver = "docker", - image = ":image", - tags = [ - "exclusive", - "requires-network", - ], -) - -oci_push( - name = "candidate_push", - image = ":image", - repository = image_repository("frontend"), -) diff --git a/enterprise/cmd/frontend/image_test.yaml b/enterprise/cmd/frontend/image_test.yaml deleted file mode 100644 index 0e9b870136c..00000000000 --- a/enterprise/cmd/frontend/image_test.yaml +++ /dev/null @@ -1,28 +0,0 @@ -schemaVersion: "2.0.0" - -commandTests: - - name: "binary is runnable" - command: "/frontend" - envVars: - - key: "SANITY_CHECK" - value: "true" - - - name: "not running as root" - command: "/usr/bin/id" - args: - - -u - excludedOutput: ["^0"] - exitCode: 0 - -fileExistenceTests: -- name: '/mnt/cache/frontend' - path: '/mnt/cache/frontend' - shouldExist: true - uid: 100 - gid: 101 - -metadataTest: - envVars: - - key: PGHOST - value: .+ - isRegex: true diff --git a/enterprise/cmd/frontend/internal/app/BUILD.bazel b/enterprise/cmd/frontend/internal/app/BUILD.bazel deleted file mode 100644 index 9a7e80405d0..00000000000 --- a/enterprise/cmd/frontend/internal/app/BUILD.bazel +++ /dev/null @@ -1,18 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "app", - srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/app", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], - deps = [ - "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/app/resolvers", - "//internal/codeintel", - "//internal/conf/conftypes", - "//internal/conf/deploy", - "//internal/database", - "//internal/gitserver", - "//internal/observation", - ], -) diff --git a/enterprise/cmd/frontend/internal/auth/BUILD.bazel b/enterprise/cmd/frontend/internal/auth/BUILD.bazel deleted file mode 100644 index b103c588e07..00000000000 --- a/enterprise/cmd/frontend/internal/auth/BUILD.bazel +++ /dev/null @@ -1,29 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "auth", - srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/auth", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], - deps = [ - "//cmd/frontend/auth", - "//cmd/frontend/external/app", - "//cmd/frontend/graphqlbackend", - "//enterprise/cmd/frontend/internal/auth/azureoauth", - "//enterprise/cmd/frontend/internal/auth/bitbucketcloudoauth", - "//enterprise/cmd/frontend/internal/auth/confauth", - "//enterprise/cmd/frontend/internal/auth/gerrit", - "//enterprise/cmd/frontend/internal/auth/githubappauth", - "//enterprise/cmd/frontend/internal/auth/githuboauth", - "//enterprise/cmd/frontend/internal/auth/gitlaboauth", - "//enterprise/cmd/frontend/internal/auth/httpheader", - "//enterprise/cmd/frontend/internal/auth/openidconnect", - "//enterprise/cmd/frontend/internal/auth/saml", - "//enterprise/cmd/frontend/internal/auth/sourcegraphoperator", - "//internal/auth", - "//internal/conf", - "//internal/database", - "//internal/licensing", - "@com_github_sourcegraph_log//:log", - ], -) diff --git a/enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest/BUILD.bazel b/enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest/BUILD.bazel deleted file mode 100644 index 312bbbca6af..00000000000 --- a/enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest/BUILD.bazel +++ /dev/null @@ -1,9 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "apitest", - srcs = ["types.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codemonitors/resolvers/apitest", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], - deps = ["//lib/errors"], -) diff --git a/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml b/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml deleted file mode 100644 index 21b7290a625..00000000000 --- a/enterprise/cmd/frontend/internal/guardrails/dotcom/genql.yaml +++ /dev/null @@ -1,7 +0,0 @@ -schema: - - ../../../../../../cmd/frontend/graphqlbackend/schema.graphql - - ../../../../../../cmd/frontend/graphqlbackend/guardrails.graphql -operations: - - operations.graphql -generated: operations.go -optional: pointer diff --git a/enterprise/cmd/frontend/internal/guardrails/resolvers/BUILD.bazel b/enterprise/cmd/frontend/internal/guardrails/resolvers/BUILD.bazel deleted file mode 100644 index 9bad5c30186..00000000000 --- a/enterprise/cmd/frontend/internal/guardrails/resolvers/BUILD.bazel +++ /dev/null @@ -1,13 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "resolvers", - srcs = ["resolver.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/guardrails/resolvers", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], - deps = [ - "//cmd/frontend/graphqlbackend", - "//cmd/frontend/graphqlbackend/graphqlutil", - "//enterprise/cmd/frontend/internal/guardrails/attribution", - ], -) diff --git a/enterprise/cmd/frontend/internal/search/BUILD.bazel b/enterprise/cmd/frontend/internal/search/BUILD.bazel deleted file mode 100644 index ebe11160598..00000000000 --- a/enterprise/cmd/frontend/internal/search/BUILD.bazel +++ /dev/null @@ -1,20 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "search", - srcs = ["init.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search", - visibility = ["//enterprise/cmd/frontend:__subpackages__"], - deps = [ - "//cmd/frontend/enterprise", - "//enterprise/cmd/frontend/internal/search/httpapi", - "//enterprise/cmd/frontend/internal/search/resolvers", - "//internal/codeintel", - "//internal/conf/conftypes", - "//internal/database", - "//internal/observation", - "//internal/search/exhaustive/service", - "//internal/search/exhaustive/store", - "//internal/search/exhaustive/uploadstore", - ], -) diff --git a/enterprise/cmd/frontend/main.go b/enterprise/cmd/frontend/main.go deleted file mode 100644 index a1e57c2d1ec..00000000000 --- a/enterprise/cmd/frontend/main.go +++ /dev/null @@ -1,28 +0,0 @@ -// Command frontend is the enterprise frontend program. -package main - -import ( - "os" - - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/shared" - "github.com/sourcegraph/sourcegraph/internal/conf" - "github.com/sourcegraph/sourcegraph/internal/sanitycheck" - "github.com/sourcegraph/sourcegraph/internal/service/svcmain" - "github.com/sourcegraph/sourcegraph/internal/tracer" - "github.com/sourcegraph/sourcegraph/ui/assets" - - _ "github.com/sourcegraph/sourcegraph/ui/assets/enterprise" // Select enterprise assets -) - -func main() { - sanitycheck.Pass() - if os.Getenv("WEBPACK_DEV_SERVER") == "1" { - assets.UseDevAssetsProvider() - } - svcmain.SingleServiceMainWithoutConf(shared.Service, svcmain.Config{}, svcmain.OutOfBandConfiguration{ - // use a switchable config here so we can switch it out for a proper conf client - // once we can use it after autoupgrading - Logging: conf.NewLogsSinksSource(shared.SwitchableSiteConfig()), - Tracing: tracer.ConfConfigurationSource{WatchableSiteConfig: shared.SwitchableSiteConfig()}, - }) -} diff --git a/enterprise/cmd/frontend/shared/BUILD.bazel b/enterprise/cmd/frontend/shared/BUILD.bazel deleted file mode 100644 index 353530db046..00000000000 --- a/enterprise/cmd/frontend/shared/BUILD.bazel +++ /dev/null @@ -1,54 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "shared", - srcs = [ - "service.go", - "shared.go", - ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/shared", - visibility = ["//visibility:public"], - deps = [ - "//cmd/frontend/enterprise", - "//cmd/frontend/registry/api", - "//cmd/frontend/shared", - "//enterprise/cmd/frontend/internal/app", - "//enterprise/cmd/frontend/internal/auth", - "//enterprise/cmd/frontend/internal/auth/githubappauth", - "//enterprise/cmd/frontend/internal/authz", - "//enterprise/cmd/frontend/internal/batches", - "//enterprise/cmd/frontend/internal/codeintel", - "//enterprise/cmd/frontend/internal/codemonitors", - "//enterprise/cmd/frontend/internal/completions", - "//enterprise/cmd/frontend/internal/compute", - "//enterprise/cmd/frontend/internal/contentlibrary", - "//enterprise/cmd/frontend/internal/context", - "//enterprise/cmd/frontend/internal/dotcom", - "//enterprise/cmd/frontend/internal/embeddings", - "//enterprise/cmd/frontend/internal/executorqueue", - "//enterprise/cmd/frontend/internal/guardrails", - "//enterprise/cmd/frontend/internal/insights", - "//enterprise/cmd/frontend/internal/licensing/init", - "//enterprise/cmd/frontend/internal/notebooks", - "//enterprise/cmd/frontend/internal/own", - "//enterprise/cmd/frontend/internal/rbac", - "//enterprise/cmd/frontend/internal/registry", - "//enterprise/cmd/frontend/internal/repos/webhooks", - "//enterprise/cmd/frontend/internal/scim", - "//enterprise/cmd/frontend/internal/search", - "//enterprise/cmd/frontend/internal/searchcontexts", - "//internal/codeintel", - "//internal/codeintel/shared", - "//internal/conf", - "//internal/conf/conftypes", - "//internal/database", - "//internal/database/connections/live", - "//internal/debugserver", - "//internal/env", - "//internal/observation", - "//internal/oobmigration/migrations/register", - "//internal/service", - "//schema", - "@com_github_sourcegraph_log//:log", - ], -) diff --git a/enterprise/cmd/frontend/shared/service.go b/enterprise/cmd/frontend/shared/service.go deleted file mode 100644 index 979a7212f20..00000000000 --- a/enterprise/cmd/frontend/shared/service.go +++ /dev/null @@ -1,34 +0,0 @@ -package shared - -import ( - "context" - - frontend_shared "github.com/sourcegraph/sourcegraph/cmd/frontend/shared" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/codeintel" - "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/search" - "github.com/sourcegraph/sourcegraph/internal/debugserver" - "github.com/sourcegraph/sourcegraph/internal/env" - "github.com/sourcegraph/sourcegraph/internal/observation" - "github.com/sourcegraph/sourcegraph/internal/oobmigration/migrations/register" - "github.com/sourcegraph/sourcegraph/internal/service" - - _ "github.com/sourcegraph/sourcegraph/cmd/frontend/registry/api" - _ "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/registry" -) - -type svc struct{} - -func (svc) Name() string { return "frontend" } - -func (svc) Configure() (env.Config, []debugserver.Endpoint) { - frontend_shared.CLILoadConfig() - codeintel.LoadConfig() - search.LoadConfig() - return nil, frontend_shared.GRPCWebUIDebugEndpoints() -} - -func (svc) Start(ctx context.Context, observationCtx *observation.Context, ready service.ReadyFunc, config env.Config) error { - return frontend_shared.CLIMain(ctx, observationCtx, ready, EnterpriseSetupHook, register.RegisterEnterpriseMigratorsUsingConfAndStoreFactory) -} - -var Service service.Service = svc{} diff --git a/enterprise/cmd/server/BUILD.bazel b/enterprise/cmd/server/BUILD.bazel index 7298d500116..ec6deaf8c78 100644 --- a/enterprise/cmd/server/BUILD.bazel +++ b/enterprise/cmd/server/BUILD.bazel @@ -114,7 +114,7 @@ DEPS = [ "//cmd/precise-code-intel-worker", "//cmd/searcher", "//enterprise/cmd/embeddings", - "//enterprise/cmd/frontend", + "//cmd/frontend", "//cmd/gitserver", "//enterprise/cmd/migrator", "//cmd/repo-updater", diff --git a/enterprise/cmd/worker/shared/sourcegraphoperator/associate.go b/enterprise/cmd/worker/shared/sourcegraphoperator/associate.go index deb65322dd9..7313dea2e95 100644 --- a/enterprise/cmd/worker/shared/sourcegraphoperator/associate.go +++ b/enterprise/cmd/worker/shared/sourcegraphoperator/associate.go @@ -97,14 +97,14 @@ type addSourcegraphOperatorExternalAccountFunc func(ctx context.Context, db data var addSourcegraphOperatorExternalAccountHandler addSourcegraphOperatorExternalAccountFunc // RegisterAddSourcegraphOperatorExternalAccountHandler is used by -// enterprise/cmd/frontend/internal/auth/sourcegraphoperator to register an +// cmd/frontend/internal/auth/sourcegraphoperator to register an // enterprise handler for AddSourcegraphOperatorExternalAccount. func RegisterAddSourcegraphOperatorExternalAccountHandler(handler addSourcegraphOperatorExternalAccountFunc) { addSourcegraphOperatorExternalAccountHandler = handler } // AddSourcegraphOperatorExternalAccount is implemented in -// enterprise/cmd/frontend/internal/auth/sourcegraphoperator.AddSourcegraphOperatorExternalAccount +// cmd/frontend/internal/auth/sourcegraphoperator.AddSourcegraphOperatorExternalAccount // // Outside of Sourcegraph Enterprise, this will no-op and return an error. func AddSourcegraphOperatorExternalAccount(ctx context.Context, db database.DB, userID int32, serviceID string, accountDetails string) error { diff --git a/internal/usagestats/code_insights.go b/internal/usagestats/code_insights.go index a6670811dda..1949cdfc99e 100644 --- a/internal/usagestats/code_insights.go +++ b/internal/usagestats/code_insights.go @@ -684,7 +684,7 @@ GROUP BY argument; ` // getDataExportClickCountSql depends on the InsightsDataExportRequest ping, -// which is defined in enterprise/cmd/frontend/internal/insights/httpapi/export.go +// which is defined in cmd/frontend/internal/insights/httpapi/export.go const getDataExportClickCountSql = ` SELECT COUNT(*) FROM event_logs WHERE name = 'InsightsDataExportRequest' AND timestamp > DATE_TRUNC('week', $1::TIMESTAMP); diff --git a/mockgen.test.yaml b/mockgen.test.yaml index 2097bc45c9d..043dec46c17 100644 --- a/mockgen.test.yaml +++ b/mockgen.test.yaml @@ -151,12 +151,12 @@ path: github.com/sourcegraph/sourcegraph/internal/codeintel/uploads/transport/http/auth interfaces: - GitHubClient -- filename: enterprise/cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go - path: github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/queues/batches +- filename: cmd/frontend/internal/executorqueue/queues/batches/mocks_test.go + path: github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue/queues/batches interfaces: - BatchesStore -- filename: enterprise/cmd/frontend/internal/executorqueue/mocks_test.go - path: github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue +- filename: cmd/frontend/internal/executorqueue/mocks_test.go + path: github.com/sourcegraph/sourcegraph/cmd/frontend/internal/executorqueue interfaces: - GitserverClient - filename: internal/batches/syncer/mocks_test.go diff --git a/monitoring/definitions/executor.go b/monitoring/definitions/executor.go index 020abaa0e52..fdb80625ce9 100644 --- a/monitoring/definitions/executor.go +++ b/monitoring/definitions/executor.go @@ -6,7 +6,7 @@ import ( ) func Executor() *monitoring.Dashboard { - // sg_job value is hard-coded, see enterprise/cmd/frontend/internal/executorqueue/handler/routes.go + // sg_job value is hard-coded, see cmd/frontend/internal/executorqueue/handler/routes.go const executorsJobName = "sourcegraph-executors" const registryJobName = "sourcegraph-executors-registry" // sg_instance for registry is hard-coded, see cmd/executor/internal/metrics/metrics.go diff --git a/sg.config.yaml b/sg.config.yaml index 4f3404a0ea5..407d0ca5a0a 100644 --- a/sg.config.yaml +++ b/sg.config.yaml @@ -145,7 +145,7 @@ commands: URL: "http://localhost:7080" frontend: - description: Enterprise frontend + description: Frontend cmd: | # TODO: This should be fixed export SOURCEGRAPH_LICENSE_GENERATION_KEY=$(cat ../dev-private/enterprise/dev/test-license-generation-key.pem) @@ -157,7 +157,7 @@ commands: if [ -n "$DELVE" ]; then export GCFLAGS='-N -l' fi - go build -gcflags="$GCFLAGS" -o .bin/frontend github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend + go build -gcflags="$GCFLAGS" -o .bin/frontend github.com/sourcegraph/sourcegraph/cmd/frontend checkBinary: .bin/frontend env: CONFIGURATION_MODE: server @@ -171,7 +171,6 @@ commands: - lib - internal - cmd/frontend - - enterprise/cmd/frontend gitserver-template: &gitserver_template cmd: .bin/gitserver @@ -964,7 +963,7 @@ bazelCommands: target: //cmd/github-proxy frontend: description: Enterprise frontend - target: //enterprise/cmd/frontend + target: //cmd/frontend precmd: | export SOURCEGRAPH_LICENSE_GENERATION_KEY=$(cat ../dev-private/enterprise/dev/test-license-generation-key.pem) # If EXTSVC_CONFIG_FILE is *unset*, set a default.