Merge enterprise and oss frontend (#56476)

This is a big one! Merged the enterprise frontend with the OSS one, to get yet another step closer to getting rid of the enterprise directory :)

.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

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/'

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"),
+)

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(

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},

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

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",

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"

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",

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",
+    ],
+)

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",

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"

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"

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 {

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"

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",

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"

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"

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"

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"

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"

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",

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",

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",

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"

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",

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"

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"

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"

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"

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"

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",

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"

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"

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"

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"

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"

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",

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"

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",

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",

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",

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",