land entry pkg change

Author: kevinlnew

extension/landprovider/github/land.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/uber-go/tally/v4"
+	"github.com/uber/submitqueue/entity"
 	entitygithub "github.com/uber/submitqueue/entity/github"
 	"github.com/uber/submitqueue/extension/landprovider"
 	"go.uber.org/zap"
@@ -56,7 +57,7 @@ func NewLandProvider(params Params) landprovider.LandProvider {
 // Returns an error if entries contain more than one PR, since merging multiple PRs
 // is not idempotent — a partial failure leaves already-merged PRs in a state that
 // cannot be retried.
-func (l *landProvider) Land(ctx context.Context, queue string, entries []landprovider.LandEntry) error {
+func (l *landProvider) Land(ctx context.Context, queue string, entries []entity.LandEntry) error {
 	l.metricsScope.Counter("land_started").Inc(1)
 
 	if err := validateSinglePR(entries); err != nil {

extension/landprovider/github/land_test.go

@@ -40,8 +40,8 @@ func mergeHandler(t *testing.T, statusCode int, message string) http.HandlerFunc
 }
 
 func TestLandProvider_Land(t *testing.T) {
-	singleEntry := func(uri string) []landprovider.LandEntry {
-		return []landprovider.LandEntry{{
+	singleEntry := func(uri string) []entity.LandEntry {
+		return []entity.LandEntry{{
 			Strategy: entity.RequestLandStrategyRebase,
 			Change:   entity.Change{URIs: []string{uri}},
 		}}
@@ -50,7 +50,7 @@ func TestLandProvider_Land(t *testing.T) {
 	tests := []struct {
 		name     string
 		handler  http.HandlerFunc
-		entries  []landprovider.LandEntry
+		entries  []entity.LandEntry
 		wantErr  bool
 		rejected bool
 	}{

extension/landprovider/github/validate.go

@@ -3,13 +3,13 @@ package github
 import (
 	"fmt"
 
-	"github.com/uber/submitqueue/extension/landprovider"
+	"github.com/uber/submitqueue/entity"
 )
 
 // validateSinglePR ensures entries contain exactly one PR.
 // This implementation does not support batch landing because the GitHub merge API
 // operates on individual PRs, making multi-PR landing non-idempotent on retry.
-func validateSinglePR(entries []landprovider.LandEntry) error {
+func validateSinglePR(entries []entity.LandEntry) error {
 	if len(entries) == 0 {
 		return fmt.Errorf("no entries to land")
 	}

extension/landprovider/github/validate_test.go

@@ -6,46 +6,45 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/uber/submitqueue/entity"
-	"github.com/uber/submitqueue/extension/landprovider"
 )
 
 func TestValidateSinglePR(t *testing.T) {
-	validEntry := landprovider.LandEntry{
+	validEntry := entity.LandEntry{
 		Strategy: entity.RequestLandStrategyRebase,
 		Change:   entity.Change{URIs: []string{"github://uber/repo/1/abc123"}},
 	}
 
 	tests := []struct {
 		name    string
-		entries []landprovider.LandEntry
+		entries []entity.LandEntry
 		wantErr bool
 	}{
 		{
 			name:    "single entry single URI",
-			entries: []landprovider.LandEntry{validEntry},
+			entries: []entity.LandEntry{validEntry},
 		},
 		{
 			// len(entries) == 0
 			name:    "no entries",
-			entries: []landprovider.LandEntry{},
+			entries: []entity.LandEntry{},
 			wantErr: true,
 		},
 		{
 			// totalURIs == 0
 			name:    "entry with no URIs",
-			entries: []landprovider.LandEntry{{Strategy: entity.RequestLandStrategyRebase, Change: entity.Change{URIs: []string{}}}},
+			entries: []entity.LandEntry{{Strategy: entity.RequestLandStrategyRebase, Change: entity.Change{URIs: []string{}}}},
 			wantErr: true,
 		},
 		{
 			// totalURIs > 1 via multiple entries
 			name:    "multiple entries",
-			entries: []landprovider.LandEntry{validEntry, validEntry},
+			entries: []entity.LandEntry{validEntry, validEntry},
 			wantErr: true,
 		},
 		{
 			// totalURIs > 1 via multiple URIs in one entry
 			name: "multiple URIs in single entry",
-			entries: []landprovider.LandEntry{{
+			entries: []entity.LandEntry{{
 				Strategy: entity.RequestLandStrategyRebase,
 				Change:   entity.Change{URIs: []string{"github://uber/repo/1/sha1", "github://uber/repo/2/sha2"}},
 			}},
@@ -54,7 +53,7 @@ func TestValidateSinglePR(t *testing.T) {
 		{
 			// len(entries[0].Change.URIs) == 0 with URI in second entry
 			name: "first entry empty second has URI",
-			entries: []landprovider.LandEntry{
+			entries: []entity.LandEntry{
 				{Strategy: entity.RequestLandStrategyRebase, Change: entity.Change{URIs: []string{}}},
 				validEntry,
 			},