added stringsutil package

Signed-off-by: Miguel Ángel Ortuño <ortuman@gmail.com>

cache/compression.go

@@ -11,6 +11,8 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/golang/snappy"
+
+	stringsutil "github.com/grafana/dskit/util/strings"
 )
 
 const (
@@ -33,7 +35,7 @@ func (cfg *CompressionConfig) RegisterFlagsWithPrefix(f *flag.FlagSet, prefix st
 }
 
 func (cfg *CompressionConfig) Validate() error {
-	if cfg.Compression != "" && !strSliceContains(supportedCompressions, cfg.Compression) {
+	if cfg.Compression != "" && !stringsutil.SliceContains(supportedCompressions, cfg.Compression) {
 		return errUnsupportedCompression
 	}
 	return nil
@@ -93,12 +95,3 @@ func (s *snappyCache) Fetch(ctx context.Context, keys []string) map[string][]byt
 func (s *snappyCache) Name() string {
 	return s.next.Name()
 }
-
-func strSliceContains(slice []string, s string) bool {
-	for _, v := range slice {
-		if v == s {
-			return true
-		}
-	}
-	return false
-}

ring/ring.go

@@ -21,11 +21,11 @@ import (
 
 	"github.com/grafana/dskit/kv"
 	shardUtil "github.com/grafana/dskit/ring/shard"
-	"github.com/grafana/dskit/ring/util"
 	"github.com/grafana/dskit/services"
 
 	"github.com/grafana/dskit/flagext"
 	dsmath "github.com/grafana/dskit/internal/math"
+	stringsutil "github.com/grafana/dskit/util/strings"
 )
 
 const (
@@ -291,7 +291,7 @@ func (r *Ring) updateRingState(ringDesc *Desc) {
 	// Filter out all instances belonging to excluded zones.
 	if len(r.cfg.ExcludedZones) > 0 {
 		for instanceID, instance := range ringDesc.Ingesters {
-			if util.StringsContain(r.cfg.ExcludedZones, instance.Zone) {
+			if stringsutil.SliceContains(r.cfg.ExcludedZones, instance.Zone) {
 				delete(ringDesc.Ingesters, instanceID)
 			}
 		}
@@ -364,13 +364,13 @@ func (r *Ring) Get(key uint32, op Operation, bufDescs []InstanceDesc, bufHosts,
 		}
 
 		// We want n *distinct* instances && distinct zones.
-		if util.StringsContain(distinctHosts, info.InstanceID) {
+		if stringsutil.SliceContains(distinctHosts, info.InstanceID) {
 			continue
 		}
 
 		// Ignore if the instances don't have a zone set.
 		if r.cfg.ZoneAwarenessEnabled && info.Zone != "" {
-			if util.StringsContain(distinctZones, info.Zone) {
+			if stringsutil.SliceContains(distinctZones, info.Zone) {
 				continue
 			}
 		}

util/strings/strings.go

@@ -0,0 +1,12 @@
+package stringsutil
+
+// SliceContains returns true if the search value is within the list of input values.
+func SliceContains(values []string, search string) bool {
+	for _, v := range values {
+		if search == v {
+			return true
+		}
+	}
+
+	return false
+}