Manual inlines

Author: orestisfl

dev-tools/mage/build.go

@@ -128,8 +128,8 @@ func DefaultBuildArgs() BuildArgs {
 // The list of supported platforms is compiled based on the Go release notes: https://golang.org/doc/devel/release.html
 // The list has been updated according to the Go version: 1.16
 func positionIndependentCodeSupported() bool {
-	return oneOf(Platform.GOOS, "darwin") ||
-		(Platform.GOOS == "linux" && oneOf(Platform.GOARCH, "riscv64", "amd64", "arm", "arm64", "ppc64le", "386")) ||
+	return slices.Contains([]string{"darwin"}, Platform.GOOS) ||
+		(Platform.GOOS == "linux" && slices.Contains([]string{"riscv64", "amd64", "arm", "arm64", "ppc64le", "386"}, Platform.GOARCH)) ||
 		(Platform.GOOS == "aix" && Platform.GOARCH == "ppc64") ||
 
 		// Windows 32bit supports ASLR, but Windows Server 2003 and earlier do not.
@@ -138,10 +138,6 @@ func positionIndependentCodeSupported() bool {
 		(Platform.GOOS == "windows")
 }
 
-func oneOf(value string, lst ...string) bool {
-	return slices.Contains(lst, value)
-}
-
 // DefaultGolangCrossBuildArgs returns the default BuildArgs for use in
 // cross-builds.
 func DefaultGolangCrossBuildArgs() BuildArgs {

filebeat/input/container/config.go

@@ -38,17 +38,13 @@ type config struct {
 
 // Validate validates the config.
 func (c *config) Validate() error {
-	if !stringInSlice(c.Stream, []string{"all", "stdout", "stderr"}) {
+	if !slices.Contains([]string{"all", "stdout", "stderr"}, c.Stream) {
 		return fmt.Errorf("invalid value for stream: %s, supported values are: all, stdout, stderr", c.Stream)
 	}
 
-	if !stringInSlice(strings.ToLower(c.Format), []string{"auto", "docker", "cri"}) {
+	if !slices.Contains([]string{"auto", "docker", "cri"}, strings.ToLower(c.Format)) {
 		return fmt.Errorf("invalid value for format: %s, supported values are: auto, docker, cri", c.Format)
 	}
 
 	return nil
 }
-
-func stringInSlice(str string, list []string) bool {
-	return slices.Contains(list, str)
-}

filebeat/input/kafka/input.go

@@ -95,7 +95,7 @@ func (input *kafkaInput) Test(ctx input.TestContext) error {
 
 	var missingTopics []string
 	for _, neededTopic := range input.config.Topics {
-		if !contains(topics, neededTopic) {
+		if !slices.Contains(topics, neededTopic) {
 			missingTopics = append(missingTopics, neededTopic)
 		}
 	}
@@ -469,7 +469,3 @@ func composeMessage(timestamp time.Time, content []byte, kafkaFields mapstr.M, a
 		},
 	}
 }
-
-func contains(elements []string, element string) bool {
-	return slices.Contains(elements, element)
-}

libbeat/mapping/field.go

@@ -222,7 +222,7 @@ func validateAllowedValue(fieldName string, propertyName string, propertyValue s
 	if len(allowedPropertyValues) == 0 {
 		return fmt.Errorf("no %s expected for field '%s', found: %s", propertyName, fieldName, propertyValue)
 	}
-	if !stringsContains(allowedPropertyValues, propertyValue) {
+	if !slices.Contains(allowedPropertyValues, propertyValue) {
 		return fmt.Errorf(
 			"unexpected %s '%s' for field '%s', expected one of: %s",
 			propertyName, propertyValue, fieldName, strings.Join(allowedPropertyValues, ", "),
@@ -231,10 +231,6 @@ func validateAllowedValue(fieldName string, propertyName string, propertyValue s
 	return nil
 }
 
-func stringsContains(haystack []string, needle string) bool {
-	return slices.Contains(haystack, needle)
-}
-
 func LoadFieldsYaml(path string) (Fields, error) {
 	var keys []Field
 

libbeat/outputs/elasticsearch/config_presets.go

@@ -103,7 +103,7 @@ func ApplyPreset(preset string, userConfig *config.C) ([]string, *config.C, erro
 	for _, key := range userKeys {
 		if strings.HasPrefix(key, "queue.") && presetConfiguresQueue {
 			overridden = append(overridden, key)
-		} else if listContainsStr(presetKeys, key) {
+		} else if slices.Contains(presetKeys, key) {
 			overridden = append(overridden, key)
 		}
 	}
@@ -119,11 +119,6 @@ func ApplyPreset(preset string, userConfig *config.C) ([]string, *config.C, erro
 	return overridden, presetConfig, nil
 }
 
-// TODO: Replace this with slices.Contains once we hit Go 1.21.
-func listContainsStr(list []string, str string) bool {
-	return slices.Contains(list, str)
-}
-
 func listContainsPrefix(list []string, prefix string) bool {
 	for _, s := range list {
 		if strings.HasPrefix(s, prefix) {

libbeat/tests/compose/project.go

@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"slices"
 	"syscall"
 	"time"
 
@@ -373,7 +372,3 @@ type containerServiceInfo struct {
 func (i *containerServiceInfo) Name() string {
 	return i.ServiceName()
 }
-
-func contains(list []string, item string) bool {
-	return slices.Contains(list, item)
-}

libbeat/tests/compose/wrapper.go

@@ -32,6 +32,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -374,7 +375,7 @@ func (d *wrapperDriver) containers(ctx context.Context, projectFilter Filter, fi
 		}
 		for _, container := range listResult.Items {
 			serviceName, ok := container.Labels[labelComposeService]
-			if !ok || !contains(serviceNames, serviceName) {
+			if !ok || !slices.Contains(serviceNames, serviceName) {
 				// Service is not defined in current docker compose file, ignore it
 				continue
 			}
@@ -403,7 +404,7 @@ func (d *wrapperDriver) KillOld(ctx context.Context, except []string) error {
 	for _, c := range listResult.Items {
 		container := wrapperContainer{info: c}
 		serviceName, ok := container.info.Labels[labelComposeService]
-		if !ok || contains(except, serviceName) {
+		if !ok || slices.Contains(except, serviceName) {
 			continue
 		}
 

metricbeat/module/docker/diskio/helper.go

@@ -166,7 +166,7 @@ func getNewStats(skip []uint64, time time.Time, blkioEntry []container.BlkioStat
 
 		// certain devices, like software raid and device-mapper devices, will just control and re-report the disks
 		// under them in the hierarchy. We want to skip them, lest we merely duplicate the metrics.
-		if skipDev(myEntry.Major, skip) {
+		if slices.Contains(skip, myEntry.Major) {
 			continue
 		}
 		// These op value strings can either be Capitalized or lowercase, depending on the platform.
@@ -183,10 +183,6 @@ func getNewStats(skip []uint64, time time.Time, blkioEntry []container.BlkioStat
 	return stats
 }
 
-func skipDev(major uint64, skipList []uint64) bool {
-	return slices.Contains(skipList, major)
-}
-
 func (io *BlkioService) getReadPs(old *BlkioRaw, new *BlkioRaw) float64 {
 	duration := new.Time.Sub(old.Time)
 	return calculatePerSecond(duration, old.reads, new.reads)

x-pack/libbeat/common/cloudfoundry/config.go

@@ -56,12 +56,8 @@ func (c *Config) InitDefaults() {
 
 func (c *Config) Validate() error {
 	supportedVersions := []string{ConsumerVersionV1, ConsumerVersionV2}
-	if !anyOf(supportedVersions, c.Version) {
+	if !slices.Contains(supportedVersions, c.Version) {
 		return fmt.Errorf("not supported version %v, expected one of %s", c.Version, strings.Join(supportedVersions, ", "))
 	}
 	return nil
 }
-
-func anyOf(elems []string, s string) bool {
-	return slices.Contains(elems, s)
-}