remove duplicate RingMock

pkg/compactor/partition_compaction_grouper_test.go

@@ -2056,11 +2056,11 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) {
 					{Addr: "test-addr"},
 				},
 			}
-			subring := &RingMock{}
+			subring := &ring.RingMock{}
 			subring.On("GetAllHealthy", mock.Anything).Return(rs, nil)
 			subring.On("Get", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(rs, nil)
 
-			ring := &RingMock{}
+			ring := &ring.RingMock{}
 			ring.On("ShuffleShard", mock.Anything, mock.Anything).Return(subring, nil)
 
 			registerer := prometheus.NewPedanticRegistry()

pkg/compactor/shuffle_sharding_grouper_test.go

@@ -338,11 +338,11 @@ func TestShuffleShardingGrouper_Groups(t *testing.T) {
 					{Addr: "test-addr"},
 				},
 			}
-			subring := &RingMock{}
+			subring := &ring.RingMock{}
 			subring.On("GetAllHealthy", mock.Anything).Return(rs, nil)
 			subring.On("Get", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(rs, nil)
 
-			ring := &RingMock{}
+			ring := &ring.RingMock{}
 			ring.On("ShuffleShard", mock.Anything, mock.Anything).Return(subring, nil)
 
 			registerer := prometheus.NewPedanticRegistry()
@@ -737,74 +737,3 @@ func TestBlocksGroup_overlaps(t *testing.T) {
 		assert.Equal(t, tc.expected, tc.second.overlaps(tc.first))
 	}
 }
-
-type RingMock struct {
-	mock.Mock
-}
-
-func (r *RingMock) GetInstanceIdByAddr(addr string) (string, error) {
-	return "", nil
-}
-
-func (r *RingMock) Collect(ch chan<- prometheus.Metric) {}
-
-func (r *RingMock) Describe(ch chan<- *prometheus.Desc) {}
-
-func (r *RingMock) Get(key uint32, op ring.Operation, bufDescs []ring.InstanceDesc, bufHosts []string, bufZones map[string]int) (ring.ReplicationSet, error) {
-	args := r.Called(key, op, bufDescs, bufHosts, bufZones)
-	return args.Get(0).(ring.ReplicationSet), args.Error(1)
-}
-
-func (r *RingMock) GetAllHealthy(op ring.Operation) (ring.ReplicationSet, error) {
-	args := r.Called(op)
-	return args.Get(0).(ring.ReplicationSet), args.Error(1)
-}
-
-func (r *RingMock) GetInstanceDescsForOperation(op ring.Operation) (map[string]ring.InstanceDesc, error) {
-	args := r.Called(op)
-	return args.Get(0).(map[string]ring.InstanceDesc), args.Error(1)
-}
-
-func (r *RingMock) GetAllInstanceDescs(op ring.Operation) ([]ring.InstanceDesc, []ring.InstanceDesc, error) {
-	args := r.Called(op)
-	return args.Get(0).([]ring.InstanceDesc), make([]ring.InstanceDesc, 0), args.Error(1)
-}
-
-func (r *RingMock) GetReplicationSetForOperation(op ring.Operation) (ring.ReplicationSet, error) {
-	args := r.Called(op)
-	return args.Get(0).(ring.ReplicationSet), args.Error(1)
-}
-
-func (r *RingMock) ReplicationFactor() int {
-	return 0
-}
-
-func (r *RingMock) InstancesCount() int {
-	return 0
-}
-
-func (r *RingMock) ShuffleShard(identifier string, size int) ring.ReadRing {
-	args := r.Called(identifier, size)
-	return args.Get(0).(ring.ReadRing)
-}
-
-func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ring.ReadRing {
-	args := r.Called(identifier, size)
-	return args.Get(0).(ring.ReadRing)
-}
-
-func (r *RingMock) GetInstanceState(instanceID string) (ring.InstanceState, error) {
-	args := r.Called(instanceID)
-	return args.Get(0).(ring.InstanceState), args.Error(1)
-}
-
-func (r *RingMock) ShuffleShardWithLookback(identifier string, size int, lookbackPeriod time.Duration, now time.Time) ring.ReadRing {
-	args := r.Called(identifier, size, lookbackPeriod, now)
-	return args.Get(0).(ring.ReadRing)
-}
-
-func (r *RingMock) HasInstance(instanceID string) bool {
-	return true
-}
-
-func (r *RingMock) CleanupShuffleShardCache(identifier string) {}

pkg/ring/mock.go

@@ -0,0 +1,79 @@
+package ring
+
+import (
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/stretchr/testify/mock"
+)
+
+type RingMock struct {
+	mock.Mock
+}
+
+func (r *RingMock) GetInstanceIdByAddr(addr string) (string, error) {
+	return "", nil
+}
+
+func (r *RingMock) Collect(ch chan<- prometheus.Metric) {}
+
+func (r *RingMock) Describe(ch chan<- *prometheus.Desc) {}
+
+func (r *RingMock) Get(key uint32, op Operation, bufDescs []InstanceDesc, bufHosts []string, bufZones map[string]int) (ReplicationSet, error) {
+	args := r.Called(key, op, bufDescs, bufHosts, bufZones)
+	return args.Get(0).(ReplicationSet), args.Error(1)
+}
+
+func (r *RingMock) GetAllHealthy(op Operation) (ReplicationSet, error) {
+	args := r.Called(op)
+	return args.Get(0).(ReplicationSet), args.Error(1)
+}
+
+func (r *RingMock) GetInstanceDescsForOperation(op Operation) (map[string]InstanceDesc, error) {
+	args := r.Called(op)
+	return args.Get(0).(map[string]InstanceDesc), args.Error(1)
+}
+
+func (r *RingMock) GetAllInstanceDescs(op Operation) ([]InstanceDesc, []InstanceDesc, error) {
+	args := r.Called(op)
+	return args.Get(0).([]InstanceDesc), make([]InstanceDesc, 0), args.Error(1)
+}
+
+func (r *RingMock) GetReplicationSetForOperation(op Operation) (ReplicationSet, error) {
+	args := r.Called(op)
+	return args.Get(0).(ReplicationSet), args.Error(1)
+}
+
+func (r *RingMock) ReplicationFactor() int {
+	return 0
+}
+
+func (r *RingMock) InstancesCount() int {
+	return 0
+}
+
+func (r *RingMock) ShuffleShard(identifier string, size int) ReadRing {
+	args := r.Called(identifier, size)
+	return args.Get(0).(ReadRing)
+}
+
+func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ReadRing {
+	args := r.Called(identifier, size)
+	return args.Get(0).(ReadRing)
+}
+
+func (r *RingMock) GetInstanceState(instanceID string) (InstanceState, error) {
+	args := r.Called(instanceID)
+	return args.Get(0).(InstanceState), args.Error(1)
+}
+
+func (r *RingMock) ShuffleShardWithLookback(identifier string, size int, lookbackPeriod time.Duration, now time.Time) ReadRing {
+	args := r.Called(identifier, size, lookbackPeriod, now)
+	return args.Get(0).(ReadRing)
+}
+
+func (r *RingMock) HasInstance(instanceID string) bool {
+	return true
+}
+
+func (r *RingMock) CleanupShuffleShardCache(identifier string) {}

pkg/ring/util_test.go

@@ -7,83 +7,11 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
-type RingMock struct {
-	mock.Mock
-}
-
-func (r *RingMock) GetInstanceIdByAddr(addr string) (string, error) {
-	return "", nil
-}
-
-func (r *RingMock) Collect(ch chan<- prometheus.Metric) {}
-
-func (r *RingMock) Describe(ch chan<- *prometheus.Desc) {}
-
-func (r *RingMock) Get(key uint32, op Operation, bufDescs []InstanceDesc, bufHosts []string, bufZones map[string]int) (ReplicationSet, error) {
-	args := r.Called(key, op, bufDescs, bufHosts, bufZones)
-	return args.Get(0).(ReplicationSet), args.Error(1)
-}
-
-func (r *RingMock) GetAllHealthy(op Operation) (ReplicationSet, error) {
-	args := r.Called(op)
-	return args.Get(0).(ReplicationSet), args.Error(1)
-}
-
-func (r *RingMock) GetInstanceDescsForOperation(op Operation) (map[string]InstanceDesc, error) {
-	args := r.Called(op)
-	return args.Get(0).(map[string]InstanceDesc), args.Error(1)
-}
-
-func (r *RingMock) GetAllInstanceDescs(op Operation) ([]InstanceDesc, []InstanceDesc, error) {
-	args := r.Called(op)
-	return args.Get(0).([]InstanceDesc), make([]InstanceDesc, 0), args.Error(1)
-}
-
-func (r *RingMock) GetReplicationSetForOperation(op Operation) (ReplicationSet, error) {
-	args := r.Called(op)
-	return args.Get(0).(ReplicationSet), args.Error(1)
-}
-
-func (r *RingMock) ReplicationFactor() int {
-	return 0
-}
-
-func (r *RingMock) InstancesCount() int {
-	return 0
-}
-
-func (r *RingMock) ShuffleShard(identifier string, size int) ReadRing {
-	args := r.Called(identifier, size)
-	return args.Get(0).(ReadRing)
-}
-
-func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ReadRing {
-	args := r.Called(identifier, size)
-	return args.Get(0).(ReadRing)
-}
-
-func (r *RingMock) GetInstanceState(instanceID string) (InstanceState, error) {
-	args := r.Called(instanceID)
-	return args.Get(0).(InstanceState), args.Error(1)
-}
-
-func (r *RingMock) ShuffleShardWithLookback(identifier string, size int, lookbackPeriod time.Duration, now time.Time) ReadRing {
-	args := r.Called(identifier, size, lookbackPeriod, now)
-	return args.Get(0).(ReadRing)
-}
-
-func (r *RingMock) HasInstance(instanceID string) bool {
-	return true
-}
-
-func (r *RingMock) CleanupShuffleShardCache(identifier string) {}
-
 func createStartingRing() *Ring {
 	// Init the ring.
 	ringDesc := &Desc{Ingesters: map[string]InstanceDesc{