Replace pkg.Contains with slices.Contains

Author: lionello

src/pkg/cli/client/byoc/aws/stream.go

@@ -3,6 +3,7 @@ package aws
 import (
 	"encoding/json"
 	"io"
+	"slices"
 	"strings"
 	"time"
 
@@ -118,7 +119,7 @@ func (bs *byocServerStream) parseEvents(events []ecs.LogEvent) *defangv1.TailRes
 		return nil // TODO: filter these out using the AWS StartLiveTail API
 	}
 
-	if len(bs.services) > 0 && !pkg.Contains(bs.services, response.GetService()) {
+	if len(bs.services) > 0 && !slices.Contains(bs.services, response.GetService()) {
 		return nil // TODO: filter these out using the AWS StartLiveTail API
 	}
 
@@ -157,7 +158,7 @@ func (bs *byocServerStream) parseEvents(events []ecs.LogEvent) *defangv1.TailRes
 		if entry.Etag != "" && bs.etag != "" && entry.Etag != bs.etag {
 			continue
 		}
-		if entry.Service != "" && len(bs.services) > 0 && !pkg.Contains(bs.services, entry.Service) {
+		if entry.Service != "" && len(bs.services) > 0 && !slices.Contains(bs.services, entry.Service) {
 			continue
 		}
 		entries = append(entries, entry)

src/pkg/utils.go

@@ -2,7 +2,6 @@ package pkg
 
 import (
 	"context"
-	"encoding/json"
 	"io"
 	"math/rand"
 	"os"
@@ -62,21 +61,6 @@ func SplitByComma(s string) []string {
 	return strings.Split(s, ",")
 }
 
-type OneOrList []string
-
-func (l *OneOrList) UnmarshalJSON(data []byte) error {
-	ls := []string{}
-	if err := json.Unmarshal(data, &ls); err != nil {
-		var s string
-		if err := json.Unmarshal(data, &s); err != nil {
-			return err
-		}
-		ls = []string{s}
-	}
-	*l = ls
-	return nil
-}
-
 func RandomID() string {
 	const uint64msb = 1 << 63 // always set the MSB to ensure we get ≥12 digits
 	return strconv.FormatUint(rand.Uint64()|uint64msb, 36)[1:]
@@ -118,15 +102,6 @@ func SleepWithContext(ctx context.Context, d time.Duration) error {
 	}
 }
 
-func Contains[T comparable](s []T, v T) bool {
-	for _, val := range s {
-		if val == v {
-			return true
-		}
-	}
-	return false
-}
-
 func SubscriptionTierToString(tier defangv1.SubscriptionTier) string {
 	switch tier {
 	case defangv1.SubscriptionTier_SUBSCRIPTION_TIER_UNSPECIFIED:

src/pkg/utils_test.go

@@ -1,7 +1,6 @@
 package pkg
 
 import (
-	"encoding/json"
 	"reflect"
 	"testing"
 	"time"
@@ -103,27 +102,6 @@ func TestSplitByComma(t *testing.T) {
 	}
 }
 
-func TestOneOrList(t *testing.T) {
-	tests := []struct {
-		name string
-		in   string
-		want []string
-	}{
-		{"empty", `[]`, []string{}},
-		{"string", `"a"`, []string{"a"}},
-		{"one", `["a"]`, []string{"a"}},
-		{"two", `["a","b"]`, []string{"a", "b"}},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var got OneOrList
-			if err := json.Unmarshal([]byte(tt.in), &got); err != nil || !reflect.DeepEqual([]string(got), tt.want) {
-				t.Errorf("OneOrList(%v) = %v, want %v: %v", tt.in, got, tt.want, err)
-			}
-		})
-	}
-}
-
 func TestRandomID(t *testing.T) {
 	var unique = make(map[string]bool)
 	for range 100 {
@@ -138,28 +116,6 @@ func TestRandomID(t *testing.T) {
 	}
 }
 
-func TestContains(t *testing.T) {
-	tests := []struct {
-		name     string
-		slice    []int
-		value    int
-		expected bool
-	}{
-		{"Empty slice", []int{}, 1, false},
-		{"Single element", []int{1}, 1, true},
-		{"Multiple elements", []int{1, 2, 3, 4, 5}, 3, true},
-		{"Non-existent element", []int{1, 2, 3, 4, 5}, 6, false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := Contains(tt.slice, tt.value); got != tt.expected {
-				t.Errorf("Contains() returned %v, expected %v", got, tt.expected)
-			}
-		})
-	}
-}
-
 func TestIsValidTime(t *testing.T) {
 	tests := []struct {
 		name     string