chore: clean up recorder task args and adapt to Gatling 3.11

gatling · Feb 20, 2024 · 66333b4 · 66333b4
1 parent 5308817
commit 66333b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/src/main/scala/io/gatling/sbt/settings/BaseSettings.scala b/src/main/scala/io/gatling/sbt/settings/BaseSettings.scala
@@ -67,5 +67,4 @@ object BaseSettings {
     config / fork := true,
     config / testGrouping := (config / testGrouping).value flatMap singleTestGroup
   ) ++ OssSettings.settings(config, parent) ++ EnterpriseSettings.settings(config)
-
 }
diff --git a/src/main/scala/io/gatling/sbt/settings/gatling/OssSettings.scala b/src/main/scala/io/gatling/sbt/settings/gatling/OssSettings.scala
@@ -35,9 +35,10 @@ object OssSettings {
   private def recorderRunner(config: Configuration, parent: Configuration): Def.Initialize[InputTask[Int]] = Def.inputTask {
     // Parse args and add missing args if necessary
     val args = optionsParser.parsed
-    val simulationsForlderArg = toShortOptionAndValue("sf" -> (config / scalaSource).value.getPath)
+    val simulationsFolderArg = toShortOptionAndValue("sf" -> (config / scalaSource).value.getPath)
     val resourcesFolderArg = toShortOptionAndValue("rf" -> (config / resourceDirectory).value.getPath)
-    val allArgs = addPackageIfNecessary(args ++ simulationsForlderArg ++ resourcesFolderArg, organization.value)
+    val formatArg = toShortOptionAndValue("pkg", "scala")
+    val allArgs = addPackageIfNecessary(args ++ simulationsFolderArg ++ resourcesFolderArg ++ formatArg, organization.value)
 
     val fork = new Fork("java", Some("io.gatling.recorder.GatlingRecorder"))
     val classpathElements = (parent / dependencyClasspath).value.map(_.data) :+ (config / resourceDirectory).value

diff --git a/src/main/scala/io/gatling/sbt/utils/StartRecorderUtils.scala b/src/main/scala/io/gatling/sbt/utils/StartRecorderUtils.scala
@@ -25,36 +25,22 @@ private[gatling] object StartRecorderUtils {
    * List of all CLI options supported by the Recorder, in their "short" version.
    */
   val shortRecorderOpts = Set(
-    "lp",
-    "lps",
-    "ph",
-    "pp",
-    "pps",
-    "ar",
-    "rbf",
+    "sf",
+    "rf",
     "cn",
     "pkg",
-    "enc",
-    "fr",
-    "fhr"
+    "fmt"
   )
 
   /**
    * List of all CLI options supported by the Recorder, in their "full" version.
    */
   val fullRecorderOpts = Set(
-    "local-port",
-    "local-port-ssl",
-    "proxy-host",
-    "proxy-port",
-    "proxy-port-ssl",
-    "request-bodies-folder",
+    "simulations-folder",
+    "resources-folder",
     "class-name",
     "package",
-    "encoding",
-    "follow-redirect",
-    "automatic-referer",
-    "fetch-html-resources"
+    "format"
   )
 
   /** Parser matching the help option, in short and full version. */