Bombardier no longer does replacements

Author: mihaj

src/QAToolKit.Engine.Bombardier/BombardierOptions.cs

@@ -7,19 +7,12 @@ public class BombardierOptions
         internal string CustomerAccessToken { get; set; }
         internal string AdministratorAccessToken { get; private set; }
         internal string ApiKey { get; private set; }
-        internal ReplacementValue[] ReplacementValues { get; private set; }
         public int BombardierConcurrentUsers { get; set; }
         public int BombardierTimeout { get; set; }
         public int BombardierDuration { get; set; }
         public int BombardierRateLimit { get; set; }
         public bool BombardierUseHttp2 { get; set; }
 
-        public BombardierOptions AddReplacementValues(ReplacementValue[] replacementValues)
-        {
-            ReplacementValues = replacementValues;
-            return this;
-        }
-
         public BombardierOptions AddTokensAndApiKeys(string customerToken, string adminToken, string apiKey)
         {
             CustomerAccessToken = customerToken;

src/QAToolKit.Engine.Bombardier/BombardierTestsGenerator.cs

@@ -46,11 +46,11 @@ public async Task<IEnumerable<BombardierTest>> Generate(IList<HttpTestRequest> r
                     _bombardierOptions.AdministratorAccessToken, _bombardierOptions.ApiKey);
 
                 scriptBuilder.AppendLine($"{bombardierFullPath} " +
-                    $"-m {request.Method.ToString().ToUpper()} {GeneratorHelper.GenerateUrlParameters(request, _bombardierOptions.ReplacementValues)} " +
+                    $"-m {request.Method.ToString().ToUpper()} {GeneratorHelper.GenerateUrlParameters(request)} " +
                     $"-c {_bombardierOptions.BombardierConcurrentUsers} " +
                     $"{authHeader}" +
                     $"{GeneratorHelper.GenerateContentTypeHeader(request)}" +
-                    $"{GeneratorHelper.GenerateJsonBody(request, _bombardierOptions.ReplacementValues)}" +
+                    $"{GeneratorHelper.GenerateJsonBody(request)}" +
                     $"--{(Convert.ToBoolean(_bombardierOptions.BombardierUseHttp2) ? "http2" : "http1")} " +
                     $"--timeout={_bombardierOptions.BombardierTimeout}s " +
                     $"--duration={_bombardierOptions.BombardierDuration}s " +

src/QAToolKit.Engine.Bombardier/Helpers/GeneratorHelper.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json;
 
 namespace QAToolKit.Engine.Bombardier.Helpers
 {
@@ -49,29 +50,16 @@ internal static string GenerateContentTypeHeader(HttpTestRequest request)
         /// <param name="request"></param>
         /// <param name="replacementValues"></param>
         /// <returns></returns>
-        internal static string GenerateUrlParameters(HttpTestRequest request, ReplacementValue[] replacementValues)
+        internal static string GenerateUrlParameters(HttpTestRequest request)
         {
             var path = request.Path;
-            foreach (var value in replacementValues)
-            {
-                path = path.Replace("{" + value.Key + "}", value.Value);
-            }
 
             var queryParameters = new Dictionary<string, string>();
 
             //add query parameters
-            foreach (var parameter in request.Parameters)
+            foreach (var parameter in request.Parameters.Where(p => p.Value != null))
             {
-                foreach (var value in replacementValues)
-                {
-                    if (parameter.Name == value.Key)
-                    {
-                        if (!queryParameters.ContainsKey(parameter.Name) && !path.Contains(value.Value))
-                        {
-                            queryParameters.Add(parameter.Name, value.Value);
-                        }
-                    }
-                }
+                queryParameters.Add(parameter.Name, parameter.Value);
             }
 
             return new Uri(new Uri(request.BasePath), QueryHelpers.AddQueryString(path, queryParameters)).ToString();
@@ -83,20 +71,18 @@ internal static string GenerateUrlParameters(HttpTestRequest request, Replacemen
         /// <param name="request"></param>
         /// <param name="replacementValues"></param>
         /// <returns></returns>
-        internal static string GenerateJsonBody(HttpTestRequest request, ReplacementValue[] replacementValues)
+        internal static string GenerateJsonBody(HttpTestRequest request)
         {
             if (request.Method == HttpMethod.Get)
             {
                 return String.Empty;
             }
             else
             {
-                var replacementValue = replacementValues.FirstOrDefault(r => r.Key == request.RequestBody.Name);
-
-                File.WriteAllText($"{request.RequestBody.Name}.json", replacementValue.Value);
-
-                if (replacementValue != null)
+                if (request.RequestBody.Properties.Count > 0)
                 {
+                    File.WriteAllText($"{request.RequestBody.Name}.json", JsonSerializer.Serialize(request.RequestBody.Properties));
+
                     return $"-f \"{request.RequestBody.Name}.json\" ";
                 }
                 else

src/QAToolKit.Engine.Bombardier/QAToolKit.Engine.Bombardier.csproj

@@ -28,6 +28,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
 		<PackageReference Include="QAToolKit.Core" Version="0.1.0" />
+		<PackageReference Include="System.Text.Json" Version="4.7.2" />
 	</ItemGroup>
 
 	<Import Project="..\..\QAToolKit.Engine.Bombardier.targets" />