update parsing to reflect changes made to stanza keyvalue parser

Author: dpaasman00

pkg/ottl/ottlfuncs/func_parse_key_value.go

@@ -65,8 +65,8 @@ func parseKeyValue[K any](target ottl.StringGetter[K], d ottl.Optional[string],
 			if len(pair) != 2 {
 				return nil, fmt.Errorf("cannot split '%s' into 2 items, got %d", p, len(pair))
 			}
-			key := strings.TrimSpace(strings.Trim(pair[0], "\"'"))
-			value := strings.TrimSpace(strings.Trim(pair[1], "\"'"))
+			key := strings.TrimSpace(pair[0])
+			value := strings.TrimSpace(pair[1])
 			parsed[key] = value
 		}
 
@@ -84,36 +84,34 @@ func splitPairs(input, pairDelimiter string) ([]string, error) {
 	delimiterLength := len(pairDelimiter)
 	quoteChar := "" // "" means we are not in quotes
 
-	i := 0
-	for i < len(input) {
-		if quoteChar == "" && i+delimiterLength <= len(input) && input[i:i+delimiterLength] == pairDelimiter {
-			if currentPair == "" {
-				i++
+	for i := 0; i < len(input); i++ {
+		if quoteChar == "" && i+delimiterLength <= len(input) && input[i:i+delimiterLength] == pairDelimiter { // delimiter
+			if currentPair == "" { // leading || trailing delimiter; ignore
 				continue
 			}
 			result = append(result, currentPair)
 			currentPair = ""
-			i += delimiterLength
+			i += delimiterLength - 1
+			continue
+		}
+
+		if quoteChar == "" && (input[i] == '"' || input[i] == '\'') { // start of quote
+			quoteChar = string(input[i])
 			continue
-		} else if input[i] == '"' || input[i] == '\'' {
-			if quoteChar != "" {
-				if quoteChar == string(input[i]) {
-					quoteChar = ""
-				}
-			} else {
-				quoteChar = string(input[i])
-			}
 		}
+		if string(input[i]) == quoteChar { // end of quote
+			quoteChar = ""
+			continue
+		}
+
 		currentPair += string(input[i])
-		i++
 	}
 
-	if quoteChar != "" {
+	if quoteChar != "" { // check for closed quotes
 		return nil, fmt.Errorf("never reached end of a quoted value")
 	}
-
-	if currentPair != "" {
-		result = append(result, currentPair)
+	if currentPair != "" { // avoid adding empty value bc of a trailing delimiter
+		return append(result, currentPair), nil
 	}
 
 	return result, nil

pkg/ottl/ottlfuncs/func_parse_key_value_test.go

@@ -202,17 +202,17 @@ hello!!world  `, nil
 			},
 		},
 		{
-			name: "double quotes",
+			name: " embedded double quotes end single quoted value",
 			target: ottl.StandardStringGetter[any]{
 				Getter: func(ctx context.Context, tCtx any) (any, error) {
-					return `a=b c='this is a "cool" value'`, nil
+					return `a=b c='this is a "co ol"'`, nil
 				},
 			},
 			delimiter:      ottl.Optional[string]{},
 			pair_delimiter: ottl.Optional[string]{},
 			expected: map[string]any{
 				"a": "b",
-				"c": "this is a \"cool\" value",
+				"c": "this is a \"co ol\"",
 			},
 		},
 	}