Moved ReadLifecycler interface definition at the place of consumption

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Author: pracucci

pkg/distributor/ingestion_rate_strategy.go

@@ -1,12 +1,16 @@
 package distributor
 
 import (
-	"github.com/cortexproject/cortex/pkg/ring"
 	"github.com/cortexproject/cortex/pkg/util/limiter"
 	"github.com/cortexproject/cortex/pkg/util/validation"
 	"golang.org/x/time/rate"
 )
 
+// ReadLifecycler represents the read interface to the lifecycler.
+type ReadLifecycler interface {
+	HealthyInstancesCount() int
+}
+
 type localStrategy struct {
 	limits *validation.Overrides
 }
@@ -27,10 +31,10 @@ func (s *localStrategy) Burst(tenantID string) int {
 
 type globalStrategy struct {
 	limits *validation.Overrides
-	ring   ring.ReadLifecycler
+	ring   ReadLifecycler
 }
 
-func newGlobalIngestionRateStrategy(limits *validation.Overrides, ring ring.ReadLifecycler) limiter.RateLimiterStrategy {
+func newGlobalIngestionRateStrategy(limits *validation.Overrides, ring ReadLifecycler) limiter.RateLimiterStrategy {
 	return &globalStrategy{
 		limits: limits,
 		ring:   ring,

pkg/distributor/ingestion_rate_strategy_test.go

@@ -3,18 +3,18 @@ package distributor
 import (
 	"testing"
 
-	"github.com/cortexproject/cortex/pkg/ring"
 	"github.com/cortexproject/cortex/pkg/util/limiter"
 	"github.com/cortexproject/cortex/pkg/util/validation"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/time/rate"
 )
 
 func TestIngestionRateStrategy(t *testing.T) {
 	tests := map[string]struct {
 		limits        validation.Limits
-		ring          ring.ReadLifecycler
+		ring          ReadLifecycler
 		expectedLimit float64
 		expectedBurst int
 	}{
@@ -34,8 +34,8 @@ func TestIngestionRateStrategy(t *testing.T) {
 				IngestionRate:         float64(1000),
 				IngestionBurstSize:    10000,
 			},
-			ring: func() ring.ReadLifecycler {
-				ring := ring.NewReadLifecyclerMock()
+			ring: func() ReadLifecycler {
+				ring := newReadLifecyclerMock()
 				ring.On("HealthyInstancesCount").Return(2)
 				return ring
 			}(),
@@ -81,3 +81,16 @@ func TestIngestionRateStrategy(t *testing.T) {
 		})
 	}
 }
+
+type readLifecyclerMock struct {
+	mock.Mock
+}
+
+func newReadLifecyclerMock() *readLifecyclerMock {
+	return &readLifecyclerMock{}
+}
+
+func (m *readLifecyclerMock) HealthyInstancesCount() int {
+	args := m.Called()
+	return args.Int(0)
+}

pkg/ring/lifecycler.go

@@ -38,11 +38,6 @@ var (
 	}, []string{"op", "status", "name"})
 )
 
-// ReadLifecycler represents the read interface to the lifecycler.
-type ReadLifecycler interface {
-	HealthyInstancesCount() int
-}
-
 // LifecyclerConfig is the config to build a Lifecycler.
 type LifecyclerConfig struct {
 	RingConfig Config `yaml:"ring,omitempty"`