From 1925d77f65ae4a3d55d1b9bbf72096e43c491da4 Mon Sep 17 00:00:00 2001
From: Travis Patterson <travis.patterson@grafana.com>
Date: Wed, 2 Feb 2022 14:29:04 -0700
Subject: [PATCH] cleanup: consolidate util strings contain functions (#5304)

* Consolidate util strings contain functions

* fix test
---
 clients/pkg/logentry/stages/timestamp.go            |  2 +-
 clients/pkg/promtail/targets/kafka/target_syncer.go |  2 +-
 pkg/util/string.go                                  | 10 ----------
 pkg/util/string_test.go                             |  4 ++--
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/clients/pkg/logentry/stages/timestamp.go b/clients/pkg/logentry/stages/timestamp.go
index 3f96691334..883bf5b80f 100644
--- a/clients/pkg/logentry/stages/timestamp.go
+++ b/clients/pkg/logentry/stages/timestamp.go
@@ -78,7 +78,7 @@ func validateTimestampConfig(cfg *TimestampConfig) (parser, error) {
 	if cfg.ActionOnFailure == nil {
 		cfg.ActionOnFailure = util.StringRef(TimestampActionOnFailureDefault)
 	} else {
-		if !util.StringSliceContains(TimestampActionOnFailureOptions, *cfg.ActionOnFailure) {
+		if !util.StringsContain(TimestampActionOnFailureOptions, *cfg.ActionOnFailure) {
 			return nil, fmt.Errorf(ErrInvalidActionOnFailure, TimestampActionOnFailureOptions)
 		}
 	}
diff --git a/clients/pkg/promtail/targets/kafka/target_syncer.go b/clients/pkg/promtail/targets/kafka/target_syncer.go
index fbb7523b3b..e6769a4620 100644
--- a/clients/pkg/promtail/targets/kafka/target_syncer.go
+++ b/clients/pkg/promtail/targets/kafka/target_syncer.go
@@ -159,7 +159,7 @@ func withSASLAuthentication(cfg sarama.Config, authCfg scrapeconfig.KafkaAuthent
 		sarama.SASLTypeSCRAMSHA256,
 		sarama.SASLTypePlaintext,
 	}
-	if !util.StringSliceContains(supportedMechanism, string(authCfg.SASLConfig.Mechanism)) {
+	if !util.StringsContain(supportedMechanism, string(authCfg.SASLConfig.Mechanism)) {
 		return nil, fmt.Errorf("error unsupported sasl mechanism: %s", authCfg.SASLConfig.Mechanism)
 	}
 
diff --git a/pkg/util/string.go b/pkg/util/string.go
index 8cba9f0dca..7947e6e042 100644
--- a/pkg/util/string.go
+++ b/pkg/util/string.go
@@ -10,16 +10,6 @@ func StringRef(value string) *string {
 	return &value
 }
 
-func StringSliceContains(slice []string, value string) bool {
-	for _, item := range slice {
-		if item == value {
-			return true
-		}
-	}
-
-	return false
-}
-
 // SnakeCase converts given string `s` into `snake_case`.
 func SnakeCase(s string) string {
 	var buf bytes.Buffer
diff --git a/pkg/util/string_test.go b/pkg/util/string_test.go
index 57d807f23f..b58bc1ee91 100644
--- a/pkg/util/string_test.go
+++ b/pkg/util/string_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestStringSliceContains(t *testing.T) {
+func TestStringsContain(t *testing.T) {
 	t.Parallel()
 
 	tests := map[string]struct {
@@ -32,7 +32,7 @@ func TestStringSliceContains(t *testing.T) {
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
 
-			actual := StringSliceContains(testData.inputSlice, testData.inputValue)
+			actual := StringsContain(testData.inputSlice, testData.inputValue)
 			assert.Equal(t, testData.expected, actual)
 		})
 	}