From d6ecbf84e94a690aa34f653e6a554286a31d2eb7 Mon Sep 17 00:00:00 2001 From: Preetam Dwivedi Date: Tue, 16 Jun 2026 23:58:33 -0700 Subject: [PATCH] refactor(proto): move protos to top-level api/ tree by domain/service Relocate each service's proto/ and protopb/ dirs under api/{domain}/{service}/, updating go_package, Bazel importpaths, gazelle resolve hints, consumer deps, and all Go imports to .../api/{domain}/{service}/protopb. Generalize the tool/proto codegen rule and the `make proto` copy loop to support multiple .proto files per service package, so messagequeue payload contracts can later be added alongside each service's RPC contract under the same api/{domain}/{service}/proto dir. Co-authored-by: Cursor --- BUILD.bazel | 8 +- CLAUDE.md | 31 ++++--- Makefile | 16 ++-- .../stovepipe}/gateway/proto/BUILD.bazel | 6 +- .../stovepipe}/gateway/proto/gateway.proto | 2 +- .../stovepipe}/gateway/protopb/BUILD.bazel | 2 +- .../stovepipe}/gateway/protopb/gateway.pb.go | 4 +- .../gateway/protopb/gateway.pb.yarpc.go | 32 ++++---- .../gateway/protopb/gateway_grpc.pb.go | 0 .../stovepipe}/orchestrator/proto/BUILD.bazel | 6 +- .../orchestrator/proto/orchestrator.proto | 2 +- .../orchestrator/protopb/BUILD.bazel | 2 +- .../orchestrator/protopb/orchestrator.pb.go | 4 +- .../protopb/orchestrator.pb.yarpc.go | 35 ++++---- .../protopb/orchestrator_grpc.pb.go | 0 .../submitqueue}/gateway/proto/BUILD.bazel | 6 +- .../submitqueue}/gateway/proto/gateway.proto | 2 +- .../submitqueue}/gateway/protopb/BUILD.bazel | 2 +- .../gateway/protopb/gateway.pb.go | 4 +- .../gateway/protopb/gateway.pb.yarpc.go | 81 ++++++++++--------- .../gateway/protopb/gateway_grpc.pb.go | 0 .../orchestrator/proto/BUILD.bazel | 6 +- .../orchestrator/proto/orchestrator.proto | 2 +- .../orchestrator/protopb/BUILD.bazel | 2 +- .../orchestrator/protopb/orchestrator.pb.go | 4 +- .../protopb/orchestrator.pb.yarpc.go | 32 ++++---- .../protopb/orchestrator_grpc.pb.go | 0 example/README.md | 8 +- example/stovepipe/gateway/client/BUILD.bazel | 2 +- example/stovepipe/gateway/client/main.go | 2 +- example/stovepipe/gateway/server/BUILD.bazel | 2 +- example/stovepipe/gateway/server/main.go | 2 +- .../stovepipe/orchestrator/client/BUILD.bazel | 2 +- example/stovepipe/orchestrator/client/main.go | 2 +- .../stovepipe/orchestrator/server/BUILD.bazel | 2 +- example/stovepipe/orchestrator/server/main.go | 2 +- .../submitqueue/gateway/client/BUILD.bazel | 2 +- example/submitqueue/gateway/client/main.go | 2 +- .../submitqueue/gateway/server/BUILD.bazel | 2 +- example/submitqueue/gateway/server/main.go | 2 +- .../orchestrator/client/BUILD.bazel | 2 +- .../submitqueue/orchestrator/client/main.go | 2 +- .../orchestrator/server/BUILD.bazel | 2 +- .../submitqueue/orchestrator/server/main.go | 2 +- stovepipe/gateway/controller/BUILD.bazel | 4 +- stovepipe/gateway/controller/ping.go | 2 +- stovepipe/gateway/controller/ping_test.go | 2 +- stovepipe/orchestrator/controller/BUILD.bazel | 4 +- stovepipe/orchestrator/controller/ping.go | 2 +- .../orchestrator/controller/ping_test.go | 2 +- submitqueue/gateway/controller/BUILD.bazel | 4 +- submitqueue/gateway/controller/cancel.go | 2 +- submitqueue/gateway/controller/cancel_test.go | 2 +- submitqueue/gateway/controller/land.go | 2 +- submitqueue/gateway/controller/land_test.go | 2 +- submitqueue/gateway/controller/ping.go | 2 +- submitqueue/gateway/controller/ping_test.go | 2 +- submitqueue/gateway/controller/status.go | 2 +- submitqueue/gateway/controller/status_test.go | 2 +- .../orchestrator/controller/BUILD.bazel | 4 +- submitqueue/orchestrator/controller/ping.go | 2 +- .../orchestrator/controller/ping_test.go | 2 +- test/e2e/submitqueue/BUILD.bazel | 4 +- test/e2e/submitqueue/suite_test.go | 4 +- .../integration/stovepipe/gateway/BUILD.bazel | 2 +- .../stovepipe/gateway/suite_test.go | 2 +- .../submitqueue/gateway/BUILD.bazel | 2 +- .../submitqueue/gateway/suite_test.go | 2 +- .../submitqueue/orchestrator/BUILD.bazel | 2 +- .../submitqueue/orchestrator/suite_test.go | 2 +- tool/proto/BUILD.bazel | 32 ++++---- tool/proto/proto_codegen.bzl | 81 ++++++++++--------- 72 files changed, 262 insertions(+), 246 deletions(-) rename {stovepipe => api/stovepipe}/gateway/proto/BUILD.bazel (78%) rename {stovepipe => api/stovepipe}/gateway/proto/gateway.proto (94%) rename {stovepipe => api/stovepipe}/gateway/protopb/BUILD.bazel (91%) rename {stovepipe => api/stovepipe}/gateway/protopb/gateway.pb.go (97%) rename {stovepipe => api/stovepipe}/gateway/protopb/gateway.pb.yarpc.go (84%) rename {stovepipe => api/stovepipe}/gateway/protopb/gateway_grpc.pb.go (100%) rename {submitqueue => api/stovepipe}/orchestrator/proto/BUILD.bazel (77%) rename {stovepipe => api/stovepipe}/orchestrator/proto/orchestrator.proto (94%) rename {submitqueue => api/stovepipe}/orchestrator/protopb/BUILD.bazel (91%) rename {stovepipe => api/stovepipe}/orchestrator/protopb/orchestrator.pb.go (98%) rename {stovepipe => api/stovepipe}/orchestrator/protopb/orchestrator.pb.yarpc.go (84%) rename {stovepipe => api/stovepipe}/orchestrator/protopb/orchestrator_grpc.pb.go (100%) rename {submitqueue => api/submitqueue}/gateway/proto/BUILD.bazel (77%) rename {submitqueue => api/submitqueue}/gateway/proto/gateway.proto (99%) rename {submitqueue => api/submitqueue}/gateway/protopb/BUILD.bazel (91%) rename {submitqueue => api/submitqueue}/gateway/protopb/gateway.pb.go (99%) rename {submitqueue => api/submitqueue}/gateway/protopb/gateway.pb.yarpc.go (77%) rename {submitqueue => api/submitqueue}/gateway/protopb/gateway_grpc.pb.go (100%) rename {stovepipe => api/submitqueue}/orchestrator/proto/BUILD.bazel (77%) rename {submitqueue => api/submitqueue}/orchestrator/proto/orchestrator.proto (94%) rename {stovepipe => api/submitqueue}/orchestrator/protopb/BUILD.bazel (90%) rename {submitqueue => api/submitqueue}/orchestrator/protopb/orchestrator.pb.go (98%) rename {submitqueue => api/submitqueue}/orchestrator/protopb/orchestrator.pb.yarpc.go (85%) rename {submitqueue => api/submitqueue}/orchestrator/protopb/orchestrator_grpc.pb.go (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 3f35d813..647896b6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -7,10 +7,10 @@ load("@gazelle//:def.bzl", "gazelle") # gazelle:exclude .claude # Resolve protobuf import ambiguities - use the actual protopb packages, not the proto aliases -# gazelle:resolve go github.com/uber/submitqueue/submitqueue/gateway/protopb //submitqueue/gateway/protopb -# gazelle:resolve go github.com/uber/submitqueue/submitqueue/orchestrator/protopb //submitqueue/orchestrator/protopb -# gazelle:resolve go github.com/uber/submitqueue/stovepipe/gateway/protopb //stovepipe/gateway/protopb -# gazelle:resolve go github.com/uber/submitqueue/stovepipe/orchestrator/protopb //stovepipe/orchestrator/protopb +# gazelle:resolve go github.com/uber/submitqueue/api/submitqueue/gateway/protopb //api/submitqueue/gateway/protopb +# gazelle:resolve go github.com/uber/submitqueue/api/submitqueue/orchestrator/protopb //api/submitqueue/orchestrator/protopb +# gazelle:resolve go github.com/uber/submitqueue/api/stovepipe/gateway/protopb //api/stovepipe/gateway/protopb +# gazelle:resolve go github.com/uber/submitqueue/api/stovepipe/orchestrator/protopb //api/stovepipe/orchestrator/protopb # Export marker files for test data dependencies (used by FindRepoRoot in tests) exports_files( diff --git a/CLAUDE.md b/CLAUDE.md index 0690f516..8b749b38 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -36,6 +36,9 @@ request.Version = newVersion ``` submitqueue/ # repo root (Go module github.com/uber/submitqueue) +├── api/ # Wire contracts (proto) by domain/service +│ ├── submitqueue/{gateway,orchestrator}/{proto,protopb}/ +│ └── stovepipe/{gateway,orchestrator}/{proto,protopb}/ ├── platform/ # SHARED cross-domain packages — no domain deps │ ├── errs/, metrics/, consumer/, http/ │ ├── base/ # SHARED entities (change/, messagequeue/, …) @@ -65,6 +68,8 @@ submitqueue/ # repo root (Go module github.com/uber/submi The `platform/` tree holds code reused across domains (infrastructure, shared entities, shared extension contracts). Each **domain** (`submitqueue/`, `stovepipe/`, …) keeps the same internal layout (`gateway/`, `orchestrator/`, `entity/`, `extension/`, `core/`); a domain's own `core/` (e.g. `submitqueue/core/`) holds infra shared only between that domain's services. +The `api/` tree holds all wire contracts (proto definitions and their committed generated stubs), organized by `domain/service`: `api/{domain}/{service}/proto/` for `.proto` sources and `api/{domain}/{service}/protopb/` for generated Go. A service package may hold multiple `.proto` files — its RPC contract (`{service}.proto`) alongside messagequeue contracts (queue payload schemas) — all generating into the same `protopb/`. + ### Platform notes - Import path `github.com/uber/submitqueue/platform/http` uses Go package name `http` and aliases the standard library as `nethttp` inside the package. Source files that also import `net/http` should import the platform package with a distinct alias (for example `phttp "github.com/uber/submitqueue/platform/http"`) and call `phttp.NewClient`, `phttp.BaseURLTransport`, etc. @@ -76,16 +81,16 @@ Each service follows the same layout: ``` / -├── controller/ # Business logic (pure, transport-agnostic) -│ ├── {method}.go # RPC controllers (e.g., land.go, ping.go) -│ ├── {method}_test.go -│ └── {step}/ # Queue message controllers (e.g., request/) -│ ├── {step}.go -│ └── {step}_test.go -├── proto/ # Proto definitions (.proto files) -└── protopb/ # Generated proto code (committed to repo) +└── controller/ # Business logic (pure, transport-agnostic) + ├── {method}.go # RPC controllers (e.g., land.go, ping.go) + ├── {method}_test.go + └── {step}/ # Queue message controllers (e.g., request/) + ├── {step}.go + └── {step}_test.go ``` +Wire contracts for a service live separately under `api/{domain}/{service}/` (see Project Layout): `proto/` holds `.proto` sources and `protopb/` holds the committed generated stubs. + ### Controllers Two types, both containing pure business logic independent of infrastructure: @@ -150,7 +155,7 @@ Paths follow the directory layout: shared packages live under `platform/` at the - RPC Controllers: `github.com/uber/submitqueue/{domain}/{service}/controller` (e.g. `.../submitqueue/gateway/controller`) - Queue Controllers: `github.com/uber/submitqueue/{domain}/{service}/controller/{step}` -- Proto (generated): `github.com/uber/submitqueue/{domain}/{service}/protopb` +- Proto (generated): `github.com/uber/submitqueue/api/{domain}/{service}/protopb` - Domain entities: `github.com/uber/submitqueue/{domain}/entity` (e.g. `.../submitqueue/entity`) - Domain extensions: `github.com/uber/submitqueue/{domain}/extension/{ext}[/{impl}]` (e.g. `.../submitqueue/extension/storage/mysql`) - Cross-domain consumer framework: `github.com/uber/submitqueue/platform/consumer`; domain pipeline topic keys: `github.com/uber/submitqueue/{domain}/core/topickey` @@ -173,10 +178,12 @@ Bazel with Bzlmod (NOT WORKSPACE). ### Proto Generation Generated proto files are committed. When modifying `.proto` files: -1. Edit in `{domain}/{service}/proto/` (e.g. `submitqueue/gateway/proto/`) -2. `make proto` (generates `*.pb.go`, `*_grpc.pb.go`, `*.pb.yarpc.go`) +1. Edit in `api/{domain}/{service}/proto/` (e.g. `api/submitqueue/gateway/proto/`) +2. `make proto` (generates `*.pb.go`, `*_grpc.pb.go`, `*.pb.yarpc.go` into `api/{domain}/{service}/protopb/`) 3. Commit all generated files +To add a new `.proto` to a service (e.g. messagequeue contracts), drop it in the service's `api/{domain}/{service}/proto/` dir, add it to that package's `srcs` in `api/{domain}/{service}/proto/BUILD.bazel` and its `exports_files`, then `make proto && make gazelle`. The codegen and `make proto` copy loop already handle multiple `.proto` files per package. + ### Naming Conventions - **Directories**: singular (`mock/`, `entity/`, not `mocks/`, `entities/`) @@ -220,7 +227,7 @@ make clean # Clean Bazel cache ### Common Workflows **Add new RPC method:** -1. Edit `{domain}/{service}/proto/*.proto` → `make proto` +1. Edit `api/{domain}/{service}/proto/*.proto` → `make proto` 2. Add controller in `{domain}/{service}/controller/` 3. Wire up in `example/{domain}/{service}/server/main.go` diff --git a/Makefile b/Makefile index 28dbf272..a1b413ef 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,12 @@ YAMLFMT_VERSION ?= v0.16.0 # goimports version for Go formatting + import fixing GOIMPORTS_VERSION ?= v0.33.0 -# Proto packages: / dirs whose protopb/ holds the generated -# stubs. Each is generated by Bazel into bazel-bin/tool/proto/_/ -# (the out_dir convention in tool/proto/BUILD.bazel) and copied back here. -PROTO_PACKAGES = submitqueue/gateway submitqueue/orchestrator stovepipe/gateway stovepipe/orchestrator +# Proto packages: api// dirs whose protopb/ holds the generated +# stubs. Each is generated by Bazel into bazel-bin/tool/proto/api__/ +# (the out_dir convention in tool/proto/BUILD.bazel) and copied back here. A +# package may hold multiple .proto files (e.g. an RPC contract plus messagequeue +# contracts); all generated stubs land in the same protopb/ dir. +PROTO_PACKAGES = api/submitqueue/gateway api/submitqueue/orchestrator api/stovepipe/gateway api/stovepipe/orchestrator # Set REPO_ROOT for docker-compose export REPO_ROOT := $(shell pwd) @@ -343,9 +345,9 @@ proto: ## Generate protobuf files from .proto definitions @echo "Generating protobuf files with Bazel..." @$(BAZEL) build //tool/proto:generated @set -e; for pkg in $(PROTO_PACKAGES); do \ - out=$$(echo $$pkg | tr / _); base=$$(basename $$pkg); \ - for f in $$base.pb.go $$base.pb.yarpc.go $${base}_grpc.pb.go; do \ - cp -f bazel-bin/tool/proto/$$out/$$f $$pkg/protopb/$$f; \ + out=$$(echo $$pkg | tr / _); \ + for f in bazel-bin/tool/proto/$$out/*.go; do \ + cp -f $$f $$pkg/protopb/$$(basename $$f); \ done; \ done @$(BAZEL) run @rules_go//go -- run golang.org/x/tools/cmd/goimports@$(GOIMPORTS_VERSION) -w $(addsuffix /protopb,$(PROTO_PACKAGES)) diff --git a/stovepipe/gateway/proto/BUILD.bazel b/api/stovepipe/gateway/proto/BUILD.bazel similarity index 78% rename from stovepipe/gateway/proto/BUILD.bazel rename to api/stovepipe/gateway/proto/BUILD.bazel index e2a54be0..7611c3e3 100644 --- a/stovepipe/gateway/proto/BUILD.bazel +++ b/api/stovepipe/gateway/proto/BUILD.bazel @@ -20,7 +20,7 @@ go_proto_library( "@rules_go//proto:go_proto", "@rules_go//proto:go_grpc_v2", ], - importpath = "github.com/uber/submitqueue/stovepipe/gateway/proto", + importpath = "github.com/uber/submitqueue/api/stovepipe/gateway/proto", proto = ":gatewaypb_proto", visibility = ["//visibility:public"], ) @@ -28,13 +28,13 @@ go_proto_library( go_library( name = "proto", embed = [":gatewaypb_go_proto"], - importpath = "github.com/uber/submitqueue/stovepipe/gateway/proto", + importpath = "github.com/uber/submitqueue/api/stovepipe/gateway/proto", visibility = ["//visibility:public"], ) go_library( name = "protopb", embed = [":gatewaypb_go_proto"], - importpath = "github.com/uber/submitqueue/stovepipe/gateway/protopb", + importpath = "github.com/uber/submitqueue/api/stovepipe/gateway/protopb", visibility = ["//visibility:public"], ) diff --git a/stovepipe/gateway/proto/gateway.proto b/api/stovepipe/gateway/proto/gateway.proto similarity index 94% rename from stovepipe/gateway/proto/gateway.proto rename to api/stovepipe/gateway/proto/gateway.proto index 37b8cd46..f61ac0d7 100644 --- a/stovepipe/gateway/proto/gateway.proto +++ b/api/stovepipe/gateway/proto/gateway.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package uber.submitqueue.stovepipe; -option go_package = "github.com/uber/submitqueue/stovepipe/gateway/protopb"; +option go_package = "github.com/uber/submitqueue/api/stovepipe/gateway/protopb"; option java_multiple_files = true; option java_outer_classname = "GatewayProto"; option java_package = "com.uber.submitqueue.stovepipe"; diff --git a/stovepipe/gateway/protopb/BUILD.bazel b/api/stovepipe/gateway/protopb/BUILD.bazel similarity index 91% rename from stovepipe/gateway/protopb/BUILD.bazel rename to api/stovepipe/gateway/protopb/BUILD.bazel index e4a862ae..23853190 100644 --- a/stovepipe/gateway/protopb/BUILD.bazel +++ b/api/stovepipe/gateway/protopb/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "gateway.pb.yarpc.go", "gateway_grpc.pb.go", ], - importpath = "github.com/uber/submitqueue/stovepipe/gateway/protopb", + importpath = "github.com/uber/submitqueue/api/stovepipe/gateway/protopb", visibility = ["//visibility:public"], deps = [ "@org_golang_google_grpc//:grpc", diff --git a/stovepipe/gateway/protopb/gateway.pb.go b/api/stovepipe/gateway/protopb/gateway.pb.go similarity index 97% rename from stovepipe/gateway/protopb/gateway.pb.go rename to api/stovepipe/gateway/protopb/gateway.pb.go index 7c875c83..8be733bd 100644 --- a/stovepipe/gateway/protopb/gateway.pb.go +++ b/api/stovepipe/gateway/protopb/gateway.pb.go @@ -168,8 +168,8 @@ const file_gateway_proto_rawDesc = "" + "\ttimestamp\x18\x03 \x01(\x03R\ttimestamp\x12\x1a\n" + "\bhostname\x18\x04 \x01(\tR\bhostname2o\n" + "\x10StovepipeGateway\x12[\n" + - "\x04Ping\x12'.uber.submitqueue.stovepipe.PingRequest\x1a(.uber.submitqueue.stovepipe.PingResponse\"\x00Bg\n" + - "\x1ecom.uber.submitqueue.stovepipeB\fGatewayProtoP\x01Z5github.com/uber/submitqueue/stovepipe/gateway/protopbb\x06proto3" + "\x04Ping\x12'.uber.submitqueue.stovepipe.PingRequest\x1a(.uber.submitqueue.stovepipe.PingResponse\"\x00Bk\n" + + "\x1ecom.uber.submitqueue.stovepipeB\fGatewayProtoP\x01Z9github.com/uber/submitqueue/api/stovepipe/gateway/protopbb\x06proto3" var ( file_gateway_proto_rawDescOnce sync.Once diff --git a/stovepipe/gateway/protopb/gateway.pb.yarpc.go b/api/stovepipe/gateway/protopb/gateway.pb.yarpc.go similarity index 84% rename from stovepipe/gateway/protopb/gateway.pb.yarpc.go rename to api/stovepipe/gateway/protopb/gateway.pb.yarpc.go index fde8278f..8ca3da5c 100644 --- a/stovepipe/gateway/protopb/gateway.pb.yarpc.go +++ b/api/stovepipe/gateway/protopb/gateway.pb.yarpc.go @@ -227,22 +227,22 @@ var yarpcFileDescriptorClosuref1a937782ebbded5 = [][]byte{ // gateway.proto []byte{ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x31, 0x4f, 0xc3, 0x30, - 0x10, 0x85, 0x09, 0xad, 0x80, 0x5e, 0x8b, 0x84, 0x3c, 0x45, 0x11, 0x42, 0x25, 0x4b, 0x33, 0x39, - 0x12, 0x88, 0x3f, 0xd0, 0x85, 0x0d, 0x45, 0x61, 0x83, 0x01, 0xd9, 0xd1, 0xc9, 0xf5, 0xe0, 0xd8, - 0xcd, 0xd9, 0x45, 0xfc, 0x00, 0xfe, 0x37, 0x8a, 0x93, 0x96, 0x2e, 0x85, 0xcd, 0x77, 0x7e, 0x9f, - 0xf4, 0xde, 0x3d, 0xb8, 0x56, 0xc2, 0xe3, 0xa7, 0xf8, 0xe2, 0xae, 0xb3, 0xde, 0xb2, 0x2c, 0x48, - 0xec, 0x38, 0x05, 0x69, 0xb4, 0xdf, 0x06, 0x0c, 0xc8, 0xc9, 0xdb, 0x1d, 0x3a, 0xed, 0x30, 0x5f, - 0xc1, 0xbc, 0xd2, 0xad, 0xaa, 0x71, 0x1b, 0x90, 0x3c, 0x4b, 0xe1, 0xd2, 0x20, 0x91, 0x50, 0x98, - 0x26, 0xcb, 0xa4, 0x98, 0xd5, 0xfb, 0x31, 0xff, 0x4e, 0x60, 0x31, 0x28, 0xc9, 0xd9, 0x96, 0xf0, - 0xb4, 0x94, 0xdd, 0xc3, 0x82, 0xb0, 0xdb, 0xe9, 0x06, 0x3f, 0x5a, 0x61, 0x30, 0x3d, 0x8f, 0xdf, - 0xf3, 0x71, 0xf7, 0x22, 0x0c, 0xb2, 0x5b, 0x98, 0x79, 0x6d, 0x90, 0xbc, 0x30, 0x2e, 0x9d, 0x2c, - 0x93, 0x62, 0x52, 0xff, 0x2e, 0x58, 0x06, 0x57, 0x1b, 0x4b, 0x3e, 0xc2, 0xd3, 0x08, 0x1f, 0xe6, - 0x07, 0x0b, 0x37, 0xaf, 0x7b, 0xf7, 0xcf, 0x43, 0x4c, 0xf6, 0x0e, 0xd3, 0xde, 0x1a, 0x5b, 0xf1, - 0xd3, 0x49, 0xf9, 0x51, 0xcc, 0xac, 0xf8, 0x5f, 0x38, 0xa4, 0xcc, 0xcf, 0xd6, 0x0a, 0xee, 0x1a, - 0x6b, 0xfe, 0x00, 0xd6, 0x8b, 0xd1, 0x47, 0xd5, 0x5f, 0xbb, 0x4a, 0xde, 0x9e, 0x94, 0xf6, 0x9b, - 0x20, 0x79, 0x63, 0x4d, 0xd9, 0x63, 0xe5, 0x11, 0x56, 0x1e, 0xb0, 0x72, 0x2c, 0xa9, 0x8c, 0x25, - 0x39, 0x29, 0x2f, 0xe2, 0xe3, 0xf1, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xbf, 0xec, 0xe5, 0xbe, - 0x01, 0x00, 0x00, + 0x10, 0x85, 0x09, 0xad, 0x80, 0x5e, 0x83, 0x84, 0x3c, 0x45, 0x11, 0x42, 0x25, 0x4b, 0x33, 0xd9, + 0x12, 0x4c, 0xac, 0x5d, 0xd8, 0x50, 0x14, 0x36, 0x18, 0x90, 0x13, 0x9d, 0x52, 0x0b, 0x39, 0x76, + 0x73, 0x76, 0x11, 0x3f, 0x80, 0xff, 0x8d, 0xe2, 0xa4, 0xa5, 0x4b, 0xe9, 0xe6, 0x3b, 0xbf, 0x4f, + 0x7a, 0xef, 0x1e, 0x5c, 0x37, 0xd2, 0xe1, 0x97, 0xfc, 0xe6, 0xb6, 0x33, 0xce, 0xb0, 0xd4, 0x57, + 0xd8, 0x71, 0xf2, 0x95, 0x56, 0x6e, 0xe3, 0xd1, 0x23, 0x27, 0x67, 0xb6, 0x68, 0x95, 0xc5, 0x6c, + 0x09, 0xf3, 0x42, 0xb5, 0x4d, 0x89, 0x1b, 0x8f, 0xe4, 0x58, 0x02, 0x97, 0x1a, 0x89, 0x64, 0x83, + 0x49, 0xb4, 0x88, 0xf2, 0x59, 0xb9, 0x1b, 0xb3, 0x9f, 0x08, 0xe2, 0x41, 0x49, 0xd6, 0xb4, 0x84, + 0xc7, 0xa5, 0xec, 0x1e, 0x62, 0xc2, 0x6e, 0xab, 0x6a, 0xfc, 0x68, 0xa5, 0xc6, 0xe4, 0x3c, 0x7c, + 0xcf, 0xc7, 0xdd, 0x8b, 0xd4, 0xc8, 0x6e, 0x61, 0xe6, 0x94, 0x46, 0x72, 0x52, 0xdb, 0x64, 0xb2, + 0x88, 0xf2, 0x49, 0xf9, 0xb7, 0x60, 0x29, 0x5c, 0xad, 0x0d, 0xb9, 0x00, 0x4f, 0x03, 0xbc, 0x9f, + 0x1f, 0x0c, 0xdc, 0xbc, 0xee, 0xdc, 0x3f, 0x0f, 0x31, 0xd9, 0x3b, 0x4c, 0x7b, 0x6b, 0x6c, 0xc9, + 0x8f, 0x27, 0xe5, 0x07, 0x31, 0xd3, 0xfc, 0xb4, 0x70, 0x48, 0x99, 0x9d, 0xad, 0x3e, 0xe1, 0xae, + 0x36, 0xfa, 0x1f, 0x60, 0x15, 0x8f, 0x3e, 0x8a, 0xfe, 0xda, 0x45, 0xf4, 0xf6, 0xd4, 0x28, 0xb7, + 0xf6, 0x15, 0xaf, 0x8d, 0x16, 0x3d, 0x26, 0x0e, 0x30, 0x21, 0xad, 0x12, 0x7b, 0x54, 0x8c, 0x45, + 0x89, 0x50, 0x94, 0xad, 0xaa, 0x8b, 0xf0, 0x78, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x8b, + 0x21, 0x26, 0xc2, 0x01, 0x00, 0x00, }, } diff --git a/stovepipe/gateway/protopb/gateway_grpc.pb.go b/api/stovepipe/gateway/protopb/gateway_grpc.pb.go similarity index 100% rename from stovepipe/gateway/protopb/gateway_grpc.pb.go rename to api/stovepipe/gateway/protopb/gateway_grpc.pb.go diff --git a/submitqueue/orchestrator/proto/BUILD.bazel b/api/stovepipe/orchestrator/proto/BUILD.bazel similarity index 77% rename from submitqueue/orchestrator/proto/BUILD.bazel rename to api/stovepipe/orchestrator/proto/BUILD.bazel index 837b148c..f630a6cc 100644 --- a/submitqueue/orchestrator/proto/BUILD.bazel +++ b/api/stovepipe/orchestrator/proto/BUILD.bazel @@ -20,7 +20,7 @@ go_proto_library( "@rules_go//proto:go_proto", "@rules_go//proto:go_grpc_v2", ], - importpath = "github.com/uber/submitqueue/submitqueue/orchestrator/proto", + importpath = "github.com/uber/submitqueue/api/stovepipe/orchestrator/proto", proto = ":orchestratorpb_proto", visibility = ["//visibility:public"], ) @@ -28,13 +28,13 @@ go_proto_library( go_library( name = "proto", embed = [":orchestratorpb_go_proto"], - importpath = "github.com/uber/submitqueue/submitqueue/orchestrator/proto", + importpath = "github.com/uber/submitqueue/api/stovepipe/orchestrator/proto", visibility = ["//visibility:public"], ) go_library( name = "protopb", embed = [":orchestratorpb_go_proto"], - importpath = "github.com/uber/submitqueue/submitqueue/orchestrator/protopb", + importpath = "github.com/uber/submitqueue/api/stovepipe/orchestrator/protopb", visibility = ["//visibility:public"], ) diff --git a/stovepipe/orchestrator/proto/orchestrator.proto b/api/stovepipe/orchestrator/proto/orchestrator.proto similarity index 94% rename from stovepipe/orchestrator/proto/orchestrator.proto rename to api/stovepipe/orchestrator/proto/orchestrator.proto index d34f9494..1cd1bcd9 100644 --- a/stovepipe/orchestrator/proto/orchestrator.proto +++ b/api/stovepipe/orchestrator/proto/orchestrator.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package uber.submitqueue.stovepipe.orchestrator; -option go_package = "github.com/uber/submitqueue/stovepipe/orchestrator/protopb"; +option go_package = "github.com/uber/submitqueue/api/stovepipe/orchestrator/protopb"; option java_multiple_files = true; option java_outer_classname = "OrchestratorProto"; option java_package = "com.uber.submitqueue.stovepipe.orchestrator"; diff --git a/submitqueue/orchestrator/protopb/BUILD.bazel b/api/stovepipe/orchestrator/protopb/BUILD.bazel similarity index 91% rename from submitqueue/orchestrator/protopb/BUILD.bazel rename to api/stovepipe/orchestrator/protopb/BUILD.bazel index 790e5928..5ece6304 100644 --- a/submitqueue/orchestrator/protopb/BUILD.bazel +++ b/api/stovepipe/orchestrator/protopb/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "orchestrator.pb.yarpc.go", "orchestrator_grpc.pb.go", ], - importpath = "github.com/uber/submitqueue/submitqueue/orchestrator/protopb", + importpath = "github.com/uber/submitqueue/api/stovepipe/orchestrator/protopb", visibility = ["//visibility:public"], deps = [ "@org_golang_google_grpc//:grpc", diff --git a/stovepipe/orchestrator/protopb/orchestrator.pb.go b/api/stovepipe/orchestrator/protopb/orchestrator.pb.go similarity index 98% rename from stovepipe/orchestrator/protopb/orchestrator.pb.go rename to api/stovepipe/orchestrator/protopb/orchestrator.pb.go index a740788c..c78852f1 100644 --- a/stovepipe/orchestrator/protopb/orchestrator.pb.go +++ b/api/stovepipe/orchestrator/protopb/orchestrator.pb.go @@ -168,8 +168,8 @@ const file_orchestrator_proto_rawDesc = "" + "\ttimestamp\x18\x03 \x01(\x03R\ttimestamp\x12\x1a\n" + "\bhostname\x18\x04 \x01(\tR\bhostname2\x8e\x01\n" + "\x15StovepipeOrchestrator\x12u\n" + - "\x04Ping\x124.uber.submitqueue.stovepipe.orchestrator.PingRequest\x1a5.uber.submitqueue.stovepipe.orchestrator.PingResponse\"\x00B~\n" + - "+com.uber.submitqueue.stovepipe.orchestratorB\x11OrchestratorProtoP\x01Z:github.com/uber/submitqueue/stovepipe/orchestrator/protopbb\x06proto3" + "\x04Ping\x124.uber.submitqueue.stovepipe.orchestrator.PingRequest\x1a5.uber.submitqueue.stovepipe.orchestrator.PingResponse\"\x00B\x82\x01\n" + + "+com.uber.submitqueue.stovepipe.orchestratorB\x11OrchestratorProtoP\x01Z>github.com/uber/submitqueue/api/stovepipe/orchestrator/protopbb\x06proto3" var ( file_orchestrator_proto_rawDescOnce sync.Once diff --git a/stovepipe/orchestrator/protopb/orchestrator.pb.yarpc.go b/api/stovepipe/orchestrator/protopb/orchestrator.pb.yarpc.go similarity index 84% rename from stovepipe/orchestrator/protopb/orchestrator.pb.yarpc.go rename to api/stovepipe/orchestrator/protopb/orchestrator.pb.yarpc.go index c7a96783..efa204a8 100644 --- a/stovepipe/orchestrator/protopb/orchestrator.pb.yarpc.go +++ b/api/stovepipe/orchestrator/protopb/orchestrator.pb.yarpc.go @@ -226,23 +226,24 @@ var ( var yarpcFileDescriptorClosure96b6e6782baaa298 = [][]byte{ // orchestrator.proto []byte{ - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0x3f, 0x4f, 0xc3, 0x30, - 0x10, 0xc5, 0x31, 0xad, 0x80, 0x5e, 0xbb, 0x60, 0x09, 0x29, 0xaa, 0x18, 0x4a, 0x96, 0x56, 0x42, - 0x72, 0x24, 0xfe, 0x2c, 0x8c, 0xfd, 0x00, 0x10, 0x85, 0x8d, 0x05, 0x25, 0xd1, 0x29, 0xf1, 0xe0, - 0xd8, 0xf5, 0x9d, 0x3b, 0xb2, 0xb1, 0xf2, 0x99, 0x51, 0x52, 0x5a, 0xbc, 0x20, 0x95, 0xcd, 0x77, - 0x7e, 0xef, 0xe9, 0x7e, 0x77, 0x20, 0xad, 0xaf, 0x5b, 0x24, 0xf6, 0x25, 0x5b, 0xaf, 0x9c, 0xb7, - 0x6c, 0xe5, 0x32, 0x54, 0xe8, 0x15, 0x85, 0xca, 0x68, 0xde, 0x04, 0x0c, 0xa8, 0x88, 0xed, 0x16, - 0x9d, 0x76, 0xa8, 0x62, 0x79, 0xba, 0x84, 0x69, 0xae, 0xbb, 0xa6, 0xc0, 0x4d, 0x40, 0x62, 0x99, - 0xc0, 0xb9, 0x41, 0xa2, 0xb2, 0xc1, 0x44, 0x2c, 0xc4, 0x6a, 0x52, 0xec, 0xcb, 0xf4, 0x53, 0xc0, - 0x6c, 0xa7, 0x24, 0x67, 0x3b, 0xc2, 0xbf, 0xa5, 0xf2, 0x06, 0x66, 0x84, 0x7e, 0xab, 0x6b, 0x7c, - 0xef, 0x4a, 0x83, 0xc9, 0xe9, 0xf0, 0x3d, 0xfd, 0xe9, 0x3d, 0x97, 0x06, 0xe5, 0x35, 0x4c, 0x58, - 0x1b, 0x24, 0x2e, 0x8d, 0x4b, 0x46, 0x0b, 0xb1, 0x1a, 0x15, 0xbf, 0x0d, 0x39, 0x87, 0x8b, 0xd6, - 0x12, 0x0f, 0xe6, 0xf1, 0x60, 0x3e, 0xd4, 0x77, 0x5f, 0x02, 0xae, 0x5e, 0xf7, 0x2c, 0x2f, 0x11, - 0x8a, 0x0c, 0x30, 0xee, 0x07, 0x94, 0x0f, 0xea, 0x48, 0x78, 0x15, 0x91, 0xcf, 0x1f, 0xff, 0xe9, - 0xda, 0x6d, 0x21, 0x3d, 0x59, 0x7f, 0xc0, 0x6d, 0x6d, 0xcd, 0xb1, 0xee, 0xf5, 0x65, 0x3c, 0x73, - 0xde, 0x1f, 0x2b, 0x17, 0x6f, 0x4f, 0x8d, 0xe6, 0x36, 0x54, 0xaa, 0xb6, 0x26, 0xeb, 0x83, 0xb2, - 0x28, 0x28, 0x3b, 0x04, 0x65, 0x71, 0x50, 0x36, 0x1c, 0xda, 0x55, 0xd5, 0xd9, 0xf0, 0xb8, 0xff, - 0x0e, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x73, 0xb0, 0x63, 0x07, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xcf, 0x4a, 0x03, 0x31, + 0x10, 0xc6, 0x8d, 0x2d, 0x6a, 0xd3, 0x5e, 0x0c, 0x08, 0x4b, 0xf1, 0x50, 0xf7, 0xd2, 0x82, 0x90, + 0x80, 0x7f, 0xae, 0x1e, 0xfa, 0x00, 0xba, 0xac, 0x37, 0x2f, 0x92, 0x5d, 0x86, 0xdd, 0x1c, 0xb2, + 0x49, 0x33, 0x93, 0x3e, 0x80, 0xe0, 0xd5, 0x67, 0x96, 0xdd, 0xda, 0x9a, 0x8b, 0x50, 0x6f, 0x99, + 0xc9, 0xf7, 0x7d, 0xcc, 0x6f, 0x86, 0x0b, 0x17, 0xea, 0x16, 0x90, 0x82, 0x26, 0x17, 0xa4, 0x0f, + 0x8e, 0x9c, 0x58, 0xc6, 0x0a, 0x82, 0xc4, 0x58, 0x59, 0x43, 0x9b, 0x08, 0x11, 0x24, 0x92, 0xdb, + 0x82, 0x37, 0x1e, 0x64, 0x2a, 0xcf, 0x97, 0x7c, 0x5a, 0x98, 0xae, 0x29, 0x61, 0x13, 0x01, 0x49, + 0x64, 0xfc, 0xdc, 0x02, 0xa2, 0x6e, 0x20, 0x63, 0x0b, 0xb6, 0x9a, 0x94, 0xfb, 0x32, 0xff, 0x64, + 0x7c, 0xb6, 0x53, 0xa2, 0x77, 0x1d, 0xc2, 0xdf, 0x52, 0x71, 0xc3, 0x67, 0x08, 0x61, 0x6b, 0x6a, + 0x78, 0xef, 0xb4, 0x85, 0xec, 0x74, 0xf8, 0x9e, 0xfe, 0xf4, 0x9e, 0xb5, 0x05, 0x71, 0xcd, 0x27, + 0x64, 0x2c, 0x20, 0x69, 0xeb, 0xb3, 0xd1, 0x82, 0xad, 0x46, 0xe5, 0x6f, 0x43, 0xcc, 0xf9, 0x45, + 0xeb, 0x90, 0x06, 0xf3, 0x78, 0x30, 0x1f, 0xea, 0xbb, 0x2f, 0xc6, 0xaf, 0x5e, 0xf7, 0x2c, 0x2f, + 0x09, 0x8a, 0x88, 0x7c, 0xdc, 0x0f, 0x28, 0x1e, 0xe4, 0x91, 0xf0, 0x32, 0x21, 0x9f, 0x3f, 0xfe, + 0xd3, 0xb5, 0xdb, 0x42, 0x7e, 0xb2, 0xfe, 0x60, 0xfc, 0xb6, 0x76, 0xf6, 0x58, 0xfb, 0xfa, 0x32, + 0x1d, 0xba, 0xe8, 0xaf, 0x55, 0xb0, 0xb7, 0xa7, 0xc6, 0x50, 0x1b, 0x2b, 0x59, 0x3b, 0xab, 0xfa, + 0x20, 0x95, 0x04, 0x29, 0xed, 0x8d, 0x3a, 0x84, 0xa9, 0x34, 0x4c, 0x0d, 0xd7, 0xf6, 0x55, 0x75, + 0x36, 0x3c, 0xee, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x27, 0x20, 0xff, 0x0c, 0x02, 0x00, + 0x00, }, } diff --git a/stovepipe/orchestrator/protopb/orchestrator_grpc.pb.go b/api/stovepipe/orchestrator/protopb/orchestrator_grpc.pb.go similarity index 100% rename from stovepipe/orchestrator/protopb/orchestrator_grpc.pb.go rename to api/stovepipe/orchestrator/protopb/orchestrator_grpc.pb.go diff --git a/submitqueue/gateway/proto/BUILD.bazel b/api/submitqueue/gateway/proto/BUILD.bazel similarity index 77% rename from submitqueue/gateway/proto/BUILD.bazel rename to api/submitqueue/gateway/proto/BUILD.bazel index 17612245..7800da89 100644 --- a/submitqueue/gateway/proto/BUILD.bazel +++ b/api/submitqueue/gateway/proto/BUILD.bazel @@ -20,7 +20,7 @@ go_proto_library( "@rules_go//proto:go_proto", "@rules_go//proto:go_grpc_v2", ], - importpath = "github.com/uber/submitqueue/submitqueue/gateway/proto", + importpath = "github.com/uber/submitqueue/api/submitqueue/gateway/proto", proto = ":gatewaypb_proto", visibility = ["//visibility:public"], ) @@ -28,13 +28,13 @@ go_proto_library( go_library( name = "proto", embed = [":gatewaypb_go_proto"], - importpath = "github.com/uber/submitqueue/submitqueue/gateway/proto", + importpath = "github.com/uber/submitqueue/api/submitqueue/gateway/proto", visibility = ["//visibility:public"], ) go_library( name = "protopb", embed = [":gatewaypb_go_proto"], - importpath = "github.com/uber/submitqueue/submitqueue/gateway/protopb", + importpath = "github.com/uber/submitqueue/api/submitqueue/gateway/protopb", visibility = ["//visibility:public"], ) diff --git a/submitqueue/gateway/proto/gateway.proto b/api/submitqueue/gateway/proto/gateway.proto similarity index 99% rename from submitqueue/gateway/proto/gateway.proto rename to api/submitqueue/gateway/proto/gateway.proto index e6482b37..3b7a0fac 100644 --- a/submitqueue/gateway/proto/gateway.proto +++ b/api/submitqueue/gateway/proto/gateway.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package uber.submitqueue.gateway; -option go_package = "github.com/uber/submitqueue/submitqueue/gateway/protopb"; +option go_package = "github.com/uber/submitqueue/api/submitqueue/gateway/protopb"; option java_multiple_files = true; option java_outer_classname = "GatewayProto"; option java_package = "com.uber.submitqueue.gateway"; diff --git a/submitqueue/gateway/protopb/BUILD.bazel b/api/submitqueue/gateway/protopb/BUILD.bazel similarity index 91% rename from submitqueue/gateway/protopb/BUILD.bazel rename to api/submitqueue/gateway/protopb/BUILD.bazel index 9695fa42..8431100a 100644 --- a/submitqueue/gateway/protopb/BUILD.bazel +++ b/api/submitqueue/gateway/protopb/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "gateway.pb.yarpc.go", "gateway_grpc.pb.go", ], - importpath = "github.com/uber/submitqueue/submitqueue/gateway/protopb", + importpath = "github.com/uber/submitqueue/api/submitqueue/gateway/protopb", visibility = ["//visibility:public"], deps = [ "@org_golang_google_grpc//:grpc", diff --git a/submitqueue/gateway/protopb/gateway.pb.go b/api/submitqueue/gateway/protopb/gateway.pb.go similarity index 99% rename from submitqueue/gateway/protopb/gateway.pb.go rename to api/submitqueue/gateway/protopb/gateway.pb.go index 85d1aff2..b4886ff6 100644 --- a/submitqueue/gateway/protopb/gateway.pb.go +++ b/api/submitqueue/gateway/protopb/gateway.pb.go @@ -800,8 +800,8 @@ const file_gateway_proto_rawDesc = "" + "\x04Ping\x12%.uber.submitqueue.gateway.PingRequest\x1a&.uber.submitqueue.gateway.PingResponse\"\x00\x12W\n" + "\x04Land\x12%.uber.submitqueue.gateway.LandRequest\x1a&.uber.submitqueue.gateway.LandResponse\"\x00\x12]\n" + "\x06Cancel\x12'.uber.submitqueue.gateway.CancelRequest\x1a(.uber.submitqueue.gateway.CancelResponse\"\x00\x12]\n" + - "\x06Status\x12'.uber.submitqueue.gateway.StatusRequest\x1a(.uber.submitqueue.gateway.StatusResponse\"\x00Bg\n" + - "\x1ccom.uber.submitqueue.gatewayB\fGatewayProtoP\x01Z7github.com/uber/submitqueue/submitqueue/gateway/protopbb\x06proto3" + "\x06Status\x12'.uber.submitqueue.gateway.StatusRequest\x1a(.uber.submitqueue.gateway.StatusResponse\"\x00Bk\n" + + "\x1ccom.uber.submitqueue.gatewayB\fGatewayProtoP\x01Z;github.com/uber/submitqueue/api/submitqueue/gateway/protopbb\x06proto3" var ( file_gateway_proto_rawDescOnce sync.Once diff --git a/submitqueue/gateway/protopb/gateway.pb.yarpc.go b/api/submitqueue/gateway/protopb/gateway.pb.yarpc.go similarity index 77% rename from submitqueue/gateway/protopb/gateway.pb.yarpc.go rename to api/submitqueue/gateway/protopb/gateway.pb.yarpc.go index e04d0127..e1473005 100644 --- a/submitqueue/gateway/protopb/gateway.pb.yarpc.go +++ b/api/submitqueue/gateway/protopb/gateway.pb.yarpc.go @@ -377,46 +377,47 @@ var yarpcFileDescriptorClosuref1a937782ebbded5 = [][]byte{ // gateway.proto []byte{ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x51, 0x6b, 0xdb, 0x3c, - 0x14, 0x8d, 0xe3, 0xc4, 0x4d, 0xae, 0x93, 0x92, 0x4f, 0x94, 0x62, 0x42, 0x3f, 0x96, 0x6a, 0x6c, - 0x0d, 0x7b, 0x70, 0x21, 0x63, 0x5b, 0x59, 0x61, 0x90, 0x76, 0x6e, 0xf7, 0xd0, 0x96, 0xd6, 0x5e, - 0x19, 0x0c, 0x46, 0x51, 0x1c, 0xe1, 0x9a, 0xd5, 0x76, 0x6a, 0xc9, 0x1d, 0xd9, 0xf3, 0xf6, 0x33, - 0xf6, 0xbf, 0xf6, 0x73, 0x86, 0x25, 0xb9, 0x75, 0x60, 0x76, 0x1f, 0xf6, 0xa6, 0x7b, 0x75, 0xce, - 0xb9, 0x47, 0xd2, 0xbd, 0x36, 0xf4, 0x03, 0xc2, 0xe9, 0x37, 0xb2, 0xb4, 0x17, 0x69, 0xc2, 0x13, - 0x64, 0x65, 0x33, 0x9a, 0xda, 0x2c, 0x9b, 0x45, 0x21, 0xbf, 0xcd, 0x68, 0x46, 0x6d, 0xb5, 0x8f, - 0x77, 0xc0, 0x3c, 0x0f, 0xe3, 0xc0, 0xa5, 0xb7, 0x19, 0x65, 0x1c, 0x59, 0xb0, 0x16, 0x51, 0xc6, - 0x48, 0x40, 0x2d, 0x6d, 0xa4, 0x8d, 0xbb, 0x6e, 0x11, 0xe2, 0x9f, 0x1a, 0xf4, 0x24, 0x92, 0x2d, - 0x92, 0x98, 0xd1, 0x6a, 0x28, 0xda, 0x86, 0x1e, 0xa3, 0xe9, 0x5d, 0xe8, 0xd3, 0xab, 0x98, 0x44, - 0xd4, 0x6a, 0x8a, 0x6d, 0x53, 0xe5, 0xce, 0x48, 0x44, 0xd1, 0x16, 0x74, 0x79, 0x18, 0x51, 0xc6, - 0x49, 0xb4, 0xb0, 0xf4, 0x91, 0x36, 0xd6, 0xdd, 0x87, 0x04, 0x1a, 0x42, 0xe7, 0x3a, 0x61, 0x5c, - 0x90, 0x5b, 0x82, 0x7c, 0x1f, 0xe3, 0x2d, 0x30, 0x0e, 0xaf, 0x49, 0x1c, 0x50, 0x84, 0xa0, 0x95, - 0xa5, 0x21, 0xb3, 0xb4, 0x91, 0x3e, 0xee, 0xba, 0x62, 0x8d, 0x7f, 0x69, 0x60, 0x9e, 0x90, 0x78, - 0x5e, 0x9c, 0x67, 0x03, 0xda, 0xe2, 0xbc, 0xca, 0xa2, 0x0c, 0xd0, 0x1e, 0x18, 0xbe, 0xd0, 0x10, - 0xd6, 0xcc, 0xc9, 0xc8, 0xae, 0xba, 0x1f, 0x5b, 0xd6, 0x72, 0x15, 0x1e, 0xbd, 0x83, 0x0e, 0xe3, - 0x29, 0xe1, 0x34, 0x58, 0x0a, 0x67, 0xeb, 0x13, 0x5c, 0xcd, 0xf5, 0x14, 0xd2, 0xbd, 0xe7, 0x60, - 0x0c, 0x3d, 0x69, 0x4f, 0x5d, 0x22, 0x82, 0x16, 0xbb, 0x0d, 0xe7, 0xca, 0x9e, 0x58, 0xe3, 0x7d, - 0xe8, 0x1f, 0x92, 0xd8, 0xa7, 0x37, 0xc5, 0x21, 0xfe, 0x02, 0x42, 0x9b, 0x60, 0xa4, 0x94, 0xb0, - 0x24, 0x56, 0xb7, 0xab, 0x22, 0x3c, 0x80, 0xf5, 0x82, 0x2c, 0x4b, 0xe0, 0xa7, 0xd0, 0xf7, 0x38, - 0xe1, 0x19, 0xab, 0x91, 0xc3, 0xbf, 0x35, 0x58, 0x2f, 0x50, 0xca, 0xda, 0x26, 0x18, 0x4c, 0x64, - 0x14, 0x50, 0x45, 0xe8, 0x7f, 0x80, 0x1b, 0xc2, 0xf8, 0x15, 0x4d, 0xd3, 0x24, 0x55, 0xd5, 0xbb, - 0x79, 0xc6, 0xc9, 0x13, 0xc8, 0x85, 0x4e, 0x44, 0x39, 0x99, 0x13, 0x4e, 0x2c, 0x7d, 0xa4, 0x8f, - 0xcd, 0xc9, 0xeb, 0xba, 0x1b, 0x2a, 0x97, 0xb4, 0x4f, 0x15, 0xd1, 0x89, 0x79, 0xba, 0x74, 0xef, - 0x75, 0x86, 0xfb, 0xd0, 0x5f, 0xd9, 0x42, 0x03, 0xd0, 0xbf, 0xd2, 0xa5, 0x32, 0x96, 0x2f, 0xf3, - 0x87, 0xbe, 0x23, 0x37, 0x59, 0xd1, 0x6c, 0x32, 0x78, 0xdb, 0xdc, 0xd3, 0xf0, 0x36, 0xb4, 0xa5, - 0xb3, 0xea, 0xde, 0xa6, 0xb0, 0x79, 0x19, 0xa7, 0xd4, 0x4f, 0x82, 0x38, 0xfc, 0x4e, 0xe7, 0x17, - 0xb9, 0x47, 0xc9, 0x79, 0x05, 0x6d, 0x79, 0x4e, 0x4d, 0x34, 0xca, 0x93, 0xea, 0xa3, 0x08, 0xbc, - 0x2b, 0xd1, 0x0f, 0x6d, 0xd7, 0x2c, 0xb5, 0x1d, 0x26, 0xb0, 0xa1, 0xde, 0xe0, 0x2c, 0xe1, 0x47, - 0x49, 0x16, 0xcf, 0xff, 0xa9, 0x48, 0xf1, 0x8e, 0xcd, 0x87, 0x77, 0x7c, 0x31, 0x85, 0x4e, 0xd1, - 0x75, 0xc8, 0x84, 0xb5, 0xf7, 0xce, 0xd1, 0xf4, 0xf2, 0xe4, 0xe3, 0xa0, 0x81, 0x00, 0x0c, 0xd7, - 0x39, 0x98, 0x7a, 0xce, 0x40, 0x43, 0xff, 0x41, 0xdf, 0xbb, 0xb8, 0x9c, 0x7a, 0x1f, 0xae, 0x54, - 0xaa, 0x89, 0xba, 0xd0, 0x3e, 0x75, 0xdc, 0x63, 0x67, 0xa0, 0x4f, 0x7e, 0xe8, 0x80, 0x3c, 0x51, - 0x5b, 0xdc, 0xc3, 0xb1, 0x2c, 0x8d, 0x3e, 0x41, 0x2b, 0x1f, 0x7f, 0xf4, 0xac, 0xda, 0x5d, 0xe9, - 0x43, 0x32, 0x7c, 0xfe, 0x18, 0x4c, 0x75, 0x67, 0x23, 0x17, 0xce, 0x47, 0xa2, 0x4e, 0xb8, 0x34, - 0xd1, 0x75, 0xc2, 0xe5, 0xc9, 0xc2, 0x0d, 0xf4, 0x05, 0x0c, 0x39, 0x0a, 0x68, 0xa7, 0x66, 0xbe, - 0xcb, 0x93, 0x36, 0x1c, 0x3f, 0x0e, 0x2c, 0xcb, 0xcb, 0xf6, 0xad, 0x93, 0x5f, 0x99, 0xbc, 0x3a, - 0xf9, 0xd5, 0x49, 0xc0, 0x8d, 0x83, 0x00, 0xb6, 0xfc, 0x24, 0xaa, 0x24, 0x1c, 0xf4, 0xd4, 0xc3, - 0x9c, 0xe7, 0x1f, 0xf8, 0x73, 0xed, 0xf3, 0x9b, 0x20, 0xe4, 0xd7, 0xd9, 0xcc, 0xf6, 0x93, 0x68, - 0x37, 0x27, 0xed, 0x96, 0x48, 0x2b, 0x6b, 0x25, 0xb0, 0x2b, 0xfe, 0x0c, 0x8b, 0xd9, 0xcc, 0x10, - 0x8b, 0x97, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x41, 0x0f, 0xf0, 0x33, 0x06, 0x00, 0x00, + 0x14, 0x8d, 0xe3, 0xc4, 0x4d, 0x6e, 0x92, 0x92, 0x4f, 0x94, 0x62, 0x42, 0x3f, 0x96, 0x6a, 0x6c, + 0x0d, 0x7b, 0x70, 0x20, 0x63, 0xa3, 0xac, 0x30, 0x48, 0x3b, 0xb7, 0x7b, 0x68, 0x4b, 0x6b, 0xaf, + 0x0c, 0x06, 0xa3, 0x28, 0x8e, 0x70, 0x4d, 0x6b, 0x3b, 0xb5, 0xe4, 0x8e, 0xec, 0x79, 0xfb, 0x19, + 0xfb, 0x5f, 0xfb, 0x39, 0xc3, 0x92, 0xdc, 0x38, 0x30, 0xbb, 0x0f, 0x7b, 0xd3, 0xbd, 0x3a, 0xe7, + 0xdc, 0x23, 0xe9, 0x5e, 0x1b, 0x7a, 0x3e, 0xe1, 0xf4, 0x1b, 0x59, 0x5a, 0x8b, 0x24, 0xe6, 0x31, + 0x32, 0xd3, 0x19, 0x4d, 0x2c, 0x96, 0xce, 0xc2, 0x80, 0xdf, 0xa7, 0x34, 0xa5, 0x96, 0xda, 0xc7, + 0x7b, 0xd0, 0xb9, 0x08, 0x22, 0xdf, 0xa1, 0xf7, 0x29, 0x65, 0x1c, 0x99, 0xb0, 0x11, 0x52, 0xc6, + 0x88, 0x4f, 0x4d, 0x6d, 0xa8, 0x8d, 0xda, 0x4e, 0x1e, 0xe2, 0x9f, 0x1a, 0x74, 0x25, 0x92, 0x2d, + 0xe2, 0x88, 0xd1, 0x72, 0x28, 0xda, 0x85, 0x2e, 0xa3, 0xc9, 0x43, 0xe0, 0xd1, 0xeb, 0x88, 0x84, + 0xd4, 0xac, 0x8b, 0xed, 0x8e, 0xca, 0x9d, 0x93, 0x90, 0xa2, 0x1d, 0x68, 0xf3, 0x20, 0xa4, 0x8c, + 0x93, 0x70, 0x61, 0xea, 0x43, 0x6d, 0xa4, 0x3b, 0xab, 0x04, 0x1a, 0x40, 0xeb, 0x26, 0x66, 0x5c, + 0x90, 0x1b, 0x82, 0xfc, 0x18, 0xe3, 0x1d, 0x30, 0x8e, 0x6e, 0x48, 0xe4, 0x53, 0x84, 0xa0, 0x91, + 0x26, 0x01, 0x33, 0xb5, 0xa1, 0x3e, 0x6a, 0x3b, 0x62, 0x8d, 0x7f, 0x69, 0xd0, 0x39, 0x25, 0xd1, + 0x3c, 0x3f, 0xcf, 0x16, 0x34, 0xc5, 0x79, 0x95, 0x45, 0x19, 0xa0, 0x7d, 0x30, 0x3c, 0xa1, 0x21, + 0xac, 0x75, 0x26, 0x43, 0xab, 0xec, 0x7e, 0x2c, 0x59, 0xcb, 0x51, 0x78, 0xf4, 0x1e, 0x5a, 0x8c, + 0x27, 0x84, 0x53, 0x7f, 0x29, 0x9c, 0x6d, 0x4e, 0x70, 0x39, 0xd7, 0x55, 0x48, 0xe7, 0x91, 0x83, + 0x31, 0x74, 0xa5, 0x3d, 0x75, 0x89, 0x08, 0x1a, 0xec, 0x3e, 0x98, 0x2b, 0x7b, 0x62, 0x8d, 0x0f, + 0xa0, 0x77, 0x44, 0x22, 0x8f, 0xde, 0xe5, 0x87, 0xf8, 0x0b, 0x08, 0x6d, 0x83, 0x91, 0x50, 0xc2, + 0xe2, 0x48, 0xdd, 0xae, 0x8a, 0x70, 0x1f, 0x36, 0x73, 0xb2, 0x2c, 0x81, 0x9f, 0x43, 0xcf, 0xe5, + 0x84, 0xa7, 0xac, 0x42, 0x0e, 0xff, 0xd6, 0x60, 0x33, 0x47, 0x29, 0x6b, 0xdb, 0x60, 0x30, 0x91, + 0x51, 0x40, 0x15, 0xa1, 0xff, 0x01, 0xee, 0x08, 0xe3, 0xd7, 0x34, 0x49, 0xe2, 0x44, 0x55, 0x6f, + 0x67, 0x19, 0x3b, 0x4b, 0x20, 0x07, 0x5a, 0x21, 0xe5, 0x64, 0x4e, 0x38, 0x31, 0xf5, 0xa1, 0x3e, + 0xea, 0x4c, 0xde, 0x56, 0xdd, 0x50, 0xb1, 0xa4, 0x75, 0xa6, 0x88, 0x76, 0xc4, 0x93, 0xa5, 0xf3, + 0xa8, 0x33, 0x38, 0x80, 0xde, 0xda, 0x16, 0xea, 0x83, 0x7e, 0x4b, 0x97, 0xca, 0x58, 0xb6, 0xcc, + 0x1e, 0xfa, 0x81, 0xdc, 0xa5, 0x79, 0xb3, 0xc9, 0xe0, 0x5d, 0x7d, 0x5f, 0xc3, 0xbb, 0xd0, 0x94, + 0xce, 0xca, 0x7b, 0x9b, 0xc2, 0xf6, 0x55, 0x94, 0x50, 0x2f, 0xf6, 0xa3, 0xe0, 0x3b, 0x9d, 0x5f, + 0x66, 0x1e, 0x25, 0xe7, 0x0d, 0x34, 0xe5, 0x39, 0x35, 0xd1, 0x28, 0xcf, 0xca, 0x8f, 0x22, 0xf0, + 0x8e, 0x44, 0xaf, 0xda, 0xae, 0x5e, 0x68, 0x3b, 0x4c, 0x60, 0x4b, 0xbd, 0xc1, 0x79, 0xcc, 0x8f, + 0xe3, 0x34, 0x9a, 0xff, 0x53, 0x91, 0xfc, 0x1d, 0xeb, 0xab, 0x77, 0x7c, 0x35, 0x85, 0x56, 0xde, + 0x75, 0xa8, 0x03, 0x1b, 0x1f, 0xec, 0xe3, 0xe9, 0xd5, 0xe9, 0xa7, 0x7e, 0x0d, 0x01, 0x18, 0x8e, + 0x7d, 0x38, 0x75, 0xed, 0xbe, 0x86, 0xfe, 0x83, 0x9e, 0x7b, 0x79, 0x35, 0x75, 0x3f, 0x5e, 0xab, + 0x54, 0x1d, 0xb5, 0xa1, 0x79, 0x66, 0x3b, 0x27, 0x76, 0x5f, 0x9f, 0xfc, 0xd0, 0x01, 0xb9, 0xa2, + 0xb6, 0xb8, 0x87, 0x13, 0x59, 0x1a, 0x7d, 0x86, 0x46, 0x36, 0xfe, 0xe8, 0x45, 0xb9, 0xbb, 0xc2, + 0x87, 0x64, 0xf0, 0xf2, 0x29, 0x98, 0xea, 0xce, 0x5a, 0x26, 0x9c, 0x8d, 0x44, 0x95, 0x70, 0x61, + 0xa2, 0xab, 0x84, 0x8b, 0x93, 0x85, 0x6b, 0xe8, 0x2b, 0x18, 0x72, 0x14, 0xd0, 0x5e, 0xc5, 0x7c, + 0x17, 0x27, 0x6d, 0x30, 0x7a, 0x1a, 0x58, 0x94, 0x97, 0xed, 0x5b, 0x25, 0xbf, 0x36, 0x79, 0x55, + 0xf2, 0xeb, 0x93, 0x80, 0x6b, 0x87, 0xb7, 0xb0, 0xe3, 0xc5, 0x61, 0x29, 0xe1, 0xb0, 0xab, 0x1e, + 0xe6, 0x22, 0xfb, 0xc0, 0x5f, 0x68, 0x5f, 0x0e, 0xfc, 0x80, 0xdf, 0xa4, 0x33, 0xcb, 0x8b, 0xc3, + 0x71, 0x46, 0x1a, 0x17, 0x48, 0x63, 0xb2, 0x08, 0xd6, 0x62, 0x25, 0x32, 0x16, 0x7f, 0x87, 0xc5, + 0x6c, 0x66, 0x88, 0xc5, 0xeb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x48, 0x81, 0xac, 0xa4, 0x37, + 0x06, 0x00, 0x00, }, } diff --git a/submitqueue/gateway/protopb/gateway_grpc.pb.go b/api/submitqueue/gateway/protopb/gateway_grpc.pb.go similarity index 100% rename from submitqueue/gateway/protopb/gateway_grpc.pb.go rename to api/submitqueue/gateway/protopb/gateway_grpc.pb.go diff --git a/stovepipe/orchestrator/proto/BUILD.bazel b/api/submitqueue/orchestrator/proto/BUILD.bazel similarity index 77% rename from stovepipe/orchestrator/proto/BUILD.bazel rename to api/submitqueue/orchestrator/proto/BUILD.bazel index 62aa615e..6eb1b53b 100644 --- a/stovepipe/orchestrator/proto/BUILD.bazel +++ b/api/submitqueue/orchestrator/proto/BUILD.bazel @@ -20,7 +20,7 @@ go_proto_library( "@rules_go//proto:go_proto", "@rules_go//proto:go_grpc_v2", ], - importpath = "github.com/uber/submitqueue/stovepipe/orchestrator/proto", + importpath = "github.com/uber/submitqueue/api/submitqueue/orchestrator/proto", proto = ":orchestratorpb_proto", visibility = ["//visibility:public"], ) @@ -28,13 +28,13 @@ go_proto_library( go_library( name = "proto", embed = [":orchestratorpb_go_proto"], - importpath = "github.com/uber/submitqueue/stovepipe/orchestrator/proto", + importpath = "github.com/uber/submitqueue/api/submitqueue/orchestrator/proto", visibility = ["//visibility:public"], ) go_library( name = "protopb", embed = [":orchestratorpb_go_proto"], - importpath = "github.com/uber/submitqueue/stovepipe/orchestrator/protopb", + importpath = "github.com/uber/submitqueue/api/submitqueue/orchestrator/protopb", visibility = ["//visibility:public"], ) diff --git a/submitqueue/orchestrator/proto/orchestrator.proto b/api/submitqueue/orchestrator/proto/orchestrator.proto similarity index 94% rename from submitqueue/orchestrator/proto/orchestrator.proto rename to api/submitqueue/orchestrator/proto/orchestrator.proto index f1723804..33475653 100644 --- a/submitqueue/orchestrator/proto/orchestrator.proto +++ b/api/submitqueue/orchestrator/proto/orchestrator.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package uber.submitqueue.orchestrator; -option go_package = "github.com/uber/submitqueue/submitqueue/orchestrator/protopb"; +option go_package = "github.com/uber/submitqueue/api/submitqueue/orchestrator/protopb"; option java_multiple_files = true; option java_outer_classname = "OrchestratorProto"; option java_package = "com.uber.submitqueue.orchestrator"; diff --git a/stovepipe/orchestrator/protopb/BUILD.bazel b/api/submitqueue/orchestrator/protopb/BUILD.bazel similarity index 90% rename from stovepipe/orchestrator/protopb/BUILD.bazel rename to api/submitqueue/orchestrator/protopb/BUILD.bazel index ec1bb9b0..98a49a65 100644 --- a/stovepipe/orchestrator/protopb/BUILD.bazel +++ b/api/submitqueue/orchestrator/protopb/BUILD.bazel @@ -7,7 +7,7 @@ go_library( "orchestrator.pb.yarpc.go", "orchestrator_grpc.pb.go", ], - importpath = "github.com/uber/submitqueue/stovepipe/orchestrator/protopb", + importpath = "github.com/uber/submitqueue/api/submitqueue/orchestrator/protopb", visibility = ["//visibility:public"], deps = [ "@org_golang_google_grpc//:grpc", diff --git a/submitqueue/orchestrator/protopb/orchestrator.pb.go b/api/submitqueue/orchestrator/protopb/orchestrator.pb.go similarity index 98% rename from submitqueue/orchestrator/protopb/orchestrator.pb.go rename to api/submitqueue/orchestrator/protopb/orchestrator.pb.go index 671f4f48..156fba65 100644 --- a/submitqueue/orchestrator/protopb/orchestrator.pb.go +++ b/api/submitqueue/orchestrator/protopb/orchestrator.pb.go @@ -168,8 +168,8 @@ const file_orchestrator_proto_rawDesc = "" + "\ttimestamp\x18\x03 \x01(\x03R\ttimestamp\x12\x1a\n" + "\bhostname\x18\x04 \x01(\tR\bhostname2|\n" + "\x17SubmitQueueOrchestrator\x12a\n" + - "\x04Ping\x12*.uber.submitqueue.orchestrator.PingRequest\x1a+.uber.submitqueue.orchestrator.PingResponse\"\x00Bv\n" + - "!com.uber.submitqueue.orchestratorB\x11OrchestratorProtoP\x01Z