Skip to content

Commit 2a2a129

Browse files
kevinlnewclaude
andcommitted
refactor(runway): rename vcs extension to merger
Rename runway/extension/vcs/ to runway/extension/merger/ per review feedback. Package, file, and mock names updated accordingly. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 50a856e commit 2a2a129

7 files changed

Lines changed: 21 additions & 21 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
load("@rules_go//go:def.bzl", "go_library")
22

33
go_library(
4-
name = "vcs",
5-
srcs = ["vcs.go"],
6-
importpath = "github.com/uber/submitqueue/runway/extension/vcs",
4+
name = "merger",
5+
srcs = ["merger.go"],
6+
importpath = "github.com/uber/submitqueue/runway/extension/merger",
77
visibility = ["//visibility:public"],
88
deps = ["//api/runway/messagequeue"],
99
)
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// Package vcs defines the pluggable interface for version-control operations
16-
// that Runway performs on behalf of its callers. Implementations resolve change
17-
// URIs, apply changes to a target branch, and (for a committing merge) push the
18-
// result and finalize the change lifecycle (e.g. close PRs).
19-
package vcs
15+
// Package merger defines the pluggable interface for version-control merge
16+
// operations that Runway performs on behalf of its callers. Implementations
17+
// resolve change URIs, apply changes to a target branch, and (for a committing
18+
// merge) push the result and finalize the change lifecycle (e.g. close PRs).
19+
package merger
2020

21-
//go:generate mockgen -source=vcs.go -destination=mock/vcs_mock.go -package=mock
21+
//go:generate mockgen -source=merger.go -destination=mock/merger_mock.go -package=mock
2222

2323
import (
2424
"context"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ load("@rules_go//go:def.bzl", "go_library")
22

33
go_library(
44
name = "mock",
5-
srcs = ["vcs_mock.go"],
6-
importpath = "github.com/uber/submitqueue/runway/extension/vcs/mock",
5+
srcs = ["merger_mock.go"],
6+
importpath = "github.com/uber/submitqueue/runway/extension/merger/mock",
77
visibility = ["//visibility:public"],
88
deps = [
99
"//api/runway/messagequeue",
10-
"//runway/extension/vcs",
10+
"//runway/extension/merger",
1111
"@org_uber_go_mock//gomock",
1212
],
1313
)

runway/extension/vcs/mock/vcs_mock.go renamed to runway/extension/merger/mock/merger_mock.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
33
go_library(
44
name = "noop",
55
srcs = ["noop.go"],
6-
importpath = "github.com/uber/submitqueue/runway/extension/vcs/noop",
6+
importpath = "github.com/uber/submitqueue/runway/extension/merger/noop",
77
visibility = ["//visibility:public"],
88
deps = [
99
"//api/runway/messagequeue",
1010
"//api/runway/messagequeue/protopb",
11-
"//runway/extension/vcs",
11+
"//runway/extension/merger",
1212
],
1313
)
1414

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
runwaymq "github.com/uber/submitqueue/api/runway/messagequeue"
2626
runwaypb "github.com/uber/submitqueue/api/runway/messagequeue/protopb"
27-
"github.com/uber/submitqueue/runway/extension/vcs"
27+
"github.com/uber/submitqueue/runway/extension/merger"
2828
)
2929

30-
var _ vcs.Merger = (*Merger)(nil)
30+
var _ merger.Merger = (*Merger)(nil)
3131

3232
// Merger is a no-op implementation that always succeeds.
3333
type Merger struct {

0 commit comments

Comments
 (0)