feat: Add trust store configuration to the CLI

Being able to configure a custom trust store is useful with private packages, as the control plane may use a certificate from an internal CA.

Author: guilgaly

js-simulation/package-lock.json

@@ -23,6 +23,10 @@ import {
   resultsFolderOptionValue,
   sourcesFolderOption,
   sourcesFolderOptionValue,
+  trustStoreOption,
+  trustStoreOptionValue,
+  trustStorePasswordOption,
+  trustStorePasswordOptionValue,
   typescriptOption,
   typescriptOptionValueWithDefaults,
   apiUrlOption,
@@ -52,6 +56,8 @@ export default (program: Command): void => {
     .addOption(apiTokenOption)
     // Plugin configuration
     .addOption(controlPlaneUrlOption)
+    .addOption(trustStoreOption)
+    .addOption(trustStorePasswordOption)
     .addOption(nonInteractiveOption)
     // Descriptor file
     .addOption(packageDescriptorFilenameOption)
@@ -72,6 +78,8 @@ export default (program: Command): void => {
       const webAppUrl = webAppUrlOptionValue(options);
       const apiToken = apiTokenOptionValue(options);
       const controlPlaneUrl = controlPlaneUrlOptionValue(options);
+      const trustStore = trustStoreOptionValue(options);
+      const trustStorePassword = trustStorePasswordOptionValue(options);
       const nonInteractive = nonInteractiveOptionValue(options);
       const packageDescriptorFilename = packageDescriptorFilenameOptionValue(options);
       const packageFile = packageFileOptionValue(options);
@@ -89,6 +97,8 @@ export default (program: Command): void => {
         webAppUrl,
         apiToken,
         controlPlaneUrl,
+        trustStore,
+        trustStorePassword,
         nonInteractive,
         packageDescriptorFilename,
         packageFile

js/cli/src/commands/enterpriseDeploy.ts

@@ -29,6 +29,10 @@ import {
   runTitleOptionValue,
   sourcesFolderOption,
   sourcesFolderOptionValue,
+  trustStoreOption,
+  trustStoreOptionValue,
+  trustStorePasswordOption,
+  trustStorePasswordOptionValue,
   typescriptOption,
   typescriptOptionValueWithDefaults,
   apiUrlOption,
@@ -60,6 +64,8 @@ export default (program: Command): void => {
     .addOption(apiTokenOption)
     // Plugin configuration
     .addOption(controlPlaneUrlOption)
+    .addOption(trustStoreOption)
+    .addOption(trustStorePasswordOption)
     .addOption(nonInteractiveOption)
     // Descriptor file
     .addOption(packageDescriptorFilenameOption)
@@ -85,6 +91,8 @@ export default (program: Command): void => {
       const webAppUrl = webAppUrlOptionValue(options);
       const apiToken = apiTokenOptionValue(options);
       const controlPlaneUrl = controlPlaneUrlOptionValue(options);
+      const trustStore = trustStoreOptionValue(options);
+      const trustStorePassword = trustStorePasswordOptionValue(options);
       const nonInteractive = nonInteractiveOptionValue(options);
       const packageDescriptorFilename = packageDescriptorFilenameOptionValue(options);
       const packageFile = packageFileOptionValue(options);
@@ -110,6 +118,8 @@ export default (program: Command): void => {
         webAppUrl,
         apiToken,
         controlPlaneUrl,
+        trustStore,
+        trustStorePassword,
         nonInteractive,
         packageDescriptorFilename,
         packageFile,

js/cli/src/commands/enterpriseStart.ts

@@ -282,6 +282,18 @@ export const controlPlaneUrlOption = new Option(
 );
 export const controlPlaneUrlOptionValue = getStringValueOptional(controlPlaneUrlOption);
 
+export const trustStoreOption = new Option(
+  "--trust-store <value>",
+  `Path to a trust store (in PKCS#12 or JKS format) used when calling remote APIs over HTTPS. Useful with the ${controlPlaneUrlOption.long} option, if your control plane uses a certificate signed by an internal CA.`
+);
+export const trustStoreOptionValue = getStringValueOptional(trustStoreOption);
+
+export const trustStorePasswordOption = new Option(
+  "--trust-store-password <value>",
+  `Use with the ${trustStoreOption.long} option, if your trust store is protected by a password.`
+);
+export const trustStorePasswordOptionValue = getStringValueOptional(trustStorePasswordOption);
+
 // Descriptor file
 
 export const packageDescriptorFilenameOption = new Option(

js/cli/src/commands/options.ts

@@ -134,6 +134,8 @@ export interface EnterprisePluginOptions extends RunJavaProcessOptions {
   apiToken?: string;
   // Plugin configuration
   controlPlaneUrl?: string;
+  trustStore?: string;
+  trustStorePassword?: string;
   nonInteractive: boolean;
 }
 
@@ -151,6 +153,12 @@ const javaArgsFromPluginOptions = (options: EnterprisePluginOptions) => {
   if (options.controlPlaneUrl !== undefined) {
     javaArgs.push(`-Dgatling.enterprise.controlPlaneUrl=${options.controlPlaneUrl}`);
   }
+  if (options.trustStore !== undefined) {
+    javaArgs.push(`-Djavax.net.ssl.trustStore=${options.trustStore}`);
+  }
+  if (options.trustStore !== undefined && options.trustStorePassword !== undefined) {
+    javaArgs.push(`-Djavax.net.ssl.trustStorePassword=${options.trustStorePassword}`);
+  }
   javaArgs.push("-Dgatling.enterprise.buildTool=js-cli");
   javaArgs.push(`-Dgatling.enterprise.pluginVersion=${versions.gatling.jsAdapter}`);