Add support for Enviornment vars in RunConfig

This is the first step towards scala-js/scala-js#4686.

Author: gzm0

Diff for: js-envs/src/main/scala/org/scalajs/jsenv/ExternalJSRun.scala

@@ -69,6 +69,7 @@ object ExternalJSRun {
     validator
       .supportsInheritIO()
       .supportsOnOutputStream()
+      .supportsAdditionalEnv()
   }
 
   /** Configuration for a [[ExternalJSRun]]
@@ -138,6 +139,10 @@ object ExternalJSRun {
     for ((name, value) <- env)
       builder.environment().put(name, value)
 
+    // additionalEnv takes precedence in case of collisions.
+    for ((name, value) <- config.additionalEnv)
+      builder.environment().put(name, value)
+
     config.logger.debug("Starting process: " + command.mkString(" "))
 
     try {

Diff for: js-envs/src/main/scala/org/scalajs/jsenv/RunConfig.scala

@@ -42,12 +42,26 @@ import org.scalajs.logging._
  *
  *  @param logger The logger to use in the run. A [[JSEnv]] is not required to
  *      log anything.
+ *
+ *  @param additionalEnv Additional environment variables for this run.
+ *
+ *      How these are retrieved in the JS code run inside the [[JSEnv]] is
+ *      completely up to the implementation, including whether:
+ *      - they are implemented with system environment variables,
+ *      - they share the same namespace than the system environment variables.
+ *
+ *      However, in any case, the variables in [[additionalEnv]] take precedence
+ *      over any (explicitly or implicitly) ambiant environment vars.
+ *
+ *      This is an optional feature; but [[JSEnv]]s are required to support an
+ *      empty [[additionalEnv]].
  */
 final class RunConfig private (
   val onOutputStream: Option[RunConfig.OnOutputStream],
   val inheritOutput: Boolean,
   val inheritError: Boolean,
   val logger: Logger,
+  val additionalEnv: Map[String, String],
   /** An option that will never be supported by anything because it is not exposed.
    *
    *  This is used to test that [[JSEnv]]s properly validate their configuration.
@@ -62,6 +76,7 @@ final class RunConfig private (
         inheritOutput = true,
         inheritError = true,
         logger = NullLogger,
+        additionalEnv = Map.empty,
         eternallyUnsupportedOption = false)
   }
 
@@ -77,6 +92,12 @@ final class RunConfig private (
   def withLogger(logger: Logger): RunConfig =
     copy(logger = logger)
 
+  def withAdditionalEnv(additionalEnv: Map[String, String]): RunConfig =
+    copy(additionalEnv = additionalEnv)
+
+  def withAdditionalEnv(name: String, value: String): RunConfig =
+    copy(additionalEnv = additionalEnv + (name -> value))
+
   private[jsenv] def withEternallyUnsupportedOption(
       eternallyUnsupportedOption: Boolean): RunConfig =
     copy(eternallyUnsupportedOption = eternallyUnsupportedOption)
@@ -85,10 +106,11 @@ final class RunConfig private (
       inheritOutput: Boolean = inheritOutput,
       inheritError: Boolean = inheritError,
       logger: Logger = logger,
+      additionalEnv: Map[String, String] = additionalEnv,
       eternallyUnsupportedOption: Boolean = eternallyUnsupportedOption
   ): RunConfig = {
     new RunConfig(onOutputStream, inheritOutput, inheritError, logger,
-        eternallyUnsupportedOption)
+        additionalEnv, eternallyUnsupportedOption)
   }
 
   /** Validates constraints on the config itself. */
@@ -119,9 +141,10 @@ final object RunConfig {
    */
   final class Validator private (
       inheritIO: Boolean,
-      onOutputStream: Boolean
+      onOutputStream: Boolean,
+      additionalEnv: Boolean
   ) {
-    private def this() = this(false, false)
+    private def this() = this(false, false, false)
 
     /** The caller supports [[RunConfig#inheritOutput]] and
      *  [[RunConfig#inheritError]].
@@ -131,6 +154,9 @@ final object RunConfig {
     /** The caller supports [[RunConfig#onOutputStream]]. */
     def supportsOnOutputStream(): Validator = copy(onOutputStream = true)
 
+    /** The caller supports [[RunConfig#additionalEnv]]. */
+    def supportsAdditionalEnv(): Validator = copy(additionalEnv = true)
+
     /** Validates that `config` is valid and only sets supported options.
      *
      *  @throws java.lang.IllegalArgumentException if there are unsupported options.
@@ -146,13 +172,19 @@ final object RunConfig {
       if (!onOutputStream && config.onOutputStream.isDefined)
         fail("onOutputStream is not supported.")
 
+      if (!additionalEnv && config.additionalEnv.nonEmpty)
+        fail("additionalEnv is not supported.")
+
       if (config.eternallyUnsupportedOption)
         fail("eternallyUnsupportedOption is not supported.")
     }
 
-    private def copy(inheritIO: Boolean = inheritIO,
-        onOutputStream: Boolean = onOutputStream) = {
-      new Validator(inheritIO, onOutputStream)
+    private def copy(
+        inheritIO: Boolean = inheritIO,
+        onOutputStream: Boolean = onOutputStream,
+        additionalEnv: Boolean = additionalEnv
+    ) = {
+      new Validator(inheritIO, onOutputStream, additionalEnv)
     }
   }
 

Diff for: js-envs/src/test/scala/org/scalajs/jsenv/ExternalJSRunTest.scala

@@ -109,6 +109,29 @@ class ExternalJSRunTest {
     Await.result(run.future, 1.second)
   }
 
+  @Test
+  def setAdditionalEnv: Unit = {
+    val runConfig = RunConfig()
+      .withAdditionalEnv("EXTERNAL_JS_RUN_TEST", "witness")
+    val config = silentConfig
+      .withRunConfig(runConfig)
+    val run = checkEnvRun("EXTERNAL_JS_RUN_TEST", "witness", config)
+
+    Await.result(run.future, 1.second)
+  }
+
+  @Test
+  def additionalEnvOverrides: Unit = {
+    val runConfig = RunConfig()
+      .withAdditionalEnv("EXTERNAL_JS_RUN_TEST", "override")
+    val config = silentConfig
+      .withEnv(Map("EXTERNAL_JS_RUN_TEST" -> "witness"))
+      .withRunConfig(runConfig)
+    val run = checkEnvRun("EXTERNAL_JS_RUN_TEST", "override", config)
+
+    Await.result(run.future, 1.second)
+  }
+
   // Confidence tests for checkEnvRun.
 
   @Test

Diff for: js-envs/src/test/scala/org/scalajs/jsenv/RunConfigTest.scala

@@ -13,6 +13,7 @@
 package org.scalajs.jsenv
 
 import org.junit.Test
+import org.junit.Assert._
 
 class RunConfigTest {
   @Test
@@ -90,6 +91,26 @@ class RunConfigTest {
       .validate(cfg)
   }
 
+  @Test
+  def supportedAdditionalEnv: Unit = {
+    val cfg = RunConfig()
+      .withAdditionalEnv("x", "y")
+    RunConfig.Validator()
+      .supportsInheritIO()
+      .supportsAdditionalEnv()
+      .validate(cfg)
+    assertEquals(Map("x" -> "y"), cfg.additionalEnv)
+  }
+
+  @Test(expected = classOf[IllegalArgumentException])
+  def unsupportedAdditionalEnv: Unit = {
+    val cfg = RunConfig()
+      .withAdditionalEnv("x", "y")
+    RunConfig.Validator()
+      .supportsInheritIO()
+      .validate(cfg)
+  }
+
   @Test(expected = classOf[IllegalArgumentException])
   def failValidationForTest: Unit = {
     val cfg = RunConfig()