useragent: move all processing to fromAny

Author: jar-b

useragent/from.go

@@ -10,39 +10,31 @@ import (
 	"github.com/hashicorp/aws-sdk-go-base/v2/internal/slices"
 )
 
-// FromSlice applies the conversion defined in [fromString] to all elements
+// FromSlice applies the conversion defined in [fromAny] to all elements
 // of a slice
 //
 // Slices of types which cannot assert to a string, empty string values, and string
 // values which do not match the expected `{product}/{version} ({comment})`
 // pattern (where version and comment are optional) return a zero value struct.
 func FromSlice[T any](sl []T) config.UserAgentProducts {
-	return slices.ApplyToAll(sl, func(v T) config.UserAgentProduct {
-		if s, ok := any(v).(string); ok {
-			return fromString(s)
-		}
-		return config.UserAgentProduct{}
-	})
+	return slices.ApplyToAll(sl, func(v T) config.UserAgentProduct { return fromAny(v) })
 }
 
-// fromString separates the provided string into the constituent parts
-// expected by the UserAgentProduct struct
-//
-// Values which do not match the expected `{product}/{version} ({comment})`
-// pattern, where version and comment are optional, return a zero value struct.
-func fromString(s string) config.UserAgentProduct {
-	parts := strings.Split(s, "/")
-	switch len(parts) {
-	case 1:
-		return config.UserAgentProduct{Name: parts[0]}
-	case 2: //nolint: mnd
-		subparts := strings.Split(parts[1], "(")
-		if len(subparts) == 2 { //nolint: mnd
-			version := strings.TrimSpace(subparts[0])
-			comment := strings.TrimSuffix(subparts[1], ")")
-			return config.UserAgentProduct{Name: parts[0], Version: version, Comment: comment}
+func fromAny(v any) config.UserAgentProduct {
+	if s, ok := v.(string); ok {
+		parts := strings.Split(s, "/")
+		switch len(parts) {
+		case 1:
+			return config.UserAgentProduct{Name: parts[0]}
+		case 2: //nolint: mnd
+			subparts := strings.Split(parts[1], "(")
+			if len(subparts) == 2 { //nolint: mnd
+				version := strings.TrimSpace(subparts[0])
+				comment := strings.TrimSuffix(subparts[1], ")")
+				return config.UserAgentProduct{Name: parts[0], Version: version, Comment: comment}
+			}
+			return config.UserAgentProduct{Name: parts[0], Version: parts[1]}
 		}
-		return config.UserAgentProduct{Name: parts[0], Version: parts[1]}
 	}
 
 	return config.UserAgentProduct{}

useragent/from_test.go

@@ -61,14 +61,24 @@ func TestFromSlice(t *testing.T) {
 	}
 }
 
-func Test_fromString(t *testing.T) {
+func Test_fromAny(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
 		name string
-		s    string
+		v    any
 		want config.UserAgentProduct
 	}{
+		{
+			"nil",
+			nil,
+			config.UserAgentProduct{},
+		},
+		{
+			"non-string",
+			1,
+			config.UserAgentProduct{},
+		},
 		{
 			"empty",
 			"",
@@ -126,9 +136,9 @@ func Test_fromString(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			got := fromString(tt.s)
+			got := fromAny(tt.v)
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("fromString() = %+v, want %+v", got, tt.want)
+				t.Errorf("fromAny() = %+v, want %+v", got, tt.want)
 			}
 		})
 	}