From 3ae3f5bf3d4ea214df09ade32911d61c0ab5088e Mon Sep 17 00:00:00 2001 From: Preetam Dwivedi Date: Mon, 17 Aug 2026 00:10:50 -0700 Subject: [PATCH] refactor(git): relocate platform/gitexec under platform/git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the shared git-exec package and its pinned-git test helper under a single platform/git umbrella: platform/gitexec becomes platform/git/exec, and platform/gitexec/gitexectest becomes platform/git/exectest — a sibling rather than nested, so the path no longer doubles "gitexec". Package names are unchanged (gitexec, gitexectest), so this is an import-path move only: no call sites and no behavior change. It is the first step toward housing the change provider's bare-copy repo and auth plumbing alongside the shared git-exec package. --- platform/{gitexec => git/exec}/BUILD.bazel | 2 +- platform/{gitexec => git/exec}/gitexec.go | 0 platform/{gitexec/gitexectest => git/exectest}/BUILD.bazel | 2 +- .../{gitexec/gitexectest => git/exectest}/gitexectest.go | 0 runway/extension/merger/git/BUILD.bazel | 2 +- runway/extension/merger/git/git_merger_test.go | 2 +- service/runway/server/BUILD.bazel | 2 +- service/runway/server/checkout_test.go | 2 +- service/submitqueue/demo/requests/BUILD.bazel | 6 +++--- service/submitqueue/demo/requests/git.go | 2 +- service/submitqueue/demo/requests/main.go | 2 +- service/submitqueue/demo/requests/source_test.go | 4 ++-- service/submitqueue/orchestrator/server/BUILD.bazel | 2 +- service/submitqueue/orchestrator/server/config_test.go | 2 +- submitqueue/extension/changeprovider/git/BUILD.bazel | 2 +- submitqueue/extension/changeprovider/git/provider_test.go | 2 +- test/e2e/submitqueue/BUILD.bazel | 2 +- test/e2e/submitqueue/git_suite_test.go | 2 +- tool/gitsandbox/BUILD.bazel | 6 +++--- tool/gitsandbox/main.go | 2 +- tool/gitsandbox/main_test.go | 4 ++-- 21 files changed, 25 insertions(+), 25 deletions(-) rename platform/{gitexec => git/exec}/BUILD.bazel (70%) rename platform/{gitexec => git/exec}/gitexec.go (100%) rename platform/{gitexec/gitexectest => git/exectest}/BUILD.bazel (75%) rename platform/{gitexec/gitexectest => git/exectest}/gitexectest.go (100%) diff --git a/platform/gitexec/BUILD.bazel b/platform/git/exec/BUILD.bazel similarity index 70% rename from platform/gitexec/BUILD.bazel rename to platform/git/exec/BUILD.bazel index 0f88bbca6..e506f08b9 100644 --- a/platform/gitexec/BUILD.bazel +++ b/platform/git/exec/BUILD.bazel @@ -3,6 +3,6 @@ load("@rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["gitexec.go"], - importpath = "github.com/uber/submitqueue/platform/gitexec", + importpath = "github.com/uber/submitqueue/platform/git/exec", visibility = ["//visibility:public"], ) diff --git a/platform/gitexec/gitexec.go b/platform/git/exec/gitexec.go similarity index 100% rename from platform/gitexec/gitexec.go rename to platform/git/exec/gitexec.go diff --git a/platform/gitexec/gitexectest/BUILD.bazel b/platform/git/exectest/BUILD.bazel similarity index 75% rename from platform/gitexec/gitexectest/BUILD.bazel rename to platform/git/exectest/BUILD.bazel index 7ec284139..523d27f5c 100644 --- a/platform/gitexec/gitexectest/BUILD.bazel +++ b/platform/git/exectest/BUILD.bazel @@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["gitexectest.go"], - importpath = "github.com/uber/submitqueue/platform/gitexec/gitexectest", + importpath = "github.com/uber/submitqueue/platform/git/exectest", visibility = ["//visibility:public"], deps = ["@com_github_stretchr_testify//require:go_default_library"], ) diff --git a/platform/gitexec/gitexectest/gitexectest.go b/platform/git/exectest/gitexectest.go similarity index 100% rename from platform/gitexec/gitexectest/gitexectest.go rename to platform/git/exectest/gitexectest.go diff --git a/runway/extension/merger/git/BUILD.bazel b/runway/extension/merger/git/BUILD.bazel index 9d876bf37..cd514bcd3 100644 --- a/runway/extension/merger/git/BUILD.bazel +++ b/runway/extension/merger/git/BUILD.bazel @@ -48,7 +48,7 @@ go_test( "//api/base/mergestrategy/protopb:go_default_library", "//api/runway/messagequeue:go_default_library", "//api/runway/messagequeue/protopb:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exectest:go_default_library", "//runway/extension/merger:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", diff --git a/runway/extension/merger/git/git_merger_test.go b/runway/extension/merger/git/git_merger_test.go index 8dc3763b6..b1e6e2224 100644 --- a/runway/extension/merger/git/git_merger_test.go +++ b/runway/extension/merger/git/git_merger_test.go @@ -35,7 +35,7 @@ import ( mergestrategypb "github.com/uber/submitqueue/api/base/mergestrategy/protopb" runwaymq "github.com/uber/submitqueue/api/runway/messagequeue" runwaypb "github.com/uber/submitqueue/api/runway/messagequeue/protopb" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" "github.com/uber/submitqueue/runway/extension/merger" ) diff --git a/service/runway/server/BUILD.bazel b/service/runway/server/BUILD.bazel index d0c216932..683c4503c 100644 --- a/service/runway/server/BUILD.bazel +++ b/service/runway/server/BUILD.bazel @@ -96,7 +96,7 @@ go_test( }, deps = [ "//api/base/mergestrategy/protopb:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exectest:go_default_library", "//runway/extension/merger/git:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", diff --git a/service/runway/server/checkout_test.go b/service/runway/server/checkout_test.go index 9a11501d6..d85de4536 100644 --- a/service/runway/server/checkout_test.go +++ b/service/runway/server/checkout_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" gitmerger "github.com/uber/submitqueue/runway/extension/merger/git" ) diff --git a/service/submitqueue/demo/requests/BUILD.bazel b/service/submitqueue/demo/requests/BUILD.bazel index e5ffc3475..630398d59 100644 --- a/service/submitqueue/demo/requests/BUILD.bazel +++ b/service/submitqueue/demo/requests/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//platform/base/change/git:go_default_library", "//platform/base/change/github:go_default_library", "//platform/fakemarker:go_default_library", - "//platform/gitexec:go_default_library", + "//platform/git/exec:go_default_library", "//submitqueue/client:go_default_library", "@org_golang_x_sync//errgroup:go_default_library", ], @@ -48,8 +48,8 @@ go_test( deps = [ "//platform/base/change/git:go_default_library", "//platform/fakemarker:go_default_library", - "//platform/gitexec:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exec:go_default_library", + "//platform/git/exectest:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", ], diff --git a/service/submitqueue/demo/requests/git.go b/service/submitqueue/demo/requests/git.go index dec859593..9559d1231 100644 --- a/service/submitqueue/demo/requests/git.go +++ b/service/submitqueue/demo/requests/git.go @@ -22,7 +22,7 @@ import ( "sync" gitchange "github.com/uber/submitqueue/platform/base/change/git" - "github.com/uber/submitqueue/platform/gitexec" + gitexec "github.com/uber/submitqueue/platform/git/exec" "github.com/uber/submitqueue/submitqueue/client" ) diff --git a/service/submitqueue/demo/requests/main.go b/service/submitqueue/demo/requests/main.go index 6f87226c9..afb56898e 100644 --- a/service/submitqueue/demo/requests/main.go +++ b/service/submitqueue/demo/requests/main.go @@ -67,7 +67,7 @@ import ( "time" mergestrategypb "github.com/uber/submitqueue/api/base/mergestrategy/protopb" - "github.com/uber/submitqueue/platform/gitexec" + gitexec "github.com/uber/submitqueue/platform/git/exec" "github.com/uber/submitqueue/submitqueue/client" "golang.org/x/sync/errgroup" ) diff --git a/service/submitqueue/demo/requests/source_test.go b/service/submitqueue/demo/requests/source_test.go index 9577fe1bb..913e48aec 100644 --- a/service/submitqueue/demo/requests/source_test.go +++ b/service/submitqueue/demo/requests/source_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" gitchange "github.com/uber/submitqueue/platform/base/change/git" "github.com/uber/submitqueue/platform/fakemarker" - "github.com/uber/submitqueue/platform/gitexec" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexec "github.com/uber/submitqueue/platform/git/exec" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" ) // quietSpec is a changeSpec whose progress notes go nowhere, for tests that diff --git a/service/submitqueue/orchestrator/server/BUILD.bazel b/service/submitqueue/orchestrator/server/BUILD.bazel index 2f923f2a0..4f7ec2145 100644 --- a/service/submitqueue/orchestrator/server/BUILD.bazel +++ b/service/submitqueue/orchestrator/server/BUILD.bazel @@ -112,7 +112,7 @@ go_test( }, deps = [ "//platform/base/change:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exectest:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/buildrunner:go_default_library", "//submitqueue/extension/changeprovider:go_default_library", diff --git a/service/submitqueue/orchestrator/server/config_test.go b/service/submitqueue/orchestrator/server/config_test.go index b15ce8e6c..2de8278c5 100644 --- a/service/submitqueue/orchestrator/server/config_test.go +++ b/service/submitqueue/orchestrator/server/config_test.go @@ -30,7 +30,7 @@ import ( "go.uber.org/zap/zaptest" "github.com/uber/submitqueue/platform/base/change" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/changeprovider" "github.com/uber/submitqueue/submitqueue/extension/conflict" diff --git a/submitqueue/extension/changeprovider/git/BUILD.bazel b/submitqueue/extension/changeprovider/git/BUILD.bazel index 6d2e25c01..11bc776b4 100644 --- a/submitqueue/extension/changeprovider/git/BUILD.bazel +++ b/submitqueue/extension/changeprovider/git/BUILD.bazel @@ -32,7 +32,7 @@ go_test( }, deps = [ "//platform/base/change:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exectest:go_default_library", "//submitqueue/entity:go_default_library", "//submitqueue/extension/changeprovider:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", diff --git a/submitqueue/extension/changeprovider/git/provider_test.go b/submitqueue/extension/changeprovider/git/provider_test.go index f973dbe1f..d6dbed8cb 100644 --- a/submitqueue/extension/changeprovider/git/provider_test.go +++ b/submitqueue/extension/changeprovider/git/provider_test.go @@ -31,7 +31,7 @@ import ( "go.uber.org/zap" "github.com/uber/submitqueue/platform/base/change" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/submitqueue/extension/changeprovider" ) diff --git a/test/e2e/submitqueue/BUILD.bazel b/test/e2e/submitqueue/BUILD.bazel index 6097a9abd..2733aa86a 100644 --- a/test/e2e/submitqueue/BUILD.bazel +++ b/test/e2e/submitqueue/BUILD.bazel @@ -43,7 +43,7 @@ go_test( "//platform/extension/consumergate:go_default_library", "//platform/extension/consumergate/file:go_default_library", "//platform/extension/messagequeue/mysql:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exectest:go_default_library", "//platform/publish:go_default_library", "//submitqueue/core/batch:go_default_library", "//submitqueue/core/topickey:go_default_library", diff --git a/test/e2e/submitqueue/git_suite_test.go b/test/e2e/submitqueue/git_suite_test.go index 094a9838c..321051ec0 100644 --- a/test/e2e/submitqueue/git_suite_test.go +++ b/test/e2e/submitqueue/git_suite_test.go @@ -44,7 +44,7 @@ import ( changepb "github.com/uber/submitqueue/api/base/change/protopb" mergestrategypb "github.com/uber/submitqueue/api/base/mergestrategy/protopb" gatewaypb "github.com/uber/submitqueue/api/submitqueue/gateway/protopb" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" "github.com/uber/submitqueue/submitqueue/entity" "github.com/uber/submitqueue/test/testutil" "google.golang.org/grpc" diff --git a/tool/gitsandbox/BUILD.bazel b/tool/gitsandbox/BUILD.bazel index f33138dc3..511ede4ca 100644 --- a/tool/gitsandbox/BUILD.bazel +++ b/tool/gitsandbox/BUILD.bazel @@ -5,7 +5,7 @@ go_library( srcs = ["main.go"], importpath = "github.com/uber/submitqueue/tool/gitsandbox", visibility = ["//visibility:private"], - deps = ["//platform/gitexec:go_default_library"], + deps = ["//platform/git/exec:go_default_library"], ) go_binary( @@ -31,8 +31,8 @@ go_test( "SUBMITQUEUE_TEST_GIT": "$(location @git//:git)", }, deps = [ - "//platform/gitexec:go_default_library", - "//platform/gitexec/gitexectest:go_default_library", + "//platform/git/exec:go_default_library", + "//platform/git/exectest:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", ], diff --git a/tool/gitsandbox/main.go b/tool/gitsandbox/main.go index 9160aef6f..e758b15a8 100644 --- a/tool/gitsandbox/main.go +++ b/tool/gitsandbox/main.go @@ -32,7 +32,7 @@ import ( "os" "path/filepath" - "github.com/uber/submitqueue/platform/gitexec" + gitexec "github.com/uber/submitqueue/platform/git/exec" ) // seedFile is committed so the target branch exists with something on it. A diff --git a/tool/gitsandbox/main_test.go b/tool/gitsandbox/main_test.go index b9a762a34..ca1245bbe 100644 --- a/tool/gitsandbox/main_test.go +++ b/tool/gitsandbox/main_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber/submitqueue/platform/gitexec" - "github.com/uber/submitqueue/platform/gitexec/gitexectest" + gitexec "github.com/uber/submitqueue/platform/git/exec" + gitexectest "github.com/uber/submitqueue/platform/git/exectest" ) func TestProvision_SeedsABareRepositoryOnTheTargetBranch(t *testing.T) {