diff --git a/service/submitqueue/gateway/server/BUILD.bazel b/service/submitqueue/gateway/server/BUILD.bazel index 480f237d..4640041b 100644 --- a/service/submitqueue/gateway/server/BUILD.bazel +++ b/service/submitqueue/gateway/server/BUILD.bazel @@ -25,11 +25,11 @@ go_library( "//platform/extension/messagequeue/mysql:go_default_library", "//service/messagequeue:go_default_library", "//service/submitqueue/gateway/server/mapper:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/extension/queueconfig/yaml:go_default_library", "//submitqueue/gateway/controller:go_default_library", "//submitqueue/gateway/controller/log:go_default_library", + "//submitqueue/gateway/core/request:go_default_library", "//submitqueue/gateway/extension/storage:go_default_library", "//submitqueue/gateway/extension/storage/mysql:go_default_library", "@com_github_go_sql_driver_mysql//:go_default_library", diff --git a/service/submitqueue/gateway/server/main.go b/service/submitqueue/gateway/server/main.go index 9b1a061d..3e0b5f24 100644 --- a/service/submitqueue/gateway/server/main.go +++ b/service/submitqueue/gateway/server/main.go @@ -42,11 +42,11 @@ import ( queueMySQL "github.com/uber/submitqueue/platform/extension/messagequeue/mysql" servicemq "github.com/uber/submitqueue/service/messagequeue" "github.com/uber/submitqueue/service/submitqueue/gateway/server/mapper" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" yamlqueueconfig "github.com/uber/submitqueue/submitqueue/extension/queueconfig/yaml" "github.com/uber/submitqueue/submitqueue/gateway/controller" logctrl "github.com/uber/submitqueue/submitqueue/gateway/controller/log" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" storage "github.com/uber/submitqueue/submitqueue/gateway/extension/storage" mysqlstorage "github.com/uber/submitqueue/submitqueue/gateway/extension/storage/mysql" "go.uber.org/zap" diff --git a/service/submitqueue/orchestrator/server/main.go b/service/submitqueue/orchestrator/server/main.go index 4e941cb5..e46ae407 100644 --- a/service/submitqueue/orchestrator/server/main.go +++ b/service/submitqueue/orchestrator/server/main.go @@ -197,7 +197,9 @@ func run() error { subscriberName = fmt.Sprintf("orchestrator-%d", time.Now().Unix()) } - profiles, err := newProfiles(ctx, logger, scope, changeset.New(storageFty), storageFty, profilesCfg) + profiles, err := newProfiles(ctx, logger, scope, changeset.New(func(queue string) (changeset.Stores, error) { + return storageFty.For(orchstorage.Config{QueueName: queue}) + }), storageFty, profilesCfg) if err != nil { return fmt.Errorf("failed to build profiles: %w", err) } diff --git a/submitqueue/core/changeset/BUILD.bazel b/submitqueue/core/changeset/BUILD.bazel index 86669806..3a73067f 100644 --- a/submitqueue/core/changeset/BUILD.bazel +++ b/submitqueue/core/changeset/BUILD.bazel @@ -11,7 +11,7 @@ go_library( deps = [ "//platform/base/change:go_default_library", "//submitqueue/entity:go_default_library", - "//submitqueue/orchestrator/extension/storage:go_default_library", + "//submitqueue/extension/storage:go_default_library", ], ) @@ -24,7 +24,6 @@ go_test( "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", "//submitqueue/extension/storage/mock:go_default_library", - "//submitqueue/orchestrator/extension/storage/mock:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", "@org_uber_go_mock//gomock:go_default_library", diff --git a/submitqueue/core/changeset/resolver.go b/submitqueue/core/changeset/resolver.go index 25a429ba..0a76a9f8 100644 --- a/submitqueue/core/changeset/resolver.go +++ b/submitqueue/core/changeset/resolver.go @@ -20,25 +20,41 @@ import ( "github.com/uber/submitqueue/platform/base/change" "github.com/uber/submitqueue/submitqueue/entity" - orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" + storage "github.com/uber/submitqueue/submitqueue/extension/storage" ) -// resolver is the store-backed Resolver. It holds the storage factory and -// resolves the batch's queue-scoped request and change stores per call, since -// every resolution is for exactly one batch and the batch names its queue. +// Stores is the slice of a queue-scoped storage aggregate this package needs. +// Declaring it here rather than naming a service's aggregate keeps `core/` +// free of any dependency on a service package; every aggregate that exposes +// these two accessors satisfies it. +type Stores interface { + // GetRequestStore returns the queue's RequestStore. + GetRequestStore() storage.RequestStore + + // GetChangeStore returns the queue's ChangeStore. + GetChangeStore() storage.ChangeStore +} + +// Resolve binds Stores to one queue. The wiring layer supplies it, because +// that is the layer that knows which service's aggregate serves a queue. +type Resolve func(queue string) (Stores, error) + +// resolver is the store-backed Resolver. It resolves the batch's queue-scoped +// request and change stores per call, since every resolution is for exactly +// one batch and the batch names its queue. type resolver struct { - stores orchstorage.Factory + resolve Resolve } -// New returns a Resolver backed by the given storage factory. -func New(stores orchstorage.Factory) Resolver { - return resolver{stores: stores} +// New returns a Resolver that reads through the given per-queue binding. +func New(resolve Resolve) Resolver { + return resolver{resolve: resolve} } // ChangesForBatch resolves a batch's requests to their raw changes, in // batch.Contains order. func (r resolver) ChangesForBatch(ctx context.Context, batch entity.Batch) ([]change.Change, error) { - store, err := r.stores.For(orchstorage.Config{QueueName: batch.Queue}) + store, err := r.resolve(batch.Queue) if err != nil { return nil, fmt.Errorf("failed to resolve storage for queue %q: %w", batch.Queue, err) } @@ -57,7 +73,7 @@ func (r resolver) ChangesForBatch(ctx context.Context, batch entity.Batch) ([]ch // ChangeInfo per claimed URI, owned by the requesting request, aggregated across // the whole batch. func (r resolver) DetailedForBatch(ctx context.Context, batch entity.Batch) (entity.BatchChanges, error) { - store, err := r.stores.For(orchstorage.Config{QueueName: batch.Queue}) + store, err := r.resolve(batch.Queue) if err != nil { return entity.BatchChanges{}, fmt.Errorf("failed to resolve storage for queue %q: %w", batch.Queue, err) } diff --git a/submitqueue/core/changeset/resolver_test.go b/submitqueue/core/changeset/resolver_test.go index 63460020..b2d16701 100644 --- a/submitqueue/core/changeset/resolver_test.go +++ b/submitqueue/core/changeset/resolver_test.go @@ -27,18 +27,24 @@ import ( "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/storage" storagemock "github.com/uber/submitqueue/submitqueue/extension/storage/mock" - orchstoragemock "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage/mock" ) -// newTestResolver builds a Resolver over mock stores exposed through a mock -// storage factory that resolves every queue to the same aggregate. -func newTestResolver(ctrl *gomock.Controller, reqs storage.RequestStore, changes storage.ChangeStore) Resolver { - store := orchstoragemock.NewMockStorage(ctrl) - store.EXPECT().GetRequestStore().Return(reqs).AnyTimes() - store.EXPECT().GetChangeStore().Return(changes).AnyTimes() - f := orchstoragemock.NewMockFactory(ctrl) - f.EXPECT().For(gomock.Any()).Return(store, nil).AnyTimes() - return New(f) +// stubStores is the two-accessor slice of an aggregate this package needs, +// which is all Stores asks for — no service aggregate is involved. +type stubStores struct { + reqs storage.RequestStore + changes storage.ChangeStore +} + +func (s stubStores) GetRequestStore() storage.RequestStore { return s.reqs } + +func (s stubStores) GetChangeStore() storage.ChangeStore { return s.changes } + +// newTestResolver builds a Resolver that binds every queue to the same stores. +func newTestResolver(_ *gomock.Controller, reqs storage.RequestStore, changes storage.ChangeStore) Resolver { + return New(func(string) (Stores, error) { + return stubStores{reqs: reqs, changes: changes}, nil + }) } func req(id string, uris ...string) entity.Request { diff --git a/submitqueue/gateway/controller/BUILD.bazel b/submitqueue/gateway/controller/BUILD.bazel index 26424936..b02fb10a 100644 --- a/submitqueue/gateway/controller/BUILD.bazel +++ b/submitqueue/gateway/controller/BUILD.bazel @@ -21,11 +21,11 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/queueconfig:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/gateway/core/request:go_default_library", "//submitqueue/gateway/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", @@ -55,13 +55,13 @@ go_test( "//platform/extension/counter/mock:go_default_library", "//platform/extension/messagequeue/mock:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/queueconfig:go_default_library", "//submitqueue/extension/queueconfig/mock:go_default_library", "//submitqueue/extension/storage:go_default_library", "//submitqueue/extension/storage/mock:go_default_library", + "//submitqueue/gateway/core/request:go_default_library", "//submitqueue/gateway/extension/storage:go_default_library", "//submitqueue/gateway/extension/storage/mock:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", diff --git a/submitqueue/gateway/controller/cancel.go b/submitqueue/gateway/controller/cancel.go index 6aedad84..f436b09c 100644 --- a/submitqueue/gateway/controller/cancel.go +++ b/submitqueue/gateway/controller/cancel.go @@ -24,10 +24,10 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" basestorage "github.com/uber/submitqueue/submitqueue/extension/storage" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" storage "github.com/uber/submitqueue/submitqueue/gateway/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/gateway/controller/land.go b/submitqueue/gateway/controller/land.go index 61494ece..5a863d02 100644 --- a/submitqueue/gateway/controller/land.go +++ b/submitqueue/gateway/controller/land.go @@ -27,10 +27,10 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/queueconfig" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" storage "github.com/uber/submitqueue/submitqueue/gateway/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/gateway/controller/land_test.go b/submitqueue/gateway/controller/land_test.go index d4c90718..2cf19006 100644 --- a/submitqueue/gateway/controller/land_test.go +++ b/submitqueue/gateway/controller/land_test.go @@ -32,13 +32,13 @@ import ( countermock "github.com/uber/submitqueue/platform/extension/counter/mock" queuemock "github.com/uber/submitqueue/platform/extension/messagequeue/mock" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/queueconfig" qcmock "github.com/uber/submitqueue/submitqueue/extension/queueconfig/mock" basestorage "github.com/uber/submitqueue/submitqueue/extension/storage" storagemock "github.com/uber/submitqueue/submitqueue/extension/storage/mock" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" gwstoragemock "github.com/uber/submitqueue/submitqueue/gateway/extension/storage/mock" "go.uber.org/mock/gomock" "go.uber.org/zap" diff --git a/submitqueue/gateway/controller/log/BUILD.bazel b/submitqueue/gateway/controller/log/BUILD.bazel index b3e8d638..6982ae17 100644 --- a/submitqueue/gateway/controller/log/BUILD.bazel +++ b/submitqueue/gateway/controller/log/BUILD.bazel @@ -10,7 +10,7 @@ go_library( "//platform/consumer:go_default_library", "//platform/metrics:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", + "//submitqueue/gateway/core/request:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", ], @@ -24,10 +24,10 @@ go_test( "//platform/base/messagequeue:go_default_library", "//platform/consumer/mock:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage/mock:go_default_library", + "//submitqueue/gateway/core/request:go_default_library", "//submitqueue/gateway/extension/storage/mock:go_default_library", "@com_github_stretchr_testify//require:go_default_library", "@com_github_uber_go_tally//:go_default_library", diff --git a/submitqueue/gateway/controller/log/log.go b/submitqueue/gateway/controller/log/log.go index 856b182d..d5c87be7 100644 --- a/submitqueue/gateway/controller/log/log.go +++ b/submitqueue/gateway/controller/log/log.go @@ -23,7 +23,7 @@ import ( "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" "go.uber.org/zap" ) diff --git a/submitqueue/gateway/controller/log/log_test.go b/submitqueue/gateway/controller/log/log_test.go index 38e353b0..49b3fcb3 100644 --- a/submitqueue/gateway/controller/log/log_test.go +++ b/submitqueue/gateway/controller/log/log_test.go @@ -24,10 +24,10 @@ import ( entityqueue "github.com/uber/submitqueue/platform/base/messagequeue" consumermock "github.com/uber/submitqueue/platform/consumer/mock" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" storagemock "github.com/uber/submitqueue/submitqueue/extension/storage/mock" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" gwstoragemock "github.com/uber/submitqueue/submitqueue/gateway/extension/storage/mock" "go.uber.org/mock/gomock" "go.uber.org/zap/zaptest" diff --git a/submitqueue/gateway/controller/storage_fixture_test.go b/submitqueue/gateway/controller/storage_fixture_test.go index ca71971e..39d04a2b 100644 --- a/submitqueue/gateway/controller/storage_fixture_test.go +++ b/submitqueue/gateway/controller/storage_fixture_test.go @@ -19,10 +19,10 @@ import ( "fmt" "sync" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/entity" basestorage "github.com/uber/submitqueue/submitqueue/extension/storage" storagemock "github.com/uber/submitqueue/submitqueue/extension/storage/mock" + requestcore "github.com/uber/submitqueue/submitqueue/gateway/core/request" storage "github.com/uber/submitqueue/submitqueue/gateway/extension/storage" gwstoragemock "github.com/uber/submitqueue/submitqueue/gateway/extension/storage/mock" "go.uber.org/mock/gomock" diff --git a/submitqueue/gateway/core/request/BUILD.bazel b/submitqueue/gateway/core/request/BUILD.bazel new file mode 100644 index 00000000..f5b15303 --- /dev/null +++ b/submitqueue/gateway/core/request/BUILD.bazel @@ -0,0 +1,34 @@ +load("@rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = [ + "materializer.go", + "request.go", + ], + importpath = "github.com/uber/submitqueue/submitqueue/gateway/core/request", + visibility = ["//visibility:public"], + deps = [ + "//submitqueue/entity:go_default_library", + "//submitqueue/extension/storage:go_default_library", + "//submitqueue/gateway/extension/storage:go_default_library", + ], +) + +go_test( + name = "go_default_test", + srcs = [ + "materializer_test.go", + "request_test.go", + ], + embed = [":go_default_library"], + deps = [ + "//submitqueue/entity:go_default_library", + "//submitqueue/extension/storage:go_default_library", + "//submitqueue/extension/storage/mock:go_default_library", + "//submitqueue/gateway/extension/storage/mock:go_default_library", + "@com_github_stretchr_testify//assert:go_default_library", + "@com_github_stretchr_testify//require:go_default_library", + "@org_uber_go_mock//gomock:go_default_library", + ], +) diff --git a/submitqueue/core/request/materializer.go b/submitqueue/gateway/core/request/materializer.go similarity index 100% rename from submitqueue/core/request/materializer.go rename to submitqueue/gateway/core/request/materializer.go diff --git a/submitqueue/core/request/materializer_test.go b/submitqueue/gateway/core/request/materializer_test.go similarity index 100% rename from submitqueue/core/request/materializer_test.go rename to submitqueue/gateway/core/request/materializer_test.go diff --git a/submitqueue/core/request/request.go b/submitqueue/gateway/core/request/request.go similarity index 100% rename from submitqueue/core/request/request.go rename to submitqueue/gateway/core/request/request.go diff --git a/submitqueue/core/request/request_test.go b/submitqueue/gateway/core/request/request_test.go similarity index 100% rename from submitqueue/core/request/request_test.go rename to submitqueue/gateway/core/request/request_test.go diff --git a/submitqueue/orchestrator/controller/batch/BUILD.bazel b/submitqueue/orchestrator/controller/batch/BUILD.bazel index ad665c22..a3decc51 100644 --- a/submitqueue/orchestrator/controller/batch/BUILD.bazel +++ b/submitqueue/orchestrator/controller/batch/BUILD.bazel @@ -12,9 +12,9 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/batch/batch.go b/submitqueue/orchestrator/controller/batch/batch.go index 1613c214..9e1a6b31 100644 --- a/submitqueue/orchestrator/controller/batch/batch.go +++ b/submitqueue/orchestrator/controller/batch/batch.go @@ -27,9 +27,9 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel b/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel index 50fda430..8815a124 100644 --- a/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel +++ b/submitqueue/orchestrator/controller/buildsignal/BUILD.bazel @@ -11,11 +11,11 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/buildrunner:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/buildsignal/buildsignal.go b/submitqueue/orchestrator/controller/buildsignal/buildsignal.go index 89fee0ae..0cb66594 100644 --- a/submitqueue/orchestrator/controller/buildsignal/buildsignal.go +++ b/submitqueue/orchestrator/controller/buildsignal/buildsignal.go @@ -51,11 +51,11 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/buildrunner" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/cancel/BUILD.bazel b/submitqueue/orchestrator/controller/cancel/BUILD.bazel index 98701cf5..6debfe07 100644 --- a/submitqueue/orchestrator/controller/cancel/BUILD.bazel +++ b/submitqueue/orchestrator/controller/cancel/BUILD.bazel @@ -10,12 +10,12 @@ go_library( "//platform/consumer:go_default_library", "//platform/metrics:go_default_library", "//platform/publish:go_default_library", - "//submitqueue/core/batch:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/batch:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/cancel/cancel.go b/submitqueue/orchestrator/controller/cancel/cancel.go index 1c989765..35ce9417 100644 --- a/submitqueue/orchestrator/controller/cancel/cancel.go +++ b/submitqueue/orchestrator/controller/cancel/cancel.go @@ -59,12 +59,12 @@ import ( "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/conclude/BUILD.bazel b/submitqueue/orchestrator/controller/conclude/BUILD.bazel index 29f02488..dffa02c5 100644 --- a/submitqueue/orchestrator/controller/conclude/BUILD.bazel +++ b/submitqueue/orchestrator/controller/conclude/BUILD.bazel @@ -10,10 +10,10 @@ go_library( "//platform/consumer:go_default_library", "//platform/metrics:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/conclude/conclude.go b/submitqueue/orchestrator/controller/conclude/conclude.go index 07bb5616..62dea9b3 100644 --- a/submitqueue/orchestrator/controller/conclude/conclude.go +++ b/submitqueue/orchestrator/controller/conclude/conclude.go @@ -23,10 +23,10 @@ import ( "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/dependencyanalysis/BUILD.bazel b/submitqueue/orchestrator/controller/dependencyanalysis/BUILD.bazel index be0b1a53..015b796c 100644 --- a/submitqueue/orchestrator/controller/dependencyanalysis/BUILD.bazel +++ b/submitqueue/orchestrator/controller/dependencyanalysis/BUILD.bazel @@ -10,13 +10,13 @@ go_library( "//platform/consumer:go_default_library", "//platform/metrics:go_default_library", "//platform/publish:go_default_library", - "//submitqueue/core/batch:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/conflict:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/batch:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/dependencyanalysis/dependencyanalysis.go b/submitqueue/orchestrator/controller/dependencyanalysis/dependencyanalysis.go index c168239d..9d84b4ad 100644 --- a/submitqueue/orchestrator/controller/dependencyanalysis/dependencyanalysis.go +++ b/submitqueue/orchestrator/controller/dependencyanalysis/dependencyanalysis.go @@ -58,13 +58,13 @@ import ( "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/conflict" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/dlq/BUILD.bazel b/submitqueue/orchestrator/controller/dlq/BUILD.bazel index 4859a31b..68374f9a 100644 --- a/submitqueue/orchestrator/controller/dlq/BUILD.bazel +++ b/submitqueue/orchestrator/controller/dlq/BUILD.bazel @@ -20,12 +20,12 @@ go_library( "//platform/consumer:go_default_library", "//platform/metrics:go_default_library", "//platform/publish:go_default_library", - "//submitqueue/core/batch:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/batch:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/dlq/dlq.go b/submitqueue/orchestrator/controller/dlq/dlq.go index 34e95980..31c0f782 100644 --- a/submitqueue/orchestrator/controller/dlq/dlq.go +++ b/submitqueue/orchestrator/controller/dlq/dlq.go @@ -42,10 +42,10 @@ import ( orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "github.com/uber/submitqueue/platform/consumer" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" - requestcore "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" + requestcore "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/dlq/request.go b/submitqueue/orchestrator/controller/dlq/request.go index d266fb48..2761bec1 100644 --- a/submitqueue/orchestrator/controller/dlq/request.go +++ b/submitqueue/orchestrator/controller/dlq/request.go @@ -25,10 +25,10 @@ import ( entityqueue "github.com/uber/submitqueue/platform/base/messagequeue" "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/dlq/speculate.go b/submitqueue/orchestrator/controller/dlq/speculate.go index e0f570a4..c6f85c10 100644 --- a/submitqueue/orchestrator/controller/dlq/speculate.go +++ b/submitqueue/orchestrator/controller/dlq/speculate.go @@ -25,10 +25,10 @@ import ( "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/land/BUILD.bazel b/submitqueue/orchestrator/controller/land/BUILD.bazel index e283781d..480145ba 100644 --- a/submitqueue/orchestrator/controller/land/BUILD.bazel +++ b/submitqueue/orchestrator/controller/land/BUILD.bazel @@ -15,8 +15,8 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/entity:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/land/land.go b/submitqueue/orchestrator/controller/land/land.go index 9915242b..6de5240b 100644 --- a/submitqueue/orchestrator/controller/land/land.go +++ b/submitqueue/orchestrator/controller/land/land.go @@ -37,8 +37,8 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/entity" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" ) diff --git a/submitqueue/orchestrator/controller/landconflictsignal/BUILD.bazel b/submitqueue/orchestrator/controller/landconflictsignal/BUILD.bazel index 164073be..21959708 100644 --- a/submitqueue/orchestrator/controller/landconflictsignal/BUILD.bazel +++ b/submitqueue/orchestrator/controller/landconflictsignal/BUILD.bazel @@ -13,9 +13,9 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/landconflictsignal/landconflictsignal.go b/submitqueue/orchestrator/controller/landconflictsignal/landconflictsignal.go index 22106f2f..5a2b59e6 100644 --- a/submitqueue/orchestrator/controller/landconflictsignal/landconflictsignal.go +++ b/submitqueue/orchestrator/controller/landconflictsignal/landconflictsignal.go @@ -31,9 +31,9 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/landsignal/BUILD.bazel b/submitqueue/orchestrator/controller/landsignal/BUILD.bazel index a0612baa..47c734b6 100644 --- a/submitqueue/orchestrator/controller/landsignal/BUILD.bazel +++ b/submitqueue/orchestrator/controller/landsignal/BUILD.bazel @@ -12,10 +12,10 @@ go_library( "//platform/consumer:go_default_library", "//platform/metrics:go_default_library", "//platform/publish:go_default_library", - "//submitqueue/core/batch:go_default_library", "//submitqueue/core/messagequeue:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", + "//submitqueue/orchestrator/core/batch:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/landsignal/landsignal.go b/submitqueue/orchestrator/controller/landsignal/landsignal.go index f61934de..1178da3d 100644 --- a/submitqueue/orchestrator/controller/landsignal/landsignal.go +++ b/submitqueue/orchestrator/controller/landsignal/landsignal.go @@ -32,10 +32,10 @@ import ( "github.com/uber/submitqueue/platform/consumer" "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/speculate/BUILD.bazel b/submitqueue/orchestrator/controller/speculate/BUILD.bazel index e60b0047..fce55d08 100644 --- a/submitqueue/orchestrator/controller/speculate/BUILD.bazel +++ b/submitqueue/orchestrator/controller/speculate/BUILD.bazel @@ -22,13 +22,13 @@ go_library( "//platform/errs:go_default_library", "//platform/metrics:go_default_library", "//platform/publish:go_default_library", - "//submitqueue/core/batch:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/speculation/speculator:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/batch:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/speculate/finalize.go b/submitqueue/orchestrator/controller/speculate/finalize.go index b160c040..420acd7f 100644 --- a/submitqueue/orchestrator/controller/speculate/finalize.go +++ b/submitqueue/orchestrator/controller/speculate/finalize.go @@ -22,11 +22,11 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" ) diff --git a/submitqueue/orchestrator/controller/speculate/run.go b/submitqueue/orchestrator/controller/speculate/run.go index 33ec469f..c1e4ee99 100644 --- a/submitqueue/orchestrator/controller/speculate/run.go +++ b/submitqueue/orchestrator/controller/speculate/run.go @@ -22,10 +22,10 @@ import ( "slices" "github.com/uber/submitqueue/platform/metrics" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/speculation/speculator" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" ) diff --git a/submitqueue/orchestrator/controller/speculate/speculate.go b/submitqueue/orchestrator/controller/speculate/speculate.go index 053a885d..d8689ea3 100644 --- a/submitqueue/orchestrator/controller/speculate/speculate.go +++ b/submitqueue/orchestrator/controller/speculate/speculate.go @@ -25,12 +25,12 @@ import ( "github.com/uber/submitqueue/platform/errs" "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/speculation/speculator" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/start/BUILD.bazel b/submitqueue/orchestrator/controller/start/BUILD.bazel index 5ad55612..8b11ecc9 100644 --- a/submitqueue/orchestrator/controller/start/BUILD.bazel +++ b/submitqueue/orchestrator/controller/start/BUILD.bazel @@ -11,10 +11,10 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/start/start.go b/submitqueue/orchestrator/controller/start/start.go index ac1a22b0..3a17867f 100644 --- a/submitqueue/orchestrator/controller/start/start.go +++ b/submitqueue/orchestrator/controller/start/start.go @@ -25,10 +25,10 @@ import ( "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" storage "github.com/uber/submitqueue/submitqueue/extension/storage" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/orchestrator/controller/validate/BUILD.bazel b/submitqueue/orchestrator/controller/validate/BUILD.bazel index cfa3fe73..b2056a66 100644 --- a/submitqueue/orchestrator/controller/validate/BUILD.bazel +++ b/submitqueue/orchestrator/controller/validate/BUILD.bazel @@ -15,11 +15,11 @@ go_library( "//platform/metrics:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/messagequeue:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/changeprovider:go_default_library", "//submitqueue/extension/storage:go_default_library", "//submitqueue/extension/validator:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", "@com_github_uber_go_tally//:go_default_library", "@org_uber_go_zap//:go_default_library", diff --git a/submitqueue/orchestrator/controller/validate/validate.go b/submitqueue/orchestrator/controller/validate/validate.go index 657f1c5c..caff1621 100644 --- a/submitqueue/orchestrator/controller/validate/validate.go +++ b/submitqueue/orchestrator/controller/validate/validate.go @@ -30,11 +30,11 @@ import ( coremetrics "github.com/uber/submitqueue/platform/metrics" "github.com/uber/submitqueue/platform/publish" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/changeprovider" storage "github.com/uber/submitqueue/submitqueue/extension/storage" "github.com/uber/submitqueue/submitqueue/extension/validator" + corerequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" orchstorage "github.com/uber/submitqueue/submitqueue/orchestrator/extension/storage" "go.uber.org/zap" ) diff --git a/submitqueue/core/batch/BUILD.bazel b/submitqueue/orchestrator/core/batch/BUILD.bazel similarity index 93% rename from submitqueue/core/batch/BUILD.bazel rename to submitqueue/orchestrator/core/batch/BUILD.bazel index 928e86a1..96c8699e 100644 --- a/submitqueue/core/batch/BUILD.bazel +++ b/submitqueue/orchestrator/core/batch/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "list.go", "transition.go", ], - importpath = "github.com/uber/submitqueue/submitqueue/core/batch", + importpath = "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch", visibility = ["//visibility:public"], deps = [ "//submitqueue/entity:go_default_library", diff --git a/submitqueue/core/batch/find.go b/submitqueue/orchestrator/core/batch/find.go similarity index 100% rename from submitqueue/core/batch/find.go rename to submitqueue/orchestrator/core/batch/find.go diff --git a/submitqueue/core/batch/find_test.go b/submitqueue/orchestrator/core/batch/find_test.go similarity index 100% rename from submitqueue/core/batch/find_test.go rename to submitqueue/orchestrator/core/batch/find_test.go diff --git a/submitqueue/core/batch/list.go b/submitqueue/orchestrator/core/batch/list.go similarity index 100% rename from submitqueue/core/batch/list.go rename to submitqueue/orchestrator/core/batch/list.go diff --git a/submitqueue/core/batch/list_test.go b/submitqueue/orchestrator/core/batch/list_test.go similarity index 100% rename from submitqueue/core/batch/list_test.go rename to submitqueue/orchestrator/core/batch/list_test.go diff --git a/submitqueue/core/batch/transition.go b/submitqueue/orchestrator/core/batch/transition.go similarity index 100% rename from submitqueue/core/batch/transition.go rename to submitqueue/orchestrator/core/batch/transition.go diff --git a/submitqueue/core/batch/transition_test.go b/submitqueue/orchestrator/core/batch/transition_test.go similarity index 100% rename from submitqueue/core/batch/transition_test.go rename to submitqueue/orchestrator/core/batch/transition_test.go diff --git a/submitqueue/core/request/BUILD.bazel b/submitqueue/orchestrator/core/request/BUILD.bazel similarity index 82% rename from submitqueue/core/request/BUILD.bazel rename to submitqueue/orchestrator/core/request/BUILD.bazel index 10c793d3..ae3aa7e0 100644 --- a/submitqueue/core/request/BUILD.bazel +++ b/submitqueue/orchestrator/core/request/BUILD.bazel @@ -4,11 +4,9 @@ go_library( name = "go_default_library", srcs = [ "log.go", - "materializer.go", - "request.go", "terminate.go", ], - importpath = "github.com/uber/submitqueue/submitqueue/core/request", + importpath = "github.com/uber/submitqueue/submitqueue/orchestrator/core/request", visibility = ["//visibility:public"], deps = [ "//platform/consumer:go_default_library", @@ -17,7 +15,6 @@ go_library( "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", - "//submitqueue/gateway/extension/storage:go_default_library", "//submitqueue/orchestrator/extension/storage:go_default_library", ], ) @@ -26,8 +23,6 @@ go_test( name = "go_default_test", srcs = [ "log_test.go", - "materializer_test.go", - "request_test.go", "terminate_test.go", ], embed = [":go_default_library"], @@ -40,7 +35,6 @@ go_test( "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", "//submitqueue/extension/storage/mock:go_default_library", - "//submitqueue/gateway/extension/storage/mock:go_default_library", "//submitqueue/orchestrator/extension/storage/mock:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", diff --git a/submitqueue/core/request/log.go b/submitqueue/orchestrator/core/request/log.go similarity index 100% rename from submitqueue/core/request/log.go rename to submitqueue/orchestrator/core/request/log.go diff --git a/submitqueue/core/request/log_test.go b/submitqueue/orchestrator/core/request/log_test.go similarity index 100% rename from submitqueue/core/request/log_test.go rename to submitqueue/orchestrator/core/request/log_test.go diff --git a/submitqueue/core/request/terminate.go b/submitqueue/orchestrator/core/request/terminate.go similarity index 100% rename from submitqueue/core/request/terminate.go rename to submitqueue/orchestrator/core/request/terminate.go diff --git a/submitqueue/core/request/terminate_test.go b/submitqueue/orchestrator/core/request/terminate_test.go similarity index 100% rename from submitqueue/core/request/terminate_test.go rename to submitqueue/orchestrator/core/request/terminate_test.go diff --git a/test/e2e/submitqueue/BUILD.bazel b/test/e2e/submitqueue/BUILD.bazel index 6ff69928..c2ea850c 100644 --- a/test/e2e/submitqueue/BUILD.bazel +++ b/test/e2e/submitqueue/BUILD.bazel @@ -46,11 +46,11 @@ go_test( "//platform/extension/messagequeue/mysql:go_default_library", "//platform/git/exectest:go_default_library", "//platform/publish:go_default_library", - "//submitqueue/core/batch:go_default_library", "//submitqueue/core/messagequeue:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/storage:go_default_library", + "//submitqueue/orchestrator/core/batch:go_default_library", "//submitqueue/orchestrator/extension/storage/mysql:go_default_library", "//test/testutil:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", diff --git a/test/e2e/submitqueue/harness_test.go b/test/e2e/submitqueue/harness_test.go index 9288e1f4..d92badf1 100644 --- a/test/e2e/submitqueue/harness_test.go +++ b/test/e2e/submitqueue/harness_test.go @@ -40,11 +40,11 @@ import ( "github.com/uber/submitqueue/platform/extension/consumergate" queuemysql "github.com/uber/submitqueue/platform/extension/messagequeue/mysql" "github.com/uber/submitqueue/platform/publish" - corebatch "github.com/uber/submitqueue/submitqueue/core/batch" sqmq "github.com/uber/submitqueue/submitqueue/core/messagequeue" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" - "github.com/uber/submitqueue/submitqueue/extension/storage" + basestorage "github.com/uber/submitqueue/submitqueue/extension/storage" + corebatch "github.com/uber/submitqueue/submitqueue/orchestrator/core/batch" "go.uber.org/zap" ) @@ -338,7 +338,7 @@ func (s *E2EIntegrationSuite) seedPassedPath(queue string, path entity.Speculati pathSets := store.GetSpeculationPathSetStore() set, err := pathSets.Get(s.ctx, path.Head) - if storage.IsNotFound(err) { + if basestorage.IsNotFound(err) { set = entity.SpeculationPathSet{Queue: queue, Head: path.Head} } else { require.NoError(t, err, "failed to read path set for %s", path.Head) diff --git a/test/integration/submitqueue/gateway/BUILD.bazel b/test/integration/submitqueue/gateway/BUILD.bazel index 534c739e..678fbc23 100644 --- a/test/integration/submitqueue/gateway/BUILD.bazel +++ b/test/integration/submitqueue/gateway/BUILD.bazel @@ -21,11 +21,12 @@ go_test( "//platform/base/messagequeue:go_default_library", "//platform/consumer:go_default_library", "//platform/extension/messagequeue/mysql:go_default_library", - "//submitqueue/core/request:go_default_library", "//submitqueue/core/topickey:go_default_library", "//submitqueue/entity:go_default_library", + "//submitqueue/gateway/core/request:go_default_library", "//submitqueue/gateway/extension/storage:go_default_library", "//submitqueue/gateway/extension/storage/mysql:go_default_library", + "//submitqueue/orchestrator/core/request:go_default_library", "//test/testutil:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", diff --git a/test/integration/submitqueue/gateway/suite_test.go b/test/integration/submitqueue/gateway/suite_test.go index 279958b6..a59c6fbf 100644 --- a/test/integration/submitqueue/gateway/suite_test.go +++ b/test/integration/submitqueue/gateway/suite_test.go @@ -41,11 +41,12 @@ import ( entityqueue "github.com/uber/submitqueue/platform/base/messagequeue" "github.com/uber/submitqueue/platform/consumer" queueMySQL "github.com/uber/submitqueue/platform/extension/messagequeue/mysql" - corerequest "github.com/uber/submitqueue/submitqueue/core/request" "github.com/uber/submitqueue/submitqueue/core/topickey" "github.com/uber/submitqueue/submitqueue/entity" + corerequest "github.com/uber/submitqueue/submitqueue/gateway/core/request" "github.com/uber/submitqueue/submitqueue/gateway/extension/storage" mysqlstorage "github.com/uber/submitqueue/submitqueue/gateway/extension/storage/mysql" + orchrequest "github.com/uber/submitqueue/submitqueue/orchestrator/core/request" "github.com/uber/submitqueue/test/testutil" "go.uber.org/zap" "google.golang.org/grpc" @@ -253,7 +254,7 @@ func (s *GatewayIntegrationSuite) TestReadAPIErrorCodes() { // TestRequestLogConsumer verifies the gateway's log-topic consumer in isolation: // no orchestrator runs in this stack, so the test itself publishes a request log // entry to the log topic exactly as the orchestrator does in production (via -// submitqueue/core/request.PublishLog). The gateway is the sole writer of the +// submitqueue/orchestrator/core/request.PublishLog). The gateway is the sole writer of the // request log; this asserts its consumer drains the log topic and persists the // entry to storage, observable through the request-summary RPC. func (s *GatewayIntegrationSuite) TestRequestLogConsumer() { @@ -288,7 +289,7 @@ func (s *GatewayIntegrationSuite) TestRequestLogConsumer() { } require.NoError(t, logQueueStore.GetRequestSummaryStore().Create(s.ctx, summary)) logEntry := entity.NewRequestStatusLog(logQueue, sqid, entity.RequestStatusStarted, 1, "", nil) - require.NoError(t, corerequest.PublishLog(entityqueue.WithQueueName(s.ctx, logQueue), registry, logEntry, sqid, ""), + require.NoError(t, orchrequest.PublishLog(entityqueue.WithQueueName(s.ctx, logQueue), registry, logEntry, sqid, ""), "failed to publish request log to log topic") s.log.Logf("Published 'started' log for sqid=%s; waiting for gateway consumer to persist it", sqid)