Skip to content

Commit fb875aa

Browse files
committed
rebased main because files moved
1 parent 8d2a2dd commit fb875aa

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

submitqueue/extension/changeprovider/phabricator/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ go_library(
1010
importpath = "github.com/uber/submitqueue/submitqueue/extension/changeprovider/phabricator",
1111
visibility = ["//visibility:public"],
1212
deps = [
13-
"//core/metrics",
14-
"//entity/change/phabricator",
13+
"//platform/base/change/phabricator",
14+
"//platform/metrics",
1515
"//submitqueue/entity",
1616
"//submitqueue/extension/changeprovider",
1717
"@com_github_uber_go_tally//:tally",
@@ -28,8 +28,8 @@ go_test(
2828
],
2929
embed = [":phabricator"],
3030
deps = [
31-
"//entity/change",
32-
"//entity/change/phabricator",
31+
"//platform/base/change",
32+
"//platform/base/change/phabricator",
3333
"//submitqueue/entity",
3434
"//submitqueue/extension/changeprovider",
3535
"@com_github_stretchr_testify//assert",

submitqueue/extension/changeprovider/phabricator/convert.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package phabricator
33
import (
44
"strconv"
55

6-
entityphab "github.com/uber/submitqueue/entity/change/phabricator"
6+
changephab "github.com/uber/submitqueue/platform/base/change/phabricator"
77
"github.com/uber/submitqueue/submitqueue/entity"
88
)
99

1010
// convertToChangeInfo converts a Phabricator diff result to an entity.ChangeInfo.
11-
func convertToChangeInfo(parsed entityphab.ChangeID, diff *diffResult) entity.ChangeInfo {
11+
func convertToChangeInfo(parsed changephab.ChangeID, diff *diffResult) entity.ChangeInfo {
1212
return entity.ChangeInfo{
1313
URI: parsed.String(),
1414
Details: entity.ChangeDetails{

submitqueue/extension/changeprovider/phabricator/convert_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55

66
"github.com/stretchr/testify/assert"
77

8-
entityphab "github.com/uber/submitqueue/entity/change/phabricator"
8+
changephab "github.com/uber/submitqueue/platform/base/change/phabricator"
99
"github.com/uber/submitqueue/submitqueue/entity"
1010
)
1111

1212
func TestConvertToChangeInfo(t *testing.T) {
13-
parsed := entityphab.ChangeID{Scheme: "phab", RevisionID: 12345, DiffID: 100}
13+
parsed := changephab.ChangeID{Scheme: "phab", RevisionID: 12345, DiffID: 100}
1414
diff := &diffResult{
1515
AuthorName: "Alice",
1616
AuthorEmail: "alice@example.com",

submitqueue/extension/changeprovider/phabricator/provider.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/uber-go/tally"
99
"go.uber.org/zap"
1010

11-
coremetrics "github.com/uber/submitqueue/core/metrics"
12-
entityphab "github.com/uber/submitqueue/entity/change/phabricator"
11+
changephab "github.com/uber/submitqueue/platform/base/change/phabricator"
12+
coremetrics "github.com/uber/submitqueue/platform/metrics"
1313
"github.com/uber/submitqueue/submitqueue/entity"
1414
"github.com/uber/submitqueue/submitqueue/extension/changeprovider"
1515
)
@@ -53,9 +53,9 @@ func (p *provider) Get(ctx context.Context, request entity.Request) (_ []entity.
5353

5454
change := request.Change
5555

56-
changeIDs := make([]entityphab.ChangeID, 0, len(change.URIs))
56+
changeIDs := make([]changephab.ChangeID, 0, len(change.URIs))
5757
for _, uri := range change.URIs {
58-
parsed, err := entityphab.ParseChangeID(uri)
58+
parsed, err := changephab.ParseChangeID(uri)
5959
if err != nil {
6060
return nil, fmt.Errorf("failed to parse Phabricator change ID %q: %w", uri, err)
6161
}
@@ -93,7 +93,7 @@ func (p *provider) Get(ctx context.Context, request entity.Request) (_ []entity.
9393
}
9494

9595
// fetchAllDiffs fetches diff data for all change IDs in batches of queryDiffsBatchSize.
96-
func (p *provider) fetchAllDiffs(ctx context.Context, changeIDs []entityphab.ChangeID) (map[int]*diffResult, error) {
96+
func (p *provider) fetchAllDiffs(ctx context.Context, changeIDs []changephab.ChangeID) (map[int]*diffResult, error) {
9797
diffIDs := make([]int, 0, len(changeIDs))
9898
for _, cid := range changeIDs {
9999
diffIDs = append(diffIDs, cid.DiffID)

submitqueue/extension/changeprovider/phabricator/provider_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/uber-go/tally"
1414
"go.uber.org/zap/zaptest"
1515

16-
"github.com/uber/submitqueue/entity/change"
16+
"github.com/uber/submitqueue/platform/base/change"
1717
"github.com/uber/submitqueue/submitqueue/entity"
1818
"github.com/uber/submitqueue/submitqueue/extension/changeprovider"
1919
)

0 commit comments

Comments
 (0)