fix(conflict): Remove merge strategy from Tango changed-targets request

Author: manjari25

submitqueue/extension/conflict/tango/BUILD.bazel

@@ -17,7 +17,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//platform/base/change:go_default_library",
-        "//platform/base/mergestrategy:go_default_library",
         "@org_uber_go_mock//gomock:go_default_library",
     ],
 )
@@ -33,7 +32,6 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//platform/base/change:go_default_library",
-        "//platform/base/mergestrategy:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
     ],

submitqueue/extension/conflict/tango/request.go

@@ -20,7 +20,6 @@ import (
 	"context"
 
 	"github.com/uber/submitqueue/platform/base/change"
-	"github.com/uber/submitqueue/platform/base/mergestrategy"
 )
 
 // ChangedTargetsRequest asks which targets change when Changes are applied on
@@ -34,9 +33,6 @@ type ChangedTargetsRequest struct {
 
 	// ChangeURIs lists every change to apply, in batch order.
 	ChangeURIs []string
-
-	// Strategy is the merge strategy used to apply the changes.
-	Strategy mergestrategy.MergeStrategy
 }
 
 // ChangedTargetsClient returns the targets a request affects. An adapter owns
@@ -50,7 +46,7 @@ type ChangedTargetsClient interface {
 
 // Base is the newest revision of a queue's target branch.
 type Base struct {
-	// Remote is the repository remote the revision lives on.
+	// Remote names the repository in the form the ChangedTargetsClient expects.
 	Remote string
 
 	// Revision is the full commit SHA of the branch tip.
@@ -63,10 +59,10 @@ type BaseResolver interface {
 	Base(ctx context.Context, queue string) (Base, error)
 }
 
-func changedTargetsRequestFor(base Base, strategy mergestrategy.MergeStrategy, changes []change.Change) ChangedTargetsRequest {
+func changedTargetsRequestFor(base Base, changes []change.Change) ChangedTargetsRequest {
 	var uris []string
 	for _, c := range changes {
 		uris = append(uris, c.URIs...)
 	}
-	return ChangedTargetsRequest{Remote: base.Remote, BaseRevision: base.Revision, ChangeURIs: uris, Strategy: strategy}
+	return ChangedTargetsRequest{Remote: base.Remote, BaseRevision: base.Revision, ChangeURIs: uris}
 }

submitqueue/extension/conflict/tango/request_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/uber/submitqueue/platform/base/change"
-	"github.com/uber/submitqueue/platform/base/mergestrategy"
 )
 
 func TestChangedTargetsRequestFor(t *testing.T) {
@@ -41,13 +40,12 @@ func TestChangedTargetsRequestFor(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := changedTargetsRequestFor(base, mergestrategy.MergeStrategySquashRebase, tt.changes)
+			got := changedTargetsRequestFor(base, tt.changes)
 
 			assert.Equal(t, ChangedTargetsRequest{
 				Remote:       base.Remote,
 				BaseRevision: base.Revision,
 				ChangeURIs:   tt.want,
-				Strategy:     mergestrategy.MergeStrategySquashRebase,
 			}, got)
 		})
 	}