feat: distinguish API URL from web app URL in the CLI

gatling · Sep 23, 2024 · e546317 · e546317
1 parent c836eb1
commit e546317
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 29 deletions.
diff --git a/js-simulation/package-lock.json b/js-simulation/package-lock.json
diff --git a/js/cli/src/commands/enterpriseDeploy.ts b/js/cli/src/commands/enterpriseDeploy.ts
@@ -23,8 +23,10 @@ import {
   sourcesFolderOptionValue,
   typescriptOption,
   typescriptOptionValueWithDefaults,
-  urlOption,
-  urlOptionValue
+  apiUrlOption,
+  apiUrlOptionValue,
+  webAppUrlOption,
+  webAppUrlOptionValue
 } from "./options";
 import { findSimulations } from "../simulations";
 import { installGatlingJs } from "../dependencies";
@@ -42,7 +44,8 @@ export default (program: Command): void => {
     .addOption(typescriptOption)
     .addOption(gatlingHomeOption)
     // Base
-    .addOption(urlOption)
+    .addOption(apiUrlOption)
+    .addOption(webAppUrlOption)
     .addOption(apiTokenOption)
     // Plugin configuration
     .addOption(controlPlaneUrlOption)
@@ -61,7 +64,8 @@ export default (program: Command): void => {
       const bundleFile = bundleFileOptionValue(options);
       const resultsFolder: string = resultsFolderOptionValue(options);
       const gatlingHome = gatlingHomeOptionValueWithDefaults(options);
-      const url = urlOptionValue(options);
+      const apiUrl = apiUrlOptionValue(options);
+      const webAppUrl = webAppUrlOptionValue(options);
       const apiToken = apiTokenOptionValue(options);
       const controlPlaneUrl = controlPlaneUrlOptionValue(options);
       const nonInteractive = nonInteractiveOptionValue(options);
@@ -77,7 +81,8 @@ export default (program: Command): void => {
         bundleFile,
         resourcesFolder,
         resultsFolder,
-        url,
+        apiUrl,
+        webAppUrl,
         apiToken,
         controlPlaneUrl,
         nonInteractive,

diff --git a/js/cli/src/commands/enterpriseStart.ts b/js/cli/src/commands/enterpriseStart.ts
@@ -29,8 +29,10 @@ import {
   sourcesFolderOptionValue,
   typescriptOption,
   typescriptOptionValueWithDefaults,
-  urlOption,
-  urlOptionValue,
+  apiUrlOption,
+  apiUrlOptionValue,
+  webAppUrlOption,
+  webAppUrlOptionValue,
   waitForRunEndOption,
   waitForRunEndOptionValue
 } from "./options";
@@ -50,7 +52,8 @@ export default (program: Command): void => {
     .addOption(typescriptOption)
     .addOption(gatlingHomeOption)
     // Base
-    .addOption(urlOption)
+    .addOption(apiUrlOption)
+    .addOption(webAppUrlOption)
     .addOption(apiTokenOption)
     // Plugin configuration
     .addOption(controlPlaneUrlOption)
@@ -74,7 +77,8 @@ export default (program: Command): void => {
       const bundleFile = bundleFileOptionValue(options);
       const resultsFolder: string = resultsFolderOptionValue(options);
       const gatlingHome = gatlingHomeOptionValueWithDefaults(options);
-      const url = urlOptionValue(options);
+      const apiUrl = apiUrlOptionValue(options);
+      const webAppUrl = webAppUrlOptionValue(options);
       const apiToken = apiTokenOptionValue(options);
       const controlPlaneUrl = controlPlaneUrlOptionValue(options);
       const nonInteractive = nonInteractiveOptionValue(options);
@@ -98,7 +102,8 @@ export default (program: Command): void => {
         bundleFile,
         resourcesFolder,
         resultsFolder,
-        url,
+        apiUrl,
+        webAppUrl,
         apiToken,
         controlPlaneUrl,
         nonInteractive,

diff --git a/js/cli/src/commands/options.ts b/js/cli/src/commands/options.ts
@@ -213,10 +213,15 @@ export const parseRunParametersArgument = (args: string[]): Record<string, strin
   return parsedParameters;
 };
 
-export const urlOption = new Option("--url <value>", "URL of Gatling Enterprise")
+export const apiUrlOption = new Option("--apiUrl <value>", "URL of the Gatling Enterprise API")
+  .default("https://api.gatling.io")
+  .hideHelp();
+export const apiUrlOptionValue = getStringValueMandatory(apiUrlOption);
+
+export const webAppUrlOption = new Option("--webAppUrl <value>", "URL of the Gatling Enterprise web app")
   .default("https://cloud.gatling.io")
   .hideHelp();
-export const urlOptionValue = getStringValueMandatory(urlOption);
+export const webAppUrlOptionValue = getStringValueMandatory(webAppUrlOption);
 
 export const apiTokenOption = new Option(
   "--api-token <value>",

diff --git a/js/cli/src/enterprise.ts b/js/cli/src/enterprise.ts
@@ -124,7 +124,8 @@ export interface EnterprisePluginOptions extends RunJavaProcessOptions {
   resourcesFolder: string;
   resultsFolder: string;
   // Base
-  url: string;
+  apiUrl: string;
+  webAppUrl: string;
   apiToken?: string;
   // Plugin configuration
   controlPlaneUrl?: string;
@@ -135,7 +136,8 @@ const javaArgsFromPluginOptions = (options: EnterprisePluginOptions) => {
   const javaArgs: string[] = [];
 
   // Base
-  javaArgs.push(`-Dgatling.enterprise.url=${options.url}`);
+  javaArgs.push(`-Dgatling.enterprise.apiUrl=${options.apiUrl}`);
+  javaArgs.push(`-Dgatling.enterprise.webAppUrl=${options.webAppUrl}`);
   if (options.apiToken !== undefined) {
     javaArgs.push(`-Dgatling.enterprise.apiToken=${options.apiToken}`);
   }

diff --git a/jvm/build.sbt b/jvm/build.sbt
@@ -19,7 +19,7 @@ val coursierVersion = "2.1.12"
 val gatlingVersion = "3.12.0"
 
 // bit weird cause this is not a dependency of this project
-val gatlingEnterpriseComponentPluginVersion = "1.9.6"
+val gatlingEnterpriseComponentPluginVersion = "1.9.8"
 
 lazy val root = (project in file("."))
   .aggregate(adapter, java2ts)

diff --git a/ts-simulation/package-lock.json b/ts-simulation/package-lock.json