feat(conflict): Rename and iterate the interface contract

Author: manjari25

…on/dependency/conflict/tango/BUILD.bazel …dency/conflict/targetoverlap/BUILD.bazelsubmitqueue/extension/dependency/conflict/tango/BUILD.bazel renamed to submitqueue/extension/dependency/conflict/targetoverlap/BUILD.bazel submitqueue/extension/dependency/conflict/tango/BUILD.bazel renamed to submitqueue/extension/dependency/conflict/targetoverlap/BUILD.bazel

@@ -2,8 +2,8 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["tango.go"],
-    importpath = "github.com/uber/submitqueue/submitqueue/extension/dependency/conflict/tango",
+    srcs = ["targetoverlap.go"],
+    importpath = "github.com/uber/submitqueue/submitqueue/extension/dependency/conflict/targetoverlap",
     visibility = ["//visibility:public"],
     deps = [
         "//submitqueue/entity:go_default_library",
@@ -14,11 +14,12 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = ["tango_test.go"],
+    srcs = ["targetoverlap_test.go"],
     embed = [":go_default_library"],
     deps = [
         "//submitqueue/entity:go_default_library",
         "//submitqueue/extension/conflict:go_default_library",
+        "//submitqueue/extension/dependency/resolver:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
     ],

…nsion/dependency/conflict/tango/tango.go …/conflict/targetoverlap/targetoverlap.gosubmitqueue/extension/dependency/conflict/tango/tango.go renamed to submitqueue/extension/dependency/conflict/targetoverlap/targetoverlap.go submitqueue/extension/dependency/conflict/tango/tango.go renamed to submitqueue/extension/dependency/conflict/targetoverlap/targetoverlap.go

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package tango provides a conflict.Analyzer that reports a conflict between
-// two batches when their changed build targets overlap. The targets a batch
-// affects are resolved through an injected resolver.TargetResolver, whose
-// production implementation calls the Tango service.
-package tango
+// Package targetoverlap provides a conflict.Analyzer that reports a conflict
+// between two batches when their changed build targets overlap. The targets a
+// batch affects are resolved through an injected resolver.TargetResolver,
+// keeping the analyzer independent of any particular target-resolution backend.
+package targetoverlap
 
 import (
 	"context"
@@ -52,7 +52,7 @@ func (a *analyzer) Analyze(ctx context.Context, batch entity.Batch, inFlight []e
 
 	// TODO: when TargetResolver fails, fall back to a queue-configured
 	// analyzer (all or none) instead of propagating the error. The queue config
-	// decides whether a Tango outage over-serializes (all) or maximizes
+	// decides whether a resolver outage over-serializes (all) or maximizes
 	// parallelism (none).
 	candidate, err := a.resolve(ctx, batch)
 	if err != nil {
@@ -87,7 +87,7 @@ func (a *analyzer) resolve(ctx context.Context, batch entity.Batch) (map[string]
 
 	keys := make(map[string]struct{}, len(targets))
 	for _, t := range targets {
-		keys[t] = struct{}{}
+		keys[t.Name] = struct{}{}
 	}
 	return keys, nil
 }

…/dependency/conflict/tango/tango_test.go …lict/targetoverlap/targetoverlap_test.gosubmitqueue/extension/dependency/conflict/tango/tango_test.go renamed to submitqueue/extension/dependency/conflict/targetoverlap/targetoverlap_test.go submitqueue/extension/dependency/conflict/tango/tango_test.go renamed to submitqueue/extension/dependency/conflict/targetoverlap/targetoverlap_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tango
+package targetoverlap
 
 import (
 	"context"
@@ -24,6 +24,7 @@ import (
 
 	"github.com/uber/submitqueue/submitqueue/entity"
 	"github.com/uber/submitqueue/submitqueue/extension/conflict"
+	"github.com/uber/submitqueue/submitqueue/extension/dependency/resolver"
 )
 
 // fakeResolver is an in-test TargetResolver that returns pre-configured target
@@ -47,11 +48,16 @@ func (f *fakeResolver) failWith(err error) *fakeResolver {
 	return f
 }
 
-func (f *fakeResolver) ChangedTargets(_ context.Context, batch entity.Batch) ([]string, error) {
+func (f *fakeResolver) ChangedTargets(_ context.Context, batch entity.Batch) ([]resolver.Target, error) {
 	if f.err != nil {
 		return nil, f.err
 	}
-	return f.targets[batch.ID], nil
+	names := f.targets[batch.ID]
+	targets := make([]resolver.Target, len(names))
+	for i, n := range names {
+		targets[i] = resolver.Target{Name: n}
+	}
+	return targets, nil
 }
 
 func cfg() conflict.Config {
@@ -123,14 +129,14 @@ func TestAnalyze(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			resolver := newFakeResolver().set(tt.candidate, tt.candTargets...)
+			r := newFakeResolver().set(tt.candidate, tt.candTargets...)
 			inFlight := make([]entity.Batch, 0, len(tt.inFlight))
 			for _, f := range tt.inFlight {
-				resolver.set(f.id, f.targets...)
+				r.set(f.id, f.targets...)
 				inFlight = append(inFlight, entity.Batch{ID: f.id})
 			}
 
-			got, err := New(cfg(), resolver).Analyze(context.Background(), entity.Batch{ID: tt.candidate}, inFlight)
+			got, err := New(cfg(), r).Analyze(context.Background(), entity.Batch{ID: tt.candidate}, inFlight)
 			require.NoError(t, err)
 
 			var ids []string
@@ -150,17 +156,17 @@ func TestAnalyze_EmptyInFlight(t *testing.T) {
 }
 
 func TestAnalyze_ResolverError(t *testing.T) {
-	sentinel := errors.New("tango unavailable")
+	sentinel := errors.New("resolver unavailable")
 
 	t.Run("candidate resolution fails", func(t *testing.T) {
-		resolver := newFakeResolver().failWith(sentinel)
-		_, err := New(cfg(), resolver).Analyze(context.Background(), entity.Batch{ID: "cand"}, []entity.Batch{{ID: "x"}})
+		r := newFakeResolver().failWith(sentinel)
+		_, err := New(cfg(), r).Analyze(context.Background(), entity.Batch{ID: "cand"}, []entity.Batch{{ID: "x"}})
 		require.ErrorIs(t, err, sentinel)
 	})
 
 	t.Run("in-flight resolution fails", func(t *testing.T) {
-		resolver := newFakeResolver().set("cand", "//foo:lib").failWith(sentinel)
-		_, err := New(cfg(), resolver).Analyze(context.Background(), entity.Batch{ID: "cand"}, []entity.Batch{{ID: "x"}})
+		r := newFakeResolver().set("cand", "//foo:lib").failWith(sentinel)
+		_, err := New(cfg(), r).Analyze(context.Background(), entity.Batch{ID: "cand"}, []entity.Batch{{ID: "x"}})
 		require.ErrorIs(t, err, sentinel)
 	})
 }

submitqueue/extension/dependency/resolver/targetresolver.go

@@ -16,7 +16,7 @@
 // of build targets a batch affects. The interface is deliberately free of
 // Tango wire types so that each deployment can provide its own adapter against
 // whatever proto import path its monorepo uses — the analyzer sees only batch
-// identity in and target names out.
+// identity in and targets out.
 package resolver
 
 import (
@@ -25,9 +25,19 @@ import (
 	"github.com/uber/submitqueue/submitqueue/entity"
 )
 
+// Target is a build target a batch affects.
+type Target struct {
+	// Name identifies the target (e.g. "//service/foo:lib").
+	Name string
+	// Attributes carries backend-specific metadata the analyzer does not
+	// interpret today. Future consumers (e.g. conflict relaxation) can read
+	// keys like "distance" or "rule_type" without an interface change.
+	Attributes map[string]string
+}
+
 // TargetResolver resolves the set of build targets a batch affects. The
 // production implementation translates the batch's changes into a Tango
 // GetChangedTargets call; tests supply a fake.
 type TargetResolver interface {
-	ChangedTargets(ctx context.Context, batch entity.Batch) ([]string, error)
+	ChangedTargets(ctx context.Context, batch entity.Batch) ([]Target, error)
 }