experimental new syntax

v2/pkg/generators/util.go

@@ -2,6 +2,7 @@ package generators
 
 import (
 	"bufio"
+	"fmt"
 	"os"
 	"strings"
 )
@@ -20,11 +21,11 @@ func LoadPayloads(payloads map[string]interface{}) map[string][]string {
 			} else {
 				loadedPayloads[name] = LoadFile(v)
 			}
-		case interface{}:
+		case []interface{}, interface{}:
 			vv := payload.([]interface{})
 			var v []string
 			for _, vvv := range vv {
-				v = append(v, vvv.(string))
+				v = append(v, fmt.Sprintf("%v", vvv))
 			}
 			loadedPayloads[name] = v
 		}

v2/pkg/requests/bulk-http-request.go

@@ -174,18 +174,16 @@ func (r *BulkHTTPRequest) handleRawWithPaylods(raw string, baseURL string, value
 	var re = regexp.MustCompile(`(?m)\{\{.+}}`)
 	for _, match := range re.FindAllString(raw, -1) {
 		// check if the match contains a dynamic variable
-		if generators.StringContainsAnyMapItem(finValues, match) {
-			expr := generators.TrimDelimiters(match)
-			compiled, err := govaluate.NewEvaluableExpressionWithFunctions(expr, generators.HelperFunctions())
-			if err != nil {
-				return nil, err
-			}
-			result, err := compiled.Evaluate(finValues)
-			if err != nil {
-				return nil, err
-			}
-			dynamicValues[expr] = result
+		expr := generators.TrimDelimiters(match)
+		compiled, err := govaluate.NewEvaluableExpressionWithFunctions(expr, generators.HelperFunctions())
+		if err != nil {
+			return nil, err
 		}
+		result, err := compiled.Evaluate(finValues)
+		if err != nil {
+			return nil, err
+		}
+		dynamicValues[expr] = result
 	}
 
 	// replace dynamic values

v2/pkg/requests/util.go

@@ -15,6 +15,8 @@ func newReplacer(values map[string]interface{}) *strings.Replacer {
 	for k, v := range values {
 		replacerItems = append(replacerItems, fmt.Sprintf("{{%s}}", k))
 		replacerItems = append(replacerItems, fmt.Sprintf("%s", v))
+		replacerItems = append(replacerItems, fmt.Sprintf("%s", k))
+		replacerItems = append(replacerItems, fmt.Sprintf("%s", v))
 	}
 
 	return strings.NewReplacer(replacerItems...)