From f3de611b49d94fe9b5d37b963f2de7737332021c Mon Sep 17 00:00:00 2001 From: Ice3man Date: Tue, 28 Jun 2022 20:20:18 +0530 Subject: [PATCH] Added enhancements for http variables support (#2223) --- v2/pkg/protocols/http/request.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/v2/pkg/protocols/http/request.go b/v2/pkg/protocols/http/request.go index 1197c9412..992fe9a59 100644 --- a/v2/pkg/protocols/http/request.go +++ b/v2/pkg/protocols/http/request.go @@ -222,6 +222,10 @@ func (request *Request) executeTurboHTTP(reqURL string, dynamicValues, previous // ExecuteWithResults executes the final request on a URL func (request *Request) ExecuteWithResults(reqURL string, dynamicValues, previous output.InternalEvent, callback protocols.OutputEventCallback) error { + if request.Pipeline || request.Race && request.RaceNumberRequests > 0 || request.Threads > 0 { + variablesMap := request.options.Variables.Evaluate(generators.MergeMaps(dynamicValues, previous)) + dynamicValues = generators.MergeMaps(variablesMap, dynamicValues) + } // verify if pipeline was requested if request.Pipeline { return request.executeTurboHTTP(reqURL, dynamicValues, previous, callback) @@ -229,7 +233,7 @@ func (request *Request) ExecuteWithResults(reqURL string, dynamicValues, previou // verify if a basic race condition was requested if request.Race && request.RaceNumberRequests > 0 { - return request.executeRaceRequest(reqURL, previous, callback) + return request.executeRaceRequest(reqURL, dynamicValues, callback) } // verify if parallel elaboration was requested