From c3e9750ff81d796065b8409bec2f3b81dacca3ba Mon Sep 17 00:00:00 2001
From: Erik Seliger <erikseliger@me.com>
Date: Wed, 4 Oct 2023 00:47:10 +0200
Subject: [PATCH] Move embeddings service out of enterprise (#57291)

Mechanical code move to get another service out of enterprise.
---
 WORKSPACE                                                 | 2 +-
 {enterprise/cmd => cmd}/embeddings/BUILD.bazel            | 4 ++--
 {enterprise/cmd => cmd}/embeddings/image_test.yaml        | 0
 {enterprise/cmd => cmd}/embeddings/main.go                | 2 +-
 {enterprise/cmd => cmd}/embeddings/qa/BUILD.bazel         | 2 +-
 {enterprise/cmd => cmd}/embeddings/qa/context_data.tsv    | 0
 .../cmd => cmd}/embeddings/qa/embed_queries/BUILD.bazel   | 2 +-
 .../cmd => cmd}/embeddings/qa/embed_queries/main.go       | 0
 {enterprise/cmd => cmd}/embeddings/qa/eval.go             | 0
 {enterprise/cmd => cmd}/embeddings/shared/BUILD.bazel     | 8 ++++----
 {enterprise/cmd => cmd}/embeddings/shared/assets.bzl      | 0
 {enterprise/cmd => cmd}/embeddings/shared/config.go       | 0
 .../cmd => cmd}/embeddings/shared/context_qa_test.go      | 4 ++--
 {enterprise/cmd => cmd}/embeddings/shared/main.go         | 0
 {enterprise/cmd => cmd}/embeddings/shared/main_test.go    | 0
 .../embeddings/shared/repo_embedding_index_cache.go       | 0
 .../embeddings/shared/repo_embedding_index_cache_test.go  | 0
 {enterprise/cmd => cmd}/embeddings/shared/search.go       | 0
 {enterprise/cmd => cmd}/embeddings/shared/service.go      | 0
 .../cmd => cmd}/embeddings/shared/testdata/.gitkeep       | 0
 cmd/server/BUILD.bazel                                    | 2 +-
 cmd/sourcegraph/BUILD.bazel                               | 2 +-
 cmd/sourcegraph/main.go                                   | 2 +-
 dev/check/go-dbconn-import.sh                             | 2 +-
 dev/sg/BUILD.bazel                                        | 2 +-
 dev/sg/sg_embeddings_qa.go                                | 2 +-
 enterprise/dev/ci/internal/ci/bazel_operations.go         | 2 +-
 sg.config.yaml                                            | 4 ++--
 28 files changed, 21 insertions(+), 21 deletions(-)
 rename {enterprise/cmd => cmd}/embeddings/BUILD.bazel (92%)
 rename {enterprise/cmd => cmd}/embeddings/image_test.yaml (100%)
 rename {enterprise/cmd => cmd}/embeddings/main.go (78%)
 rename {enterprise/cmd => cmd}/embeddings/qa/BUILD.bazel (77%)
 rename {enterprise/cmd => cmd}/embeddings/qa/context_data.tsv (100%)
 rename {enterprise/cmd => cmd}/embeddings/qa/embed_queries/BUILD.bazel (82%)
 rename {enterprise/cmd => cmd}/embeddings/qa/embed_queries/main.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/qa/eval.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/BUILD.bazel (89%)
 rename {enterprise/cmd => cmd}/embeddings/shared/assets.bzl (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/config.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/context_qa_test.go (95%)
 rename {enterprise/cmd => cmd}/embeddings/shared/main.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/main_test.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/repo_embedding_index_cache.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/repo_embedding_index_cache_test.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/search.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/service.go (100%)
 rename {enterprise/cmd => cmd}/embeddings/shared/testdata/.gitkeep (100%)

diff --git a/WORKSPACE b/WORKSPACE
index 9cc3a79626a..547b871a380 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -404,7 +404,7 @@ load("//dev:oci_deps.bzl", "oci_deps")
 
 oci_deps()
 
-load("//enterprise/cmd/embeddings/shared:assets.bzl", "embbedings_assets_deps")
+load("//cmd/embeddings/shared:assets.bzl", "embbedings_assets_deps")
 
 embbedings_assets_deps()
 
diff --git a/enterprise/cmd/embeddings/BUILD.bazel b/cmd/embeddings/BUILD.bazel
similarity index 92%
rename from enterprise/cmd/embeddings/BUILD.bazel
rename to cmd/embeddings/BUILD.bazel
index 4c05f2f3a20..1fd43e269a5 100644
--- a/enterprise/cmd/embeddings/BUILD.bazel
+++ b/cmd/embeddings/BUILD.bazel
@@ -7,10 +7,10 @@ load("//dev:oci_defs.bzl", "image_repository")
 go_library(
     name = "embeddings_lib",
     srcs = ["main.go"],
-    importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings",
+    importpath = "github.com/sourcegraph/sourcegraph/cmd/embeddings",
     visibility = ["//visibility:private"],
     deps = [
-        "//enterprise/cmd/embeddings/shared",
+        "//cmd/embeddings/shared",
         "//internal/sanitycheck",
         "//internal/service/svcmain",
     ],
diff --git a/enterprise/cmd/embeddings/image_test.yaml b/cmd/embeddings/image_test.yaml
similarity index 100%
rename from enterprise/cmd/embeddings/image_test.yaml
rename to cmd/embeddings/image_test.yaml
diff --git a/enterprise/cmd/embeddings/main.go b/cmd/embeddings/main.go
similarity index 78%
rename from enterprise/cmd/embeddings/main.go
rename to cmd/embeddings/main.go
index 52127c1b341..dbb74f99afb 100644
--- a/enterprise/cmd/embeddings/main.go
+++ b/cmd/embeddings/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/shared"
+	"github.com/sourcegraph/sourcegraph/cmd/embeddings/shared"
 	"github.com/sourcegraph/sourcegraph/internal/sanitycheck"
 	"github.com/sourcegraph/sourcegraph/internal/service/svcmain"
 )
diff --git a/enterprise/cmd/embeddings/qa/BUILD.bazel b/cmd/embeddings/qa/BUILD.bazel
similarity index 77%
rename from enterprise/cmd/embeddings/qa/BUILD.bazel
rename to cmd/embeddings/qa/BUILD.bazel
index 26224141b70..b7c7b92b68e 100644
--- a/enterprise/cmd/embeddings/qa/BUILD.bazel
+++ b/cmd/embeddings/qa/BUILD.bazel
@@ -4,7 +4,7 @@ go_library(
     name = "qa",
     srcs = ["eval.go"],
     embedsrcs = ["context_data.tsv"],
-    importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa",
+    importpath = "github.com/sourcegraph/sourcegraph/cmd/embeddings/qa",
     visibility = ["//visibility:public"],
     deps = [
         "//internal/api",
diff --git a/enterprise/cmd/embeddings/qa/context_data.tsv b/cmd/embeddings/qa/context_data.tsv
similarity index 100%
rename from enterprise/cmd/embeddings/qa/context_data.tsv
rename to cmd/embeddings/qa/context_data.tsv
diff --git a/enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel b/cmd/embeddings/qa/embed_queries/BUILD.bazel
similarity index 82%
rename from enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel
rename to cmd/embeddings/qa/embed_queries/BUILD.bazel
index ef893c94608..348ac881c09 100644
--- a/enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel
+++ b/cmd/embeddings/qa/embed_queries/BUILD.bazel
@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 go_library(
     name = "embed_queries_lib",
     srcs = ["main.go"],
-    importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa/embed_queries",
+    importpath = "github.com/sourcegraph/sourcegraph/cmd/embeddings/qa/embed_queries",
     visibility = ["//visibility:private"],
     deps = [
         "//internal/conf",
diff --git a/enterprise/cmd/embeddings/qa/embed_queries/main.go b/cmd/embeddings/qa/embed_queries/main.go
similarity index 100%
rename from enterprise/cmd/embeddings/qa/embed_queries/main.go
rename to cmd/embeddings/qa/embed_queries/main.go
diff --git a/enterprise/cmd/embeddings/qa/eval.go b/cmd/embeddings/qa/eval.go
similarity index 100%
rename from enterprise/cmd/embeddings/qa/eval.go
rename to cmd/embeddings/qa/eval.go
diff --git a/enterprise/cmd/embeddings/shared/BUILD.bazel b/cmd/embeddings/shared/BUILD.bazel
similarity index 89%
rename from enterprise/cmd/embeddings/shared/BUILD.bazel
rename to cmd/embeddings/shared/BUILD.bazel
index b11dc6f590c..d25f6387579 100644
--- a/enterprise/cmd/embeddings/shared/BUILD.bazel
+++ b/cmd/embeddings/shared/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
         "search.go",
         "service.go",
     ],
-    importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/shared",
+    importpath = "github.com/sourcegraph/sourcegraph/cmd/embeddings/shared",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/frontend/globals",
@@ -50,7 +50,7 @@ go_library(
 )
 
 # The filename specified by the out field needs to include the sha for the test to find it.
-# See //enterprise/cmd/embeddings/shared:assets.bzl for the macro fetching those external dependencies.
+# See //cmd/embeddings/shared:assets.bzl for the macro fetching those external dependencies.
 copy_file(
     name = "ln_test_data_embeddings_index",
     src = "@github_com_sourcegraph_sourcegraph_embeddingindex//file:downloaded",
@@ -58,7 +58,7 @@ copy_file(
     allow_symlink = True,
 )
 
-# See //enterprise/cmd/embeddings/shared:assets.bzl for the macro fetching those external dependencies.
+# See //cmd/embeddings/shared:assets.bzl for the macro fetching those external dependencies.
 copy_file(
     name = "ln_test_data_query_embeddings_gob",
     src = "@query_embeddings_gob//file:downloaded",
@@ -81,7 +81,7 @@ go_test(
         ":ln_test_data_query_embeddings_gob",
     ],  # keep
     deps = [
-        "//enterprise/cmd/embeddings/qa",
+        "//cmd/embeddings/qa",
         "//internal/api",
         "//internal/database/dbmocks",
         "//internal/embeddings",
diff --git a/enterprise/cmd/embeddings/shared/assets.bzl b/cmd/embeddings/shared/assets.bzl
similarity index 100%
rename from enterprise/cmd/embeddings/shared/assets.bzl
rename to cmd/embeddings/shared/assets.bzl
diff --git a/enterprise/cmd/embeddings/shared/config.go b/cmd/embeddings/shared/config.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/config.go
rename to cmd/embeddings/shared/config.go
diff --git a/enterprise/cmd/embeddings/shared/context_qa_test.go b/cmd/embeddings/shared/context_qa_test.go
similarity index 95%
rename from enterprise/cmd/embeddings/shared/context_qa_test.go
rename to cmd/embeddings/shared/context_qa_test.go
index ae1a6c1ef02..75325646e1d 100644
--- a/enterprise/cmd/embeddings/shared/context_qa_test.go
+++ b/cmd/embeddings/shared/context_qa_test.go
@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa"
+	"github.com/sourcegraph/sourcegraph/cmd/embeddings/qa"
 	"github.com/sourcegraph/sourcegraph/internal/api"
 	"github.com/sourcegraph/sourcegraph/internal/embeddings"
 	uploadstoremocks "github.com/sourcegraph/sourcegraph/internal/uploadstore/mocks"
@@ -21,7 +21,7 @@ import (
 )
 
 // This embed is handled by Bazel, and using the traditional go test command will fail.
-// See //enterprise/cmd/embeddings/shared:assets.bzl
+// See //cmd/embeddings/shared:assets.bzl
 //
 //go:embed testdata/*
 var fs embed.FS
diff --git a/enterprise/cmd/embeddings/shared/main.go b/cmd/embeddings/shared/main.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/main.go
rename to cmd/embeddings/shared/main.go
diff --git a/enterprise/cmd/embeddings/shared/main_test.go b/cmd/embeddings/shared/main_test.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/main_test.go
rename to cmd/embeddings/shared/main_test.go
diff --git a/enterprise/cmd/embeddings/shared/repo_embedding_index_cache.go b/cmd/embeddings/shared/repo_embedding_index_cache.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/repo_embedding_index_cache.go
rename to cmd/embeddings/shared/repo_embedding_index_cache.go
diff --git a/enterprise/cmd/embeddings/shared/repo_embedding_index_cache_test.go b/cmd/embeddings/shared/repo_embedding_index_cache_test.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/repo_embedding_index_cache_test.go
rename to cmd/embeddings/shared/repo_embedding_index_cache_test.go
diff --git a/enterprise/cmd/embeddings/shared/search.go b/cmd/embeddings/shared/search.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/search.go
rename to cmd/embeddings/shared/search.go
diff --git a/enterprise/cmd/embeddings/shared/service.go b/cmd/embeddings/shared/service.go
similarity index 100%
rename from enterprise/cmd/embeddings/shared/service.go
rename to cmd/embeddings/shared/service.go
diff --git a/enterprise/cmd/embeddings/shared/testdata/.gitkeep b/cmd/embeddings/shared/testdata/.gitkeep
similarity index 100%
rename from enterprise/cmd/embeddings/shared/testdata/.gitkeep
rename to cmd/embeddings/shared/testdata/.gitkeep
diff --git a/cmd/server/BUILD.bazel b/cmd/server/BUILD.bazel
index b94693ee2e1..71eebd356f9 100644
--- a/cmd/server/BUILD.bazel
+++ b/cmd/server/BUILD.bazel
@@ -92,7 +92,7 @@ pkg_tar(
 DEPS = [
     "//cmd/precise-code-intel-worker",
     "//cmd/searcher",
-    "//enterprise/cmd/embeddings",
+    "//cmd/embeddings",
     "//cmd/frontend",
     "//cmd/gitserver",
     "//enterprise/cmd/migrator",
diff --git a/cmd/sourcegraph/BUILD.bazel b/cmd/sourcegraph/BUILD.bazel
index e249cb653bd..9269195cb32 100644
--- a/cmd/sourcegraph/BUILD.bazel
+++ b/cmd/sourcegraph/BUILD.bazel
@@ -7,6 +7,7 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "//cmd/blobstore/shared",
+        "//cmd/embeddings/shared",
         "//cmd/executor/singlebinary",
         "//cmd/frontend/shared",
         "//cmd/gitserver/shared",
@@ -15,7 +16,6 @@ go_library(
         "//cmd/searcher/shared",
         "//cmd/sourcegraph/osscmd",
         "//cmd/worker/shared",
-        "//enterprise/cmd/embeddings/shared",
         "//enterprise/cmd/symbols/shared",
         "//internal/sanitycheck",
         "//internal/service",
diff --git a/cmd/sourcegraph/main.go b/cmd/sourcegraph/main.go
index 42aa8b066b9..8e31437525f 100644
--- a/cmd/sourcegraph/main.go
+++ b/cmd/sourcegraph/main.go
@@ -10,6 +10,7 @@ import (
 	"github.com/sourcegraph/sourcegraph/internal/service/servegit"
 
 	blobstore_shared "github.com/sourcegraph/sourcegraph/cmd/blobstore/shared"
+	embeddings_shared "github.com/sourcegraph/sourcegraph/cmd/embeddings/shared"
 	executor_singlebinary "github.com/sourcegraph/sourcegraph/cmd/executor/singlebinary"
 	frontend_shared "github.com/sourcegraph/sourcegraph/cmd/frontend/shared"
 	gitserver_shared "github.com/sourcegraph/sourcegraph/cmd/gitserver/shared"
@@ -17,7 +18,6 @@ import (
 	repoupdater_shared "github.com/sourcegraph/sourcegraph/cmd/repo-updater/shared"
 	searcher_shared "github.com/sourcegraph/sourcegraph/cmd/searcher/shared"
 	worker_shared "github.com/sourcegraph/sourcegraph/cmd/worker/shared"
-	embeddings_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/shared"
 	symbols_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/symbols/shared"
 
 	"github.com/sourcegraph/sourcegraph/ui/assets"
diff --git a/dev/check/go-dbconn-import.sh b/dev/check/go-dbconn-import.sh
index 6e6ba9f252e..467dde8c917 100755
--- a/dev/check/go-dbconn-import.sh
+++ b/dev/check/go-dbconn-import.sh
@@ -19,7 +19,7 @@ allowed_prefix=(
   github.com/sourcegraph/sourcegraph/enterprise/cmd/migrator
   github.com/sourcegraph/sourcegraph/cmd/precise-code-intel-worker
   github.com/sourcegraph/sourcegraph/enterprise/cmd/symbols
-  github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings
+  github.com/sourcegraph/sourcegraph/cmd/embeddings
   # Doesn't connect but uses db internals for use with sqlite
   github.com/sourcegraph/sourcegraph/cmd/symbols
   # Transitively depends on zoekt package which imports but does not use DB
diff --git a/dev/sg/BUILD.bazel b/dev/sg/BUILD.bazel
index 267dffeb753..8f6ccb78689 100644
--- a/dev/sg/BUILD.bazel
+++ b/dev/sg/BUILD.bazel
@@ -48,6 +48,7 @@ go_library(
     importpath = "github.com/sourcegraph/sourcegraph/dev/sg",
     visibility = ["//visibility:private"],
     deps = [
+        "//cmd/embeddings/qa",
         "//dev/sg/adr",
         "//dev/sg/buf",
         "//dev/sg/ci",
@@ -78,7 +79,6 @@ go_library(
         "//dev/sg/msp",
         "//dev/sg/root",
         "//dev/team",
-        "//enterprise/cmd/embeddings/qa",
         "//internal/database",
         "//internal/database/basestore",
         "//internal/database/connections/live",
diff --git a/dev/sg/sg_embeddings_qa.go b/dev/sg/sg_embeddings_qa.go
index e737527bbce..42a5f03e4d0 100644
--- a/dev/sg/sg_embeddings_qa.go
+++ b/dev/sg/sg_embeddings_qa.go
@@ -3,8 +3,8 @@ package main
 import (
 	"github.com/urfave/cli/v2"
 
+	"github.com/sourcegraph/sourcegraph/cmd/embeddings/qa"
 	"github.com/sourcegraph/sourcegraph/dev/sg/internal/category"
-	"github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
diff --git a/enterprise/dev/ci/internal/ci/bazel_operations.go b/enterprise/dev/ci/internal/ci/bazel_operations.go
index f2632552a94..57338da9e90 100644
--- a/enterprise/dev/ci/internal/ci/bazel_operations.go
+++ b/enterprise/dev/ci/internal/ci/bazel_operations.go
@@ -154,7 +154,7 @@ func bazelTest(targets ...string) func(*bk.Pipeline) {
 		bk.AllowDependencyFailure(),
 		bk.Agent("queue", "bazel"),
 		bk.Key("bazel-tests"),
-		bk.ArtifactPaths("./bazel-testlogs/enterprise/cmd/embeddings/shared/shared_test/*.log", "./command.profile.gz"),
+		bk.ArtifactPaths("./bazel-testlogs/cmd/embeddings/shared/shared_test/*.log", "./command.profile.gz"),
 		bk.AutomaticRetry(1), // TODO @jhchabran flaky stuff are breaking builds
 	}
 
diff --git a/sg.config.yaml b/sg.config.yaml
index b41cb134c04..1548a53b68a 100644
--- a/sg.config.yaml
+++ b/sg.config.yaml
@@ -254,12 +254,12 @@ commands:
         export GCFLAGS='all=-N -l'
       fi
 
-      go build -gcflags="$GCFLAGS" -o .bin/embeddings github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings
+      go build -gcflags="$GCFLAGS" -o .bin/embeddings github.com/sourcegraph/sourcegraph/cmd/embeddings
     checkBinary: .bin/embeddings
     watch:
       - lib
       - internal
-      - enterprise/cmd/embeddings
+      - cmd/embeddings
       - internal/embeddings
   qdrant:
     cmd: |