Move worker out of enterprise and combine main entrypoints (#57302)

We're not doing the enterprise split anymore, so merging the two worker cmds.
This commit is contained in:
Erik Seliger 2023-10-03 14:53:04 +02:00 committed by GitHub
parent 253b3c141d
commit 05faad04fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
142 changed files with 241 additions and 406 deletions

View File

@ -96,13 +96,13 @@
/cmd/repo-updater/internal/authz/**/* @unknwon
/enterprise/cmd/worker/**/* @efritz
/cmd/worker/**/* @efritz
/enterprise/cmd/worker/internal/batches/**/* @eseliger
/cmd/worker/internal/batches/**/* @eseliger
/enterprise/cmd/worker/internal/executorqueue/**/* @efritz @eseliger
/cmd/worker/internal/executorqueue/**/* @efritz @eseliger
/enterprise/cmd/worker/internal/executors/**/* @efritz
/cmd/worker/internal/executors/**/* @efritz
/enterprise/dev/ci/**/* @bobheadxi

View File

@ -243,7 +243,7 @@ go_library(
"//cmd/frontend/hubspot/hubspotutil",
"//cmd/frontend/internal/processrestart",
"//cmd/frontend/internal/search/logs",
"//enterprise/cmd/worker/shared/sourcegraphoperator",
"//cmd/worker/shared/sourcegraphoperator",
"//internal/actor",
"//internal/adminanalytics",
"//internal/api",

View File

@ -8,7 +8,7 @@ import (
"github.com/graph-gophers/graphql-go"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/authz/permssync"

View File

@ -15,7 +15,7 @@ go_library(
"//cmd/frontend/auth",
"//cmd/frontend/external/session",
"//cmd/frontend/internal/auth/openidconnect",
"//enterprise/cmd/worker/shared/sourcegraphoperator",
"//cmd/worker/shared/sourcegraphoperator",
"//internal/actor",
"//internal/auth",
"//internal/auth/providers",
@ -47,7 +47,7 @@ go_test(
"//cmd/frontend/auth",
"//cmd/frontend/external/session",
"//cmd/frontend/internal/auth/openidconnect",
"//enterprise/cmd/worker/shared/sourcegraphoperator",
"//cmd/worker/shared/sourcegraphoperator",
"//internal/actor",
"//internal/auth",
"//internal/auth/providers",

View File

@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/auth/providers"
"github.com/sourcegraph/sourcegraph/internal/database"

View File

@ -11,7 +11,7 @@ import (
"github.com/sourcegraph/log/logtest"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/auth/providers"

View File

@ -6,7 +6,7 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect"
osssourcegraphoperator "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
osssourcegraphoperator "github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/auth/providers"
"github.com/sourcegraph/sourcegraph/internal/cloud"

View File

@ -11,7 +11,7 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/frontend/auth"
"github.com/sourcegraph/sourcegraph/cmd/frontend/external/session"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/actor"
internalauth "github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/auth/providers"

View File

@ -98,7 +98,7 @@ DEPS = [
"//enterprise/cmd/migrator",
"//cmd/repo-updater",
"//enterprise/cmd/symbols",
"//enterprise/cmd/worker",
"//cmd/worker",
]
ZOEKT_DEPS = [

View File

@ -14,9 +14,9 @@ go_library(
"//cmd/repo-updater/shared",
"//cmd/searcher/shared",
"//cmd/sourcegraph/osscmd",
"//cmd/worker/shared",
"//enterprise/cmd/embeddings/shared",
"//enterprise/cmd/symbols/shared",
"//enterprise/cmd/worker/shared",
"//internal/sanitycheck",
"//internal/service",
"//internal/service/localcodehost",

View File

@ -16,9 +16,9 @@ import (
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"
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"
worker_shared "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared"
"github.com/sourcegraph/sourcegraph/ui/assets"
_ "github.com/sourcegraph/sourcegraph/ui/assets/enterprise" // Select enterprise assets

View File

@ -1,7 +1,8 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@container_structure_test//:defs.bzl", "container_structure_test")
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("//dev:oci_defs.bzl", "image_repository")
go_library(
name = "worker_lib",
@ -59,3 +60,9 @@ container_structure_test(
"requires-network",
],
)
oci_push(
name = "candidate_push",
image = ":image",
repository = image_repository("worker"),
)

View File

@ -4,12 +4,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "auth",
srcs = ["sourcegraph_operator_cleaner.go"],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/auth",
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/auth",
visibility = ["//visibility:public"],
deps = [
"//cmd/worker/job",
"//cmd/worker/shared/init/db",
"//enterprise/cmd/worker/shared/sourcegraphoperator",
"//cmd/worker/shared/sourcegraphoperator",
"//internal/actor",
"//internal/auth",
"//internal/cloud",
@ -33,7 +33,7 @@ go_test(
"requires-network",
],
deps = [
"//enterprise/cmd/worker/shared/sourcegraphoperator",
"//cmd/worker/shared/sourcegraphoperator",
"//internal/auth",
"//internal/cloud",
"//internal/database",

View File

@ -8,7 +8,7 @@ import (
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/cloud"

View File

@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/exp/slices"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/sourcegraphoperator"
"github.com/sourcegraph/sourcegraph/internal/auth"
"github.com/sourcegraph/sourcegraph/internal/cloud"
"github.com/sourcegraph/sourcegraph/internal/database"

View File

@ -11,14 +11,14 @@ go_library(
"scheduler_job.go",
"workspace_resolver_job.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/internal/batches/janitor",
"//cmd/worker/internal/batches/workers",
"//cmd/worker/internal/executorqueue",
"//cmd/worker/job",
"//cmd/worker/shared/init/db",
"//enterprise/cmd/worker/internal/batches/janitor",
"//enterprise/cmd/worker/internal/batches/workers",
"//enterprise/cmd/worker/internal/executorqueue",
"//internal/actor",
"//internal/batches/scheduler",
"//internal/batches/sources",

View File

@ -3,8 +3,8 @@ package batches
import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches/workers"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches/workers"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/batches/sources"
"github.com/sourcegraph/sourcegraph/internal/env"

View File

@ -9,8 +9,8 @@ go_library(
"resetters.go",
"spec_expire.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches/janitor",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches/janitor",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//internal/batches/store",
"//internal/batches/types",

View File

@ -1,7 +1,7 @@
package batches
import (
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/internal/env"
"github.com/sourcegraph/sourcegraph/lib/errors"
)

View File

@ -3,9 +3,9 @@ package batches
import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches/janitor"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches/janitor"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/env"
"github.com/sourcegraph/sourcegraph/internal/goroutine"

View File

@ -3,8 +3,8 @@ package batches
import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches/workers"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches/workers"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/batches/sources"
"github.com/sourcegraph/sourcegraph/internal/env"

View File

@ -9,8 +9,8 @@ go_library(
"bulk_processor_worker.go",
"reconciler_worker.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches/workers",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches/workers",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//internal/actor",
"//internal/api",

View File

@ -3,8 +3,8 @@ package batches
import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches/workers"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches/workers"
"github.com/sourcegraph/sourcegraph/internal/actor"
"github.com/sourcegraph/sourcegraph/internal/env"
"github.com/sourcegraph/sourcegraph/internal/goroutine"

View File

@ -18,13 +18,13 @@ go_library(
"uploads_expirer.go",
"uploads_janitor.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/codeintel",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/codeintel",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/internal/executorqueue",
"//cmd/worker/job",
"//cmd/worker/shared/init/codeintel",
"//cmd/worker/shared/init/db",
"//enterprise/cmd/worker/internal/executorqueue",
"//internal/codeintel/autoindexing",
"//internal/codeintel/dependencies",
"//internal/codeintel/policies",

View File

@ -3,9 +3,9 @@ package codeintel
import (
"context"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
"github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/codeintel"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executorqueue"
workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db"
"github.com/sourcegraph/sourcegraph/internal/codeintel/autoindexing"

View File

@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "codemonitors",
srcs = ["codemonitor_job.go"],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/codemonitors",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/codemonitors",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/job",
"//cmd/worker/shared/init/db",

View File

@ -10,8 +10,8 @@ go_library(
"scheduler.go",
"worker.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/embeddings/repo",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/embeddings/repo",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/searcher/diff",
"//cmd/worker/job",

View File

@ -3,13 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "executormultiqueue",
srcs = ["multiqueue_metrics_reporter.go"],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executormultiqueue",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/executormultiqueue",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/internal/batches",
"//cmd/worker/internal/executorqueue",
"//cmd/worker/job",
"//cmd/worker/shared/init/db",
"//enterprise/cmd/worker/internal/batches",
"//enterprise/cmd/worker/internal/executorqueue",
"//internal/codeintel/autoindexing",
"//internal/env",
"//internal/executor/types",

View File

@ -3,10 +3,10 @@ package executormultiqueue
import (
"context"
dbstore "github.com/sourcegraph/sourcegraph/cmd/worker/internal/batches"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db"
dbstore "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/batches"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executorqueue"
"github.com/sourcegraph/sourcegraph/internal/codeintel/autoindexing"
"github.com/sourcegraph/sourcegraph/internal/env"
executortypes "github.com/sourcegraph/sourcegraph/internal/executor/types"

View File

@ -12,8 +12,8 @@ go_library(
"queue_allocation.go",
"reporter.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executorqueue",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/executorqueue",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//internal/codeintel/uploads/shared",
"//internal/env",

View File

@ -10,8 +10,8 @@ go_library(
"metricsserver_job.go",
"multiqueue_cache_cleaner.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/executors",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/executors",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/job",
"//cmd/worker/shared/init/db",

View File

@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "githubapps",
srcs = ["job.go"],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/githubapps",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/githubapps",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/internal/githubapps/worker",
"//cmd/worker/job",
"//cmd/worker/shared/init/db",
"//enterprise/cmd/worker/internal/githubapps/worker",
"//internal/env",
"//internal/goroutine",
"//internal/observation",

View File

@ -6,9 +6,9 @@ import (
"github.com/sourcegraph/log"
"github.com/sourcegraph/sourcegraph/cmd/worker/internal/githubapps/worker"
"github.com/sourcegraph/sourcegraph/cmd/worker/job"
workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db"
"github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/githubapps/worker"
"github.com/sourcegraph/sourcegraph/internal/env"
"github.com/sourcegraph/sourcegraph/internal/goroutine"
"github.com/sourcegraph/sourcegraph/internal/observation"

View File

@ -4,8 +4,8 @@ load("//dev:go_defs.bzl", "go_test")
go_library(
name = "worker",
srcs = ["installation_backfill.go"],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/githubapps/worker",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/githubapps/worker",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//internal/database",
"//internal/extsvc/github",

View File

@ -7,8 +7,8 @@ go_library(
"job.go",
"query_runner_job.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/insights",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/insights",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/job",
"//cmd/worker/shared/init/db",

View File

@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "own",
srcs = ["job.go"],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/own",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/own",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/worker/job",
"//cmd/worker/shared/init/db",

View File

@ -9,8 +9,8 @@ go_library(
"perms_syncer_cleaner.go",
"perms_syncer_scheduler.go",
],
importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/internal/permissions",
visibility = ["//enterprise/cmd/worker:__subpackages__"],
importpath = "github.com/sourcegraph/sourcegraph/cmd/worker/internal/permissions",
visibility = ["//cmd/worker:__subpackages__"],
deps = [
"//cmd/frontend/globals",
"//cmd/worker/job",

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