restrict types more

Signed-off-by: odubajDT <[email protected]>

Author: odubajDT

pkg/ottl/e2e/e2e_test.go

@@ -334,7 +334,7 @@ func Test_e2e_converters(t *testing.T) {
 		{
 			statement: `set(attributes["array"][0.0], "bar")`,
 			want:      func(_ ottllog.TransformContext) {},
-			errMsg:    "unable to resolve an integer index in slice: invalid key type",
+			errMsg:    "unable to resolve an integer index in slice: could not resolve key for map/slice, expecting 'int64' but got 'float64'",
 		},
 		{
 			statement: `set(attributes["array"][ConvertCase(attributes["A|B|C"], "upper")], "bar")`,

pkg/ottl/functions.go

@@ -54,16 +54,14 @@ func buildOriginalKeysText(keys []key) string {
 				builder.WriteString(*k.String)
 			}
 			if k.Expression != nil {
-				if k.Expression.Literal != nil {
-					if k.Expression.Literal.Path != nil {
-						builder.WriteString(buildOriginalText(k.Expression.Literal.Path))
-					}
-					if k.Expression.Literal.Float != nil {
-						builder.WriteString(strconv.FormatFloat(*k.Expression.Literal.Float, 'f', 10, 64))
-					}
-					if k.Expression.Literal.Int != nil {
-						builder.WriteString(strconv.FormatInt(*k.Expression.Literal.Int, 10))
-					}
+				if k.Expression.Path != nil {
+					builder.WriteString(buildOriginalText(k.Expression.Path))
+				}
+				if k.Expression.Float != nil {
+					builder.WriteString(strconv.FormatFloat(*k.Expression.Float, 'f', 10, 64))
+				}
+				if k.Expression.Int != nil {
+					builder.WriteString(strconv.FormatInt(*k.Expression.Int, 10))
 				}
 			}
 			builder.WriteString("]")
@@ -228,30 +226,28 @@ func (p *Parser[K]) newKeys(keys []key) ([]Key[K], error) {
 	for i := range keys {
 		var getter Getter[K]
 		if keys[i].Expression != nil {
-			if keys[i].Expression.Literal != nil {
-				if keys[i].Expression.Literal.Path != nil {
-					g, err := p.buildGetSetterFromPath(keys[i].Expression.Literal.Path)
-					if err != nil {
-						return nil, err
-					}
-					getter = g
-				}
-				if keys[i].Expression.Literal.Converter != nil {
-					g, err := p.newGetterFromConverter(*keys[i].Expression.Literal.Converter)
-					if err != nil {
-						return nil, err
-					}
-					getter = g
+			if keys[i].Expression.Path != nil {
+				g, err := p.buildGetSetterFromPath(keys[i].Expression.Path)
+				if err != nil {
+					return nil, err
 				}
+				getter = g
 			}
-			if keys[i].Expression.MathExpression != nil {
-				g, err := p.evaluateMathExpression(keys[i].Expression.MathExpression)
+			if keys[i].Expression.Converter != nil {
+				g, err := p.newGetterFromConverter(*keys[i].Expression.Converter)
 				if err != nil {
 					return nil, err
 				}
 				getter = g
 			}
 		}
+		if keys[i].MathExpression != nil {
+			g, err := p.evaluateMathExpression(keys[i].MathExpression)
+			if err != nil {
+				return nil, err
+			}
+			getter = g
+		}
 		ks[i] = &baseKey[K]{
 			s: keys[i].String,
 			i: keys[i].Int,

pkg/ottl/grammar.go

@@ -296,12 +296,16 @@ func (f *field) accept(v grammarVisitor) {
 }
 
 type key struct {
-	String     *string `parser:"'[' (@String "`
-	Int        *int64  `parser:"| @Int"`
-	Expression *value  `parser:"| @@ ) ']'"`
+	String         *string          `parser:"'[' (@String "`
+	Int            *int64           `parser:"| @Int"`
+	MathExpression *mathExpression  `parser:"| @@"`
+	Expression     *mathExprLiteral `parser:"| @@ ) ']'"`
 }
 
 func (k *key) accept(v grammarVisitor) {
+	if k.MathExpression != nil {
+		k.MathExpression.accept(v)
+	}
 	if k.Expression != nil {
 		k.Expression.accept(v)
 	}