From c423d0d5ce9384ecb30cc7e4f55d7e4b546bf7b0 Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Tue, 19 Dec 2023 16:33:47 +0000
Subject: [PATCH 1/8] feat: Allow environment variables in run configurations

Allow users to set their own env vars per run-configuration.
It is not respected everywhere (see the list below), but it works on our example projects.

Main features:
- Env vars should work when **run**ing and **debug**ging any binary.
- Env vars should work when **run**ning any test.
- Env vars should work when **debug**ging Go and Java tests. Env vars for C++ test debugging are implemented internally, but they're part of a larger patch and I'll need some more work to untangle that.
---
 .../idea/blaze/base/command/BlazeCommand.java |  2 ++
 .../base/command/BlazeCommandRunner.java      | 15 +++++----
 .../CommandLineBlazeCommandRunner.java        | 24 +++++++++-----
 .../base/qsync/BazelAppInspectorBuilder.java  |  3 +-
 .../base/qsync/BazelDependencyBuilder.java    |  3 +-
 .../base/qsync/BazelRenderJarBuilder.java     |  3 +-
 ...eCommandGenericRunConfigurationRunner.java | 31 ++++++++++++++-----
 .../ScopedBlazeProcessHandler.java            |  1 -
 ...azeCommandRunConfigurationCommonState.java |  9 +++++-
 .../run/state/EnvironmentVariablesState.java  | 13 ++++++++
 .../aspects/BlazeIdeInterfaceAspectsImpl.java |  2 +-
 .../base/bazel/FakeBlazeCommandRunner.java    | 19 +++++++-----
 .../hi/src/com/example/HiGreeter.java         |  3 +-
 .../run/BlazeGoRunConfigurationRunner.java    |  2 +-
 .../java/run/BlazeJavaRunConfigState.java     |  2 +-
 .../java/run/BlazeJavaRunProfileState.java    | 10 +++++-
 .../run/BuildPluginBeforeRunTaskProvider.java |  3 +-
 17 files changed, 104 insertions(+), 41 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
index de9138ae1ea..57051305547 100644
--- a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
+++ b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
@@ -17,6 +17,7 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
 import com.google.idea.blaze.base.model.primitives.TargetExpression;
@@ -101,6 +102,7 @@ public static class Builder {
     private final ImmutableList.Builder<TargetExpression> targets = ImmutableList.builder();
     private final ImmutableList.Builder<String> blazeCmdlineFlags = ImmutableList.builder();
     private final ImmutableList.Builder<String> exeFlags = ImmutableList.builder();
+    private final ImmutableMap.Builder<String, String> envVars = ImmutableMap.builder();
 
     public Builder(String binaryPath, BlazeCommandName name) {
       this.binaryPath = binaryPath;
diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommandRunner.java b/base/src/com/google/idea/blaze/base/command/BlazeCommandRunner.java
index 1c1b02c0b7c..3122e52bc3c 100644
--- a/base/src/com/google/idea/blaze/base/command/BlazeCommandRunner.java
+++ b/base/src/com/google/idea/blaze/base/command/BlazeCommandRunner.java
@@ -25,6 +25,7 @@
 import com.intellij.openapi.project.Project;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /** Runs a blaze command. */
@@ -38,7 +39,8 @@ BlazeBuildOutputs run(
       Project project,
       BlazeCommand.Builder blazeCommandBuilder,
       BuildResultHelper buildResultHelper,
-      BlazeContext context)
+      BlazeContext context,
+      Map<String, String> envVars)
       throws BuildException;
 
   /**
@@ -46,11 +48,12 @@ BlazeBuildOutputs run(
    * the given {@link BuildResultHelper}.
    */
   BlazeTestResults runTest(
-      Project project,
-      BlazeCommand.Builder blazeCommandBuilder,
-      BuildResultHelper buildResultHelper,
-      BlazeContext context)
-      throws BuildException;
+          Project project,
+          BlazeCommand.Builder blazeCommandBuilder,
+          BuildResultHelper buildResultHelper,
+          BlazeContext context,
+          Map<String, String> envVars)
+          throws BuildException;
 
   /**
    * Runs a blaze query command.
diff --git a/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java b/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java
index e28b1a79dc7..204ea8b64bb 100644
--- a/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java
+++ b/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java
@@ -52,6 +52,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -60,13 +61,14 @@ public class CommandLineBlazeCommandRunner implements BlazeCommandRunner {
 
   @Override
   public BlazeBuildOutputs run(
-      Project project,
-      BlazeCommand.Builder blazeCommandBuilder,
-      BuildResultHelper buildResultHelper,
-      BlazeContext context) {
+          Project project,
+          BlazeCommand.Builder blazeCommandBuilder,
+          BuildResultHelper buildResultHelper,
+          BlazeContext context,
+          Map<String, String> envVars) {
 
     BuildResult buildResult =
-        issueBuild(blazeCommandBuilder, WorkspaceRoot.fromProject(project), context);
+        issueBuild(blazeCommandBuilder, WorkspaceRoot.fromProject(project), envVars, context);
     BuildDepsStatsScope.fromContext(context)
         .ifPresent(stats -> stats.setBazelExitCode(buildResult.exitCode));
     if (buildResult.status == Status.FATAL_ERROR) {
@@ -100,9 +102,14 @@ public BlazeTestResults runTest(
       Project project,
       BlazeCommand.Builder blazeCommandBuilder,
       BuildResultHelper buildResultHelper,
-      BlazeContext context) {
+      BlazeContext context,
+      Map<String, String> envVars) {
+    // For tests, we have to pass the environment variables as `--test_env`, otherwise they don't get forwarded
+    for (Map.Entry<String, String> env: envVars.entrySet()) {
+      blazeCommandBuilder.addBlazeFlags(BlazeFlags.TEST_ENV, String.format("%s=%s", env.getKey(), env.getValue()));
+    }
     BuildResult buildResult =
-        issueBuild(blazeCommandBuilder, WorkspaceRoot.fromProject(project), context);
+        issueBuild(blazeCommandBuilder, WorkspaceRoot.fromProject(project), envVars, context);
     if (buildResult.status == Status.FATAL_ERROR) {
       return BlazeTestResults.NO_RESULTS;
     }
@@ -194,11 +201,12 @@ public InputStream runBlazeInfo(
   }
 
   private BuildResult issueBuild(
-      BlazeCommand.Builder blazeCommandBuilder, WorkspaceRoot workspaceRoot, BlazeContext context) {
+      BlazeCommand.Builder blazeCommandBuilder, WorkspaceRoot workspaceRoot, Map<String, String> envVars, BlazeContext context) {
     blazeCommandBuilder.addBlazeFlags(getExtraBuildFlags(blazeCommandBuilder));
     int retVal =
         ExternalTask.builder(workspaceRoot)
             .addBlazeCommand(blazeCommandBuilder.build())
+            .environmentVars(envVars)
             .context(context)
             .stderr(
                 LineProcessingOutputStream.of(
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java
index ce33f13c54f..4428cc214cb 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelAppInspectorBuilder.java
@@ -18,6 +18,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.idea.blaze.base.bazel.BazelExitCodeException;
 import com.google.idea.blaze.base.bazel.BuildSystem;
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
@@ -70,7 +71,7 @@ public AppInspectorInfo buildAppInspector(BlazeContext context, Set<Label> build
               .addBlazeFlags(additionalBlazeFlags);
 
       BlazeBuildOutputs outputs =
-          invoker.getCommandRunner().run(project, builder, buildResultHelper, context);
+          invoker.getCommandRunner().run(project, builder, buildResultHelper, context, ImmutableMap.of());
       BazelExitCodeException.throwIfFailed(builder, outputs.buildResult);
 
       return createAppInspectorInfo(outputs);
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
index 1a442f1f441..7f8142b3efe 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
@@ -23,6 +23,7 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -186,7 +187,7 @@ public OutputInfo build(
       buildDepsStatsBuilder.ifPresent(
           stats -> stats.setBuildFlags(builder.build().toArgumentList()));
       BlazeBuildOutputs outputs =
-          invoker.getCommandRunner().run(project, builder, buildResultHelper, context);
+          invoker.getCommandRunner().run(project, builder, buildResultHelper, context, ImmutableMap.of());
       buildDepsStatsBuilder.ifPresent(
           stats -> {
             stats.setBuildIds(outputs.getBuildIds());
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java
index 776c9b64fd7..a67fabca0e5 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelRenderJarBuilder.java
@@ -18,6 +18,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.idea.blaze.base.bazel.BazelExitCodeException;
 import com.google.idea.blaze.base.bazel.BuildSystem;
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
@@ -76,7 +77,7 @@ public RenderJarInfo buildRenderJar(BlazeContext context, Set<Label> buildTarget
               .addBlazeFlags("--output_groups=intellij-render-resolve-android");
 
       BlazeBuildOutputs outputs =
-          invoker.getCommandRunner().run(project, builder, buildResultHelper, context);
+          invoker.getCommandRunner().run(project, builder, buildResultHelper, context, ImmutableMap.of());
       BazelExitCodeException.throwIfFailed(builder, outputs.buildResult);
 
       return createRenderJarInfo(outputs);
diff --git a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
index ef2e5b61b4c..d9651734d27 100644
--- a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
+++ b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
@@ -81,6 +81,7 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -192,9 +193,12 @@ public OutputStream getProcessInput() {
     private ProcessHandler getScopedProcessHandler(
         Project project, BlazeCommand blazeCommand, WorkspaceRoot workspaceRoot)
         throws ExecutionException {
+      GeneralCommandLine commandLine = new GeneralCommandLine(blazeCommand.toList());
+      @NotNull Map<String, String> envVars = handlerState.getUserEnvVarsState().getData().getEnvs();
+      commandLine.withEnvironment(envVars);
       return new ScopedBlazeProcessHandler(
           project,
-          new GeneralCommandLine(blazeCommand.toList()),
+          commandLine,
           workspaceRoot,
           new ScopedBlazeProcessHandler.ScopedProcessHandlerDelegate() {
             @Override
@@ -239,13 +243,14 @@ protected ConsoleView createConsole() {
           });
       addConsoleFilters(consoleFilters.toArray(new Filter[0]));
 
+      @NotNull Map<String, String> envVars = handlerState.getUserEnvVarsState().getData().getEnvs();
       ListenableFuture<BlazeBuildOutputs> blazeBuildOutputsListenableFuture =
           BlazeExecutor.getInstance()
               .submit(
                   () ->
                       invoker
                           .getCommandRunner()
-                          .run(project, blazeCommandBuilder, buildResultHelper, context));
+                          .run(project, blazeCommandBuilder, buildResultHelper, context, envVars));
       Futures.addCallback(
           blazeBuildOutputsListenableFuture,
           new FutureCallback<BlazeBuildOutputs>() {
@@ -311,18 +316,27 @@ protected ConsoleView createConsole() {
         context.addOutputSink(PrintOutput.class, new WritingOutputSink(consoleView));
       }
       addConsoleFilters(consoleFilters.toArray(new Filter[0]));
-      return !invoker.getCommandRunner().canUseCli()
-          ? getCommandRunnerProcessHandler(
+      @NotNull Map<String, String> envVars = handlerState.getUserEnvVarsState().getData().getEnvs();
+
+      if (invoker.getCommandRunner().canUseCli()) {
+        // BlazeCommandRunner is already supposed to handle the cases where we pass env vars to tests
+        // as part of the interface contract, so we only have to set them here.
+        for (Map.Entry<String, String> env: envVars.entrySet()) {
+          blazeCommandBuilder.addBlazeFlags(BlazeFlags.TEST_ENV, String.format("%s=%s", env.getKey(), env.getValue()));
+        }
+
+        return getScopedProcessHandler(project, blazeCommandBuilder.build(), workspaceRoot);
+      }
+      return getCommandRunnerProcessHandlerForTests(
               project,
               invoker,
               buildResultHelper,
               blazeCommandBuilder,
               testResultFinderStrategy,
-              context)
-          : getScopedProcessHandler(project, blazeCommandBuilder.build(), workspaceRoot);
+              context);
     }
 
-    private ProcessHandler getCommandRunnerProcessHandler(
+    private ProcessHandler getCommandRunnerProcessHandlerForTests(
         Project project,
         BuildInvoker invoker,
         BuildResultHelper buildResultHelper,
@@ -330,13 +344,14 @@ private ProcessHandler getCommandRunnerProcessHandler(
         BlazeTestResultFinderStrategy testResultFinderStrategy,
         BlazeContext context) {
       ProcessHandler processHandler = getGenericProcessHandler();
+      @NotNull Map<String, String> envVars = handlerState.getUserEnvVarsState().getData().getEnvs();
       ListenableFuture<BlazeTestResults> blazeTestResultsFuture =
           BlazeExecutor.getInstance()
               .submit(
                   () ->
                       invoker
                           .getCommandRunner()
-                          .runTest(project, blazeCommandBuilder, buildResultHelper, context));
+                          .runTest(project, blazeCommandBuilder, buildResultHelper, context, envVars));
       Futures.addCallback(
           blazeTestResultsFuture,
           new FutureCallback<BlazeTestResults>() {
diff --git a/base/src/com/google/idea/blaze/base/run/processhandler/ScopedBlazeProcessHandler.java b/base/src/com/google/idea/blaze/base/run/processhandler/ScopedBlazeProcessHandler.java
index 4525cb3c4e8..c4be4075a69 100644
--- a/base/src/com/google/idea/blaze/base/run/processhandler/ScopedBlazeProcessHandler.java
+++ b/base/src/com/google/idea/blaze/base/run/processhandler/ScopedBlazeProcessHandler.java
@@ -69,7 +69,6 @@ public interface ScopedProcessHandlerDelegate {
    *     context.
    * @throws ExecutionException
    */
-
   public ScopedBlazeProcessHandler(
       Project project,
       GeneralCommandLine command,
diff --git a/base/src/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonState.java b/base/src/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonState.java
index 80d1019dcbf..6865af7afde 100644
--- a/base/src/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonState.java
+++ b/base/src/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonState.java
@@ -39,18 +39,20 @@ public class BlazeCommandRunConfigurationCommonState extends RunConfigurationCom
   protected final BlazeCommandState command;
   protected final RunConfigurationFlagsState blazeFlags;
   protected final RunConfigurationFlagsState exeFlags;
+  protected final EnvironmentVariablesState envVars;
   protected final BlazeBinaryState blazeBinary;
 
   public BlazeCommandRunConfigurationCommonState(BuildSystemName buildSystemName) {
     command = new BlazeCommandState();
     blazeFlags = new RunConfigurationFlagsState(USER_BLAZE_FLAG_TAG, buildSystemName + " flags:");
     exeFlags = new RunConfigurationFlagsState(USER_EXE_FLAG_TAG, "Executable flags:");
+    envVars = new EnvironmentVariablesState();
     blazeBinary = new BlazeBinaryState();
   }
 
   @Override
   protected ImmutableList<RunConfigurationState> initializeStates() {
-    return ImmutableList.of(command, blazeFlags, exeFlags, blazeBinary);
+    return ImmutableList.of(command, blazeFlags, exeFlags, envVars, blazeBinary);
   }
 
   /** @return The list of blaze flags that the user specified manually. */
@@ -63,6 +65,11 @@ public RunConfigurationFlagsState getExeFlagsState() {
     return exeFlags;
   }
 
+  /** @return The environment variables the user specified manually. */
+  public EnvironmentVariablesState getUserEnvVarsState() {
+    return envVars;
+  }
+
   public BlazeBinaryState getBlazeBinaryState() {
     return blazeBinary;
   }
diff --git a/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java b/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
index 57113572286..4984a78f5f6 100644
--- a/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
+++ b/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
@@ -15,7 +15,9 @@
  */
 package com.google.idea.blaze.base.run.state;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.idea.blaze.base.command.BlazeFlags;
 import com.intellij.execution.configuration.EnvironmentVariablesComponent;
 import com.intellij.execution.configuration.EnvironmentVariablesData;
 import com.intellij.openapi.project.Project;
@@ -23,6 +25,7 @@
 import com.intellij.openapi.util.WriteExternalException;
 import javax.swing.JComponent;
 import org.jdom.Element;
+import java.util.Map;
 
 /** State for user-defined environment variables. */
 public class EnvironmentVariablesState implements RunConfigurationState {
@@ -32,10 +35,20 @@ public class EnvironmentVariablesState implements RunConfigurationState {
   private EnvironmentVariablesData data =
       EnvironmentVariablesData.create(ImmutableMap.of(), /* passParentEnvs= */ true);
 
+  public EnvironmentVariablesState() {}
+
   public EnvironmentVariablesData getData() {
     return data;
   }
 
+  public ImmutableList<String> asBlazeTestEnvFlags() {
+    ImmutableList.Builder<String> flags = ImmutableList.builder();
+    for (Map.Entry<String, String> env: data.getEnvs().entrySet()) {
+      flags.add(BlazeFlags.TEST_ENV, String.format("%s=%s", env.getKey(), env.getValue()));
+    }
+    return flags.build();
+  }
+
   @Override
   public void readExternal(Element element) throws InvalidDataException {
     Element child = element.getChild(ELEMENT_TAG);
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
index fe2a5c862b6..c5a1de4d8ef 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
@@ -760,7 +760,7 @@ private static BlazeBuildOutputs runBuildForTargets(
       aspectStrategy.addAspectAndOutputGroups(
           builder, outputGroups, activeLanguages, onlyDirectDeps);
 
-      return invoker.getCommandRunner().run(project, builder, buildResultHelper, context);
+      return invoker.getCommandRunner().run(project, builder, buildResultHelper, context, ImmutableMap.of());
     }
   }
 }
diff --git a/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBlazeCommandRunner.java b/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBlazeCommandRunner.java
index 5c89d64c45e..30ba51cc6ca 100644
--- a/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBlazeCommandRunner.java
+++ b/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBlazeCommandRunner.java
@@ -30,6 +30,7 @@
 import com.google.idea.blaze.exception.BuildException;
 import com.intellij.openapi.project.Project;
 import java.io.InputStream;
+import java.util.Map;
 
 /**
  * A fake for {@link BlazeCommandRunner} that doesn't execute the build, but returns results from
@@ -58,10 +59,11 @@ public FakeBlazeCommandRunner(BuildFunction buildFunction) {
 
   @Override
   public BlazeBuildOutputs run(
-      Project project,
-      BlazeCommand.Builder blazeCommandBuilder,
-      BuildResultHelper buildResultHelper,
-      BlazeContext context)
+          Project project,
+          BlazeCommand.Builder blazeCommandBuilder,
+          BuildResultHelper buildResultHelper,
+          BlazeContext context,
+          Map<String, String> envVars)
       throws BuildException {
     command = blazeCommandBuilder.build();
     try {
@@ -76,10 +78,11 @@ public BlazeBuildOutputs run(
 
   @Override
   public BlazeTestResults runTest(
-      Project project,
-      BlazeCommand.Builder blazeCommandBuilder,
-      BuildResultHelper buildResultHelper,
-      BlazeContext context) {
+          Project project,
+          BlazeCommand.Builder blazeCommandBuilder,
+          BuildResultHelper buildResultHelper,
+          BlazeContext context,
+          Map<String, String> envVars) {
     return BlazeTestResults.NO_RESULTS;
   }
 
diff --git a/examples/java/greetings_project/hi/src/com/example/HiGreeter.java b/examples/java/greetings_project/hi/src/com/example/HiGreeter.java
index e0339ca9434..6d5686cb787 100644
--- a/examples/java/greetings_project/hi/src/com/example/HiGreeter.java
+++ b/examples/java/greetings_project/hi/src/com/example/HiGreeter.java
@@ -15,4 +15,5 @@ public static void main(String[] args) {
             System.out.println(greeting);
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
index d6c53ae529d..0c294e61d73 100644
--- a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
+++ b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
@@ -141,7 +141,7 @@ private ImmutableList<String> getParameters(ExecutableInfo executable) {
       return ImmutableList.<String>builder()
           .addAll(state.getExeFlagsState().getFlagsForExternalProcesses())
           .addAll(state.getTestArgs())
-          .addAll(executable.args)
+          .addAll(state.getUserEnvVarsState().asBlazeTestEnvFlags())
           .build();
     }
 
diff --git a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunConfigState.java b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunConfigState.java
index d9236db17cf..15337995824 100644
--- a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunConfigState.java
+++ b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunConfigState.java
@@ -35,7 +35,7 @@ public class BlazeJavaRunConfigState extends BlazeCommandRunConfigurationCommonS
 
   @Override
   protected ImmutableList<RunConfigurationState> initializeStates() {
-    return ImmutableList.of(command, blazeFlags, exeFlags, debugPortState, blazeBinary);
+    return ImmutableList.of(command, blazeFlags, exeFlags, envVars, debugPortState, blazeBinary);
   }
 
   public DebugPortState getDebugPortState() {
diff --git a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
index 373b911584d..8ec1fc5641e 100644
--- a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
+++ b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
@@ -70,6 +70,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Nullable;
 
 /**
@@ -258,6 +259,10 @@ static BlazeCommand.Builder getBlazeCommandBuilder(
             .addBlazeFlags(blazeFlags)
             .addBlazeFlags(handlerState.getBlazeFlagsState().getFlagsForExternalProcesses());
 
+    if (blazeCommand.equals(BlazeCommandName.TEST)) {
+      command.addBlazeFlags(handlerState.getUserEnvVarsState().asBlazeTestEnvFlags());
+    }
+
     if (executorType == ExecutorType.DEBUG) {
       Kind kind = configuration.getTargetKind();
       boolean isBinary = kind != null && kind.getRuleType() == RuleType.BINARY;
@@ -280,9 +285,12 @@ static BlazeCommand.Builder getBlazeCommandBuilder(
   private ProcessHandler getScopedProcessHandler(
       Project project, ImmutableList<String> command, WorkspaceRoot workspaceRoot)
       throws ExecutionException {
+    GeneralCommandLine commandLine = new GeneralCommandLine(command);
+    Map<String, String> envVars = getState(getConfiguration()).getUserEnvVarsState().getData().getEnvs();
+    commandLine.withEnvironment(envVars);
     return new ScopedBlazeProcessHandler(
         project,
-        new GeneralCommandLine(command),
+        commandLine,
         workspaceRoot,
         new ScopedBlazeProcessHandler.ScopedProcessHandlerDelegate() {
           @Override
diff --git a/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java b/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java
index 9cdd9da66cd..e6b713e219a 100644
--- a/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java
+++ b/plugin_dev/src/com/google/idea/blaze/plugin/run/BuildPluginBeforeRunTaskProvider.java
@@ -15,6 +15,7 @@
  */
 package com.google.idea.blaze.plugin.run;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.idea.blaze.base.async.executor.ProgressiveTaskWithProgressIndicator;
@@ -227,7 +228,7 @@ protected Void execute(BlazeContext context) {
                     BlazeBuildOutputs outputs =
                         invoker
                             .getCommandRunner()
-                            .run(project, command, buildResultHelper, context);
+                            .run(project, command, buildResultHelper, context, ImmutableMap.of());
                     if (!outputs.buildResult.equals(BuildResult.SUCCESS)) {
                       context.setHasError();
                     }

From 60b3dc1f906d74e74f16f25c234c114392040e73 Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Wed, 17 Jan 2024 11:13:34 +0000
Subject: [PATCH 2/8] Optionally pass the parent environment as well

---
 .../com/google/idea/blaze/base/command/BlazeCommand.java | 1 -
 .../BlazeCommandGenericRunConfigurationRunner.java       | 9 +++++++--
 .../idea/blaze/java/run/BlazeJavaRunProfileState.java    | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
index 57051305547..d59f90c78ce 100644
--- a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
+++ b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
@@ -102,7 +102,6 @@ public static class Builder {
     private final ImmutableList.Builder<TargetExpression> targets = ImmutableList.builder();
     private final ImmutableList.Builder<String> blazeCmdlineFlags = ImmutableList.builder();
     private final ImmutableList.Builder<String> exeFlags = ImmutableList.builder();
-    private final ImmutableMap.Builder<String, String> envVars = ImmutableMap.builder();
 
     public Builder(String binaryPath, BlazeCommandName name) {
       this.binaryPath = binaryPath;
diff --git a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
index d9651734d27..ce233e45e0f 100644
--- a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
+++ b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
@@ -62,6 +62,7 @@
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.Executor;
+import com.intellij.execution.configuration.EnvironmentVariablesData;
 import com.intellij.execution.configurations.CommandLineState;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.configurations.RunProfileState;
@@ -194,8 +195,12 @@ private ProcessHandler getScopedProcessHandler(
         Project project, BlazeCommand blazeCommand, WorkspaceRoot workspaceRoot)
         throws ExecutionException {
       GeneralCommandLine commandLine = new GeneralCommandLine(blazeCommand.toList());
-      @NotNull Map<String, String> envVars = handlerState.getUserEnvVarsState().getData().getEnvs();
-      commandLine.withEnvironment(envVars);
+      EnvironmentVariablesData envVarState = handlerState.getUserEnvVarsState().getData();
+      commandLine.withEnvironment(envVarState.getEnvs());
+      commandLine.withParentEnvironmentType(
+              envVarState.isPassParentEnvs()
+                      ? GeneralCommandLine.ParentEnvironmentType.SYSTEM
+                      : GeneralCommandLine.ParentEnvironmentType.NONE);
       return new ScopedBlazeProcessHandler(
           project,
           commandLine,
diff --git a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
index 8ec1fc5641e..991489b5901 100644
--- a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
+++ b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
@@ -56,6 +56,7 @@
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.Executor;
+import com.intellij.execution.configuration.EnvironmentVariablesData;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.filters.TextConsoleBuilderImpl;
 import com.intellij.execution.process.ProcessHandler;
@@ -286,8 +287,12 @@ private ProcessHandler getScopedProcessHandler(
       Project project, ImmutableList<String> command, WorkspaceRoot workspaceRoot)
       throws ExecutionException {
     GeneralCommandLine commandLine = new GeneralCommandLine(command);
-    Map<String, String> envVars = getState(getConfiguration()).getUserEnvVarsState().getData().getEnvs();
-    commandLine.withEnvironment(envVars);
+    EnvironmentVariablesData envVarState = getState(getConfiguration()).getUserEnvVarsState().getData();
+    commandLine.withEnvironment(envVarState.getEnvs());
+    commandLine.withParentEnvironmentType(
+            envVarState.isPassParentEnvs()
+                    ? GeneralCommandLine.ParentEnvironmentType.SYSTEM
+                    : GeneralCommandLine.ParentEnvironmentType.NONE);
     return new ScopedBlazeProcessHandler(
         project,
         commandLine,

From 8daa6b5157feeaabc9659135c1b813d680b2a3a0 Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Wed, 17 Jan 2024 11:14:39 +0000
Subject: [PATCH 3/8] Add test case for env vars in Go

---
 examples/go/with_proto/go/main_test.go                       | 5 +++++
 .../with_proto/run_configurations/test_macro_expansion.xml   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/examples/go/with_proto/go/main_test.go b/examples/go/with_proto/go/main_test.go
index b6dd2e17bdf..281242e243b 100644
--- a/examples/go/with_proto/go/main_test.go
+++ b/examples/go/with_proto/go/main_test.go
@@ -21,6 +21,11 @@ func TestFlagMacros(t *testing.T) {
 			validation: func(expanded string) bool { return expanded != "$WorkspaceRoot" },
 			error:      "$WorkspaceRoot$ macro didn't get expanded",
 		},
+		{
+			envVar:     "ENV_VAR_IN_PLAIN_RUN_CONFIG",
+			validation: func(expanded string) bool { return expanded == "it works" },
+			error:      "Expected value to be 'it works'",
+		},
 	}
 	for _, testCase := range testCases {
 		expanded := os.Getenv(testCase.envVar)
diff --git a/examples/go/with_proto/run_configurations/test_macro_expansion.xml b/examples/go/with_proto/run_configurations/test_macro_expansion.xml
index 769fe0d0b8d..5336b5db070 100644
--- a/examples/go/with_proto/run_configurations/test_macro_expansion.xml
+++ b/examples/go/with_proto/run_configurations/test_macro_expansion.xml
@@ -7,6 +7,11 @@
         <blaze-user-flag>--test_env=GO_TEST_WRAP_TESTV=1</blaze-user-flag>
         <blaze-user-flag>--test_env=WORKSPACE_ROOT=$WorkspaceRoot$</blaze-user-flag>
         <blaze-user-flag>--test_env=PROJECT_NAME=$ProjectName$</blaze-user-flag>
+        <env_state>
+            <envs>
+                <env name="ENV_VAR_IN_PLAIN_RUN_CONFIG" value="it works" />
+            </envs>
+        </env_state>
     </blaze-settings>
     <method v="2">
         <option name="Blaze.BeforeRunTask" enabled="true"/>

From ecdd95c7cde61367919b379d6cd4479683fbf19e Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Wed, 17 Jan 2024 11:25:24 +0000
Subject: [PATCH 4/8] Pass env vars to go debug configurations correctly

---
 examples/go/with_proto/with_proto.bazelproject           | 2 +-
 .../blaze/golang/run/BlazeGoRunConfigurationRunner.java  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/go/with_proto/with_proto.bazelproject b/examples/go/with_proto/with_proto.bazelproject
index 3f0d2cbdc49..bd1c82b4b5b 100644
--- a/examples/go/with_proto/with_proto.bazelproject
+++ b/examples/go/with_proto/with_proto.bazelproject
@@ -11,5 +11,5 @@ gazelle_target: //:gazelle
 import_run_configurations:
   # Test that validates that macro expansion works, as per issue:
   #    https://github.com/bazelbuild/intellij/issues/4112#event-7958662669
-  # This configuration should be executed on both 'run' (the green arrow) and 'debug' (the bug) modes.
+  # This configuration should only be executed on both 'run' (the green arrow) mode.
   run_configurations/test_macro_expansion.xml
diff --git a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
index 0c294e61d73..2217f0d3928 100644
--- a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
+++ b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
@@ -47,6 +47,7 @@
 import com.google.idea.blaze.base.run.confighandler.BlazeCommandGenericRunConfigurationRunner.BlazeCommandRunProfileState;
 import com.google.idea.blaze.base.run.confighandler.BlazeCommandRunConfigurationRunner;
 import com.google.idea.blaze.base.run.state.BlazeCommandRunConfigurationCommonState;
+import com.google.idea.blaze.base.run.state.EnvironmentVariablesState;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.google.idea.blaze.base.sync.aspects.BuildResult;
@@ -60,6 +61,7 @@
 import com.intellij.execution.Executor;
 import com.intellij.execution.RunCanceledByUserException;
 import com.intellij.execution.RunManager;
+import com.intellij.execution.configuration.EnvironmentVariablesData;
 import com.intellij.execution.configurations.RunProfileState;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ExecutionUtil;
@@ -141,7 +143,7 @@ private ImmutableList<String> getParameters(ExecutableInfo executable) {
       return ImmutableList.<String>builder()
           .addAll(state.getExeFlagsState().getFlagsForExternalProcesses())
           .addAll(state.getTestArgs())
-          .addAll(state.getUserEnvVarsState().asBlazeTestEnvFlags())
+          .addAll(executable.args)
           .build();
     }
 
@@ -171,6 +173,11 @@ GoApplicationRunningState toNativeState(ExecutionEnvironment env) throws Executi
       // GoBuildingRunningState$ProcessHandler#processTerminated
       nativeConfig.setOutputDirectory(executable.binary.getParent());
       nativeConfig.setParams(ParametersListUtil.join(getParameters(executable)));
+
+      EnvironmentVariablesData envVarsState = state.getUserEnvVarsState().getData();
+      nativeConfig.setCustomEnvironment(envVarsState.getEnvs());
+      nativeConfig.setPassParentEnvironment(envVarsState.isPassParentEnvs());
+
       nativeConfig.setWorkingDirectory(executable.workingDir.getPath());
 
       Map<String, String> customEnvironment = new HashMap<>(nativeConfig.getCustomEnvironment());

From 096800392bef426b800d4bc43e6224c2da9240ee Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Wed, 17 Jan 2024 11:52:37 +0000
Subject: [PATCH 5/8] Address comments

---
 .../BlazeCommandGenericRunConfigurationRunner.java |  5 +++--
 examples/java/greetings_project/greeting_lib/BUILD |  9 +++++++++
 .../tests/com/example/EnvVarsTest.java             | 14 ++++++++++++++
 .../tests/com/example/GreetingTest.java            |  7 ++++---
 .../greetings_project/hello/hello.bazelproject     |  3 +++
 examples/java/greetings_project/hi/hi.bazelproject |  5 ++++-
 .../run_configurations/Bazel_test_EnvVarsTest.xml  |  1 +
 .../Bazel_test_EnvVarsTest_testEnvVars.xml         |  1 +
 .../Bazel_test_greeting_lib_env_vars_test.xml      |  1 +
 .../run_configurations/fragment.bazelproject       |  8 ++++++++
 10 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 examples/java/greetings_project/greeting_lib/tests/com/example/EnvVarsTest.java
 create mode 100644 examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest.xml
 create mode 100644 examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest_testEnvVars.xml
 create mode 100644 examples/java/greetings_project/run_configurations/Bazel_test_greeting_lib_env_vars_test.xml
 create mode 100644 examples/java/greetings_project/run_configurations/fragment.bazelproject

diff --git a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
index ce233e45e0f..0a86648b3c7 100644
--- a/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
+++ b/base/src/com/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
@@ -324,8 +324,9 @@ protected ConsoleView createConsole() {
       @NotNull Map<String, String> envVars = handlerState.getUserEnvVarsState().getData().getEnvs();
 
       if (invoker.getCommandRunner().canUseCli()) {
-        // BlazeCommandRunner is already supposed to handle the cases where we pass env vars to tests
-        // as part of the interface contract, so we only have to set them here.
+        // If we can use the CLI, that means we will run through Bazel (as opposed to a raw process handler)
+        // When running `bazel test`, bazel will not forward the environment to the tests themselves -- we need to use
+        // the --test_env flag for that. Therefore, we convert all the env vars to --test_env flags here.
         for (Map.Entry<String, String> env: envVars.entrySet()) {
           blazeCommandBuilder.addBlazeFlags(BlazeFlags.TEST_ENV, String.format("%s=%s", env.getKey(), env.getValue()));
         }
diff --git a/examples/java/greetings_project/greeting_lib/BUILD b/examples/java/greetings_project/greeting_lib/BUILD
index ab0fd803ef4..7339b110c64 100644
--- a/examples/java/greetings_project/greeting_lib/BUILD
+++ b/examples/java/greetings_project/greeting_lib/BUILD
@@ -13,3 +13,12 @@ java_test(
         "@junit//jar",
     ],
 )
+
+java_test(
+    name = "env_vars_test",
+    srcs = ["tests/com/example/EnvVarsTest.java"],
+    test_class = "com.example.EnvVarsTest",
+    deps = [
+        "@junit//jar",
+    ],
+)
diff --git a/examples/java/greetings_project/greeting_lib/tests/com/example/EnvVarsTest.java b/examples/java/greetings_project/greeting_lib/tests/com/example/EnvVarsTest.java
new file mode 100644
index 00000000000..a047828d187
--- /dev/null
+++ b/examples/java/greetings_project/greeting_lib/tests/com/example/EnvVarsTest.java
@@ -0,0 +1,14 @@
+package com.example;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+// These tests are meant to be run with the run configurations in run_configurations
+public class EnvVarsTest {
+    @Test
+    public void testEnvVars() {
+        String hello = System.getenv("HELLO");
+        assertEquals(hello, "world");
+    }
+}
diff --git a/examples/java/greetings_project/greeting_lib/tests/com/example/GreetingTest.java b/examples/java/greetings_project/greeting_lib/tests/com/example/GreetingTest.java
index c3d11cc485f..8dae42debe1 100644
--- a/examples/java/greetings_project/greeting_lib/tests/com/example/GreetingTest.java
+++ b/examples/java/greetings_project/greeting_lib/tests/com/example/GreetingTest.java
@@ -9,18 +9,19 @@
 import static org.junit.Assert.assertEquals;
 
 public class GreetingTest {
-   @Test
+
+    @Test
     public void testGreetNoNames() {
        List<String> got = Greeting.getGreetings("greetings", Collections.emptyList());
        assertEquals(0, got.size());
-   }
+    }
 
     @Test
     public void testGreetOneName() {
         List<String> got = Greeting.getGreetings("greetings", Collections.singletonList("name"));
         assertEquals(1, got.size());
         assertEquals("greetings name!", got.get(0));
-   }
+    }
 
     @Test
     public void testGreetMultipleNames() {
diff --git a/examples/java/greetings_project/hello/hello.bazelproject b/examples/java/greetings_project/hello/hello.bazelproject
index e73a84ddaf0..f350146385f 100644
--- a/examples/java/greetings_project/hello/hello.bazelproject
+++ b/examples/java/greetings_project/hello/hello.bazelproject
@@ -1,7 +1,10 @@
+import run_configurations/fragment.bazelproject
+
 directories:
   # Add the directories you want added as source here
   hello
   greeting_lib
+  run_configurations
 
 # Automatically includes all relevant targets under the 'directories' above
 derive_targets_from_directories: true
diff --git a/examples/java/greetings_project/hi/hi.bazelproject b/examples/java/greetings_project/hi/hi.bazelproject
index af1c090b509..fdfa1efd5ea 100644
--- a/examples/java/greetings_project/hi/hi.bazelproject
+++ b/examples/java/greetings_project/hi/hi.bazelproject
@@ -1,7 +1,10 @@
+import run_configurations/fragment.bazelproject
+
 directories:
   # Add the directories you want added as source here
   hi
   greeting_lib
+  run_configurations
 
 # Automatically includes all relevant targets under the 'directories' above
 derive_targets_from_directories: true
@@ -18,4 +21,4 @@ additional_languages:
   # dart
   # kotlin
   # python
-  # scala
\ No newline at end of file
+  # scala
diff --git a/examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest.xml b/examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest.xml
new file mode 100644
index 00000000000..c021f71a417
--- /dev/null
+++ b/examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest.xml
@@ -0,0 +1 @@
+<configuration default="false" name="Bazel test EnvVarsTest" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings kind="java_test" handler-id="BlazeJavaRunConfigurationHandlerProvider" context-element="$PROJECT_DIR$/../greeting_lib/tests/com/example/EnvVarsTest.java#com.example.EnvVarsTest" blaze-command="test"><blaze-target>//greeting_lib:env_vars_test</blaze-target><blaze-user-flag>--test_filter=com.example.EnvVarsTest#</blaze-user-flag><env_state><envs><env name="HELLO" value="world" /></envs></env_state></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
\ No newline at end of file
diff --git a/examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest_testEnvVars.xml b/examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest_testEnvVars.xml
new file mode 100644
index 00000000000..e2faba6633f
--- /dev/null
+++ b/examples/java/greetings_project/run_configurations/Bazel_test_EnvVarsTest_testEnvVars.xml
@@ -0,0 +1 @@
+<configuration default="false" name="Bazel test EnvVarsTest.testEnvVars" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings kind="java_test" handler-id="BlazeJavaRunConfigurationHandlerProvider" context-element="$PROJECT_DIR$/../greeting_lib/tests/com/example/EnvVarsTest.java#testEnvVars" blaze-command="test"><blaze-target>//greeting_lib:env_vars_test</blaze-target><blaze-user-flag>--test_sharding_strategy=disabled</blaze-user-flag><blaze-user-flag>--test_filter=com.example.EnvVarsTest#testEnvVars$</blaze-user-flag><env_state><envs><env name="HELLO" value="world" /></envs></env_state></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
\ No newline at end of file
diff --git a/examples/java/greetings_project/run_configurations/Bazel_test_greeting_lib_env_vars_test.xml b/examples/java/greetings_project/run_configurations/Bazel_test_greeting_lib_env_vars_test.xml
new file mode 100644
index 00000000000..9ae536f1b35
--- /dev/null
+++ b/examples/java/greetings_project/run_configurations/Bazel_test_greeting_lib_env_vars_test.xml
@@ -0,0 +1 @@
+<configuration default="false" name="Bazel test greeting_lib:env_vars_test" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command" nameIsGenerated="true"><blaze-settings kind="java_test" handler-id="BlazeJavaRunConfigurationHandlerProvider" blaze-command="test"><blaze-target>//greeting_lib:env_vars_test</blaze-target><env_state><envs><env name="HELLO" value="world" /></envs></env_state></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
\ No newline at end of file
diff --git a/examples/java/greetings_project/run_configurations/fragment.bazelproject b/examples/java/greetings_project/run_configurations/fragment.bazelproject
new file mode 100644
index 00000000000..c6138213218
--- /dev/null
+++ b/examples/java/greetings_project/run_configurations/fragment.bazelproject
@@ -0,0 +1,8 @@
+import_run_configurations:
+  # Tests that validate that environment variable passing works.
+  # This configuration should only be executed on both 'run' (the green arrow) mode.
+  run_configurations/Bazel_test_EnvVarsTest_testEnvVars.xml
+  run_configurations/Bazel_test_EnvVarsTest.xml
+  run_configurations/Bazel_test_greeting_lib_env_vars_test.xml
+
+

From b1393786a9ce910e4ed772b722702b9cfc63d55e Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Wed, 17 Jan 2024 11:56:34 +0000
Subject: [PATCH 6/8] Remove unused import

---
 base/src/com/google/idea/blaze/base/command/BlazeCommand.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
index d59f90c78ce..de9138ae1ea 100644
--- a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
+++ b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
@@ -17,7 +17,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
 import com.google.idea.blaze.base.model.primitives.TargetExpression;

From 01a82248501e800b0661a2a012967cbb71f2d7b5 Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Wed, 17 Jan 2024 14:24:34 +0000
Subject: [PATCH 7/8] Add unit tests

---
 .../run/state/EnvironmentVariablesState.java  |  4 ++
 ...gurationGenericHandlerIntegrationTest.java |  8 ++++
 ...ommandRunConfigurationCommonStateTest.java |  9 ++++
 .../state/EnvironmentVariablesStateTest.java  | 45 +++++++++++++++++
 .../run/BlazeJavaRunProfileStateTest.java     | 48 +++++++++++++++++++
 5 files changed, 114 insertions(+)
 create mode 100644 base/tests/unittests/com/google/idea/blaze/base/run/state/EnvironmentVariablesStateTest.java

diff --git a/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java b/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
index 4984a78f5f6..a62aa863594 100644
--- a/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
+++ b/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
@@ -70,6 +70,10 @@ public RunConfigurationStateEditor getEditor(Project project) {
     return new Editor();
   }
 
+  public void setEnvVars(Map<String, String> vars) {
+    data = data.with(vars);
+  }
+
   private static class Editor implements RunConfigurationStateEditor {
     private final EnvironmentVariablesComponent component = new EnvironmentVariablesComponent();
 
diff --git a/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java b/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java
index fb9bebd1080..f2dd41ffe1f 100644
--- a/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java
+++ b/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java
@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.idea.blaze.base.BlazeIntegrationTestCase;
 import com.google.idea.blaze.base.command.BlazeCommandName;
 import com.google.idea.blaze.base.model.MockBlazeProjectDataBuilder;
@@ -88,6 +89,7 @@ public void testReadAndWriteMatches() throws Exception {
     state.getBlazeFlagsState().setRawFlags(ImmutableList.of("--flag1", "--flag2"));
     state.getExeFlagsState().setRawFlags(ImmutableList.of("--exeFlag1"));
     state.getBlazeBinaryState().setBlazeBinary("/usr/bin/blaze");
+    state.getUserEnvVarsState().setEnvVars(ImmutableMap.of("HELLO", "world"));
 
     Element element = new Element("test");
     configuration.writeExternal(element);
@@ -107,6 +109,7 @@ public void testReadAndWriteMatches() throws Exception {
         .inOrder();
     assertThat(readState.getExeFlagsState().getRawFlags()).containsExactly("--exeFlag1");
     assertThat(readState.getBlazeBinaryState().getBlazeBinary()).isEqualTo("/usr/bin/blaze");
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs()).isEqualTo(ImmutableMap.of("HELLO", "world"));
   }
 
   @Test
@@ -155,6 +158,8 @@ public void testEditorApplyToAndResetFromMatches() throws ConfigurationException
         .isEqualTo(state.getExeFlagsState().getRawFlags());
     assertThat(readState.getBlazeBinaryState().getBlazeBinary())
         .isEqualTo(state.getBlazeBinaryState().getBlazeBinary());
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs())
+            .isEqualTo(state.getUserEnvVarsState().getData().getEnvs());
 
     Disposer.dispose(editor);
   }
@@ -185,6 +190,7 @@ public void testEditorApplyToAndResetFromHandlesNulls() throws ConfigurationExce
     readState.getBlazeFlagsState().setRawFlags(ImmutableList.of("--flag1", "--flag2"));
     readState.getExeFlagsState().setRawFlags(ImmutableList.of("--exeFlag1"));
     readState.getBlazeBinaryState().setBlazeBinary("/usr/bin/blaze");
+    readState.getUserEnvVarsState().setEnvVars(ImmutableMap.of("HELLO", "world"));
 
     editor.applyEditorTo(readConfiguration);
 
@@ -201,6 +207,8 @@ public void testEditorApplyToAndResetFromHandlesNulls() throws ConfigurationExce
         .isEqualTo(state.getExeFlagsState().getRawFlags());
     assertThat(readState.getBlazeBinaryState().getBlazeBinary())
         .isEqualTo(state.getBlazeBinaryState().getBlazeBinary());
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs())
+            .isEqualTo(state.getUserEnvVarsState().getData().getEnvs());
 
     Disposer.dispose(editor);
   }
diff --git a/base/tests/unittests/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonStateTest.java b/base/tests/unittests/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonStateTest.java
index 42a1962a667..5e9db6f6832 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonStateTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/run/state/BlazeCommandRunConfigurationCommonStateTest.java
@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.idea.blaze.base.BlazeTestCase;
 import com.google.idea.blaze.base.command.BlazeCommandName;
@@ -59,6 +60,7 @@ public void readAndWriteShouldMatch() throws Exception {
     state.getBlazeFlagsState().setRawFlags(ImmutableList.of("--flag1", "--flag2"));
     state.getExeFlagsState().setRawFlags(ImmutableList.of("--exeFlag1"));
     state.getBlazeBinaryState().setBlazeBinary("/usr/bin/blaze");
+    state.getUserEnvVarsState().setEnvVars(ImmutableMap.of("HELLO", "world"));
 
     Element element = new Element("test");
     state.writeExternal(element);
@@ -72,6 +74,7 @@ public void readAndWriteShouldMatch() throws Exception {
         .inOrder();
     assertThat(readState.getExeFlagsState().getRawFlags()).containsExactly("--exeFlag1");
     assertThat(readState.getBlazeBinaryState().getBlazeBinary()).isEqualTo("/usr/bin/blaze");
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs()).isEqualTo(ImmutableMap.of("HELLO", "world"));
   }
 
   @Test
@@ -90,6 +93,8 @@ public void readAndWriteShouldHandleNulls() throws Exception {
         .isEqualTo(state.getExeFlagsState().getRawFlags());
     assertThat(readState.getBlazeBinaryState().getBlazeBinary())
         .isEqualTo(state.getBlazeBinaryState().getBlazeBinary());
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs())
+            .isEqualTo(state.getUserEnvVarsState().getData().getEnvs());
   }
 
   @Test
@@ -155,6 +160,8 @@ public void editorApplyToAndResetFromShouldMatch() throws Exception {
         .isEqualTo(state.getExeFlagsState().getRawFlags());
     assertThat(readState.getBlazeBinaryState().getBlazeBinary())
         .isEqualTo(state.getBlazeBinaryState().getBlazeBinary());
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs())
+            .isEqualTo(state.getUserEnvVarsState().getData().getEnvs());
   }
 
   @Test
@@ -174,5 +181,7 @@ public void editorApplyToAndResetFromShouldHandleNulls() throws Exception {
         .isEqualTo(state.getExeFlagsState().getRawFlags());
     assertThat(readState.getBlazeBinaryState().getBlazeBinary())
         .isEqualTo(state.getBlazeBinaryState().getBlazeBinary());
+    assertThat(readState.getUserEnvVarsState().getData().getEnvs())
+            .isEqualTo(state.getUserEnvVarsState().getData().getEnvs());
   }
 }
diff --git a/base/tests/unittests/com/google/idea/blaze/base/run/state/EnvironmentVariablesStateTest.java b/base/tests/unittests/com/google/idea/blaze/base/run/state/EnvironmentVariablesStateTest.java
new file mode 100644
index 00000000000..87064906cf6
--- /dev/null
+++ b/base/tests/unittests/com/google/idea/blaze/base/run/state/EnvironmentVariablesStateTest.java
@@ -0,0 +1,45 @@
+package com.google.idea.blaze.base.run.state;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.Map;
+
+/** Unit tests for {@link EnvironmentVariablesState}. */
+@RunWith(JUnit4.class)
+public class EnvironmentVariablesStateTest {
+
+    @Test
+    public void testSetEnvVarsReadWrite() {
+        Map<String, String> env = ImmutableMap.of("HELLO", "world", "HI", "friends");
+        EnvironmentVariablesState state = new EnvironmentVariablesState();
+
+        assertThat(state.getData().getEnvs()).isEmpty();
+        state.setEnvVars(env);
+
+        RunConfigurationStateEditor editor = state.getEditor(null);
+        editor.resetEditorFrom(state);
+        editor.applyEditorTo(state);
+
+        assertThat(state.getData().getEnvs()).isEqualTo(env);
+        assertThat(state.asBlazeTestEnvFlags())
+                .containsExactly("--test_env", "HELLO=world", "--test_env", "HI=friends")
+                .inOrder();
+    }
+
+    @Test
+    public void testAsBlazeTestFlags() {
+        EnvironmentVariablesState state = new EnvironmentVariablesState();
+        assertThat(state.asBlazeTestEnvFlags()).isEmpty();
+        state.setEnvVars(ImmutableMap.of("HELLO", "world", "HI", "friends"));
+        assertThat(state.asBlazeTestEnvFlags())
+                .containsExactly("--test_env", "HELLO=world", "--test_env", "HI=friends")
+                .inOrder();
+    }
+}
diff --git a/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java b/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java
index 79711a1ed6e..b4f445dde33 100644
--- a/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java
+++ b/java/tests/unittests/com/google/idea/blaze/java/run/BlazeJavaRunProfileStateTest.java
@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.idea.blaze.base.BlazeTestCase;
 import com.google.idea.blaze.base.bazel.BuildSystemProvider;
@@ -163,6 +164,53 @@ public void flagsShouldBeAppendedIfPresent() {
                 "//label:rule"));
   }
 
+  @Test
+  public void envVarsAppearAsTestEnvWhenCommandIsTest() {
+    configuration.setTargetInfo(
+            TargetInfo.builder(Label.create("//label:rule"), "java_test").build());
+    BlazeCommandRunConfigurationCommonState handlerState =
+            (BlazeCommandRunConfigurationCommonState) configuration.getHandler().getState();
+
+    handlerState.getCommandState().setCommand(BlazeCommandName.TEST);
+    handlerState.getUserEnvVarsState().setEnvVars(ImmutableMap.of("HELLO", "world"));
+
+    // Regular Run
+    assertThat(BlazeJavaRunProfileState
+              .getBlazeCommandBuilder(
+                      project,
+                      configuration,
+                      ImmutableList.of(),
+                      ExecutorType.RUN,
+                      null)
+              .build().toList())
+            .containsExactly(
+                    "/usr/bin/blaze",
+                    "test",
+                    BlazeFlags.getToolTagFlag(),
+                    "--test_env", "HELLO=world",
+                    "--",
+                    "//label:rule"
+            ).inOrder();
+
+    // Fast build
+    assertThat(BlazeJavaRunProfileState
+            .getBlazeCommandBuilder(
+                    project,
+                    configuration,
+                    ImmutableList.of(),
+                    ExecutorType.FAST_BUILD_RUN,
+                    null)
+            .build().toList())
+            .containsExactly(
+                    "/usr/bin/blaze",
+                    "test",
+                    BlazeFlags.getToolTagFlag(),
+                    "--test_env", "HELLO=world",
+                    "--",
+                    "//label:rule"
+            ).inOrder();
+  }
+
   @Test
   public void debugFlagShouldBeIncludedForJavaTest() {
     configuration.setTargetInfo(

From 158cf4fe0feda20dda8e0bbe4f8943926aea7543 Mon Sep 17 00:00:00 2001
From: Borja Lorente <blorente@apple.com>
Date: Thu, 25 Jan 2024 10:43:25 +0000
Subject: [PATCH 8/8] Address comments

---
 .../run/state/EnvironmentVariablesState.java  |  3 +++
 ...gurationGenericHandlerIntegrationTest.java |  1 +
 examples/go/with_proto/go/main_test.go        | 20 +++++++++++++++++++
 .../run_configurations/test_env_vars.xml      | 18 +++++++++++++++++
 .../test_macro_expansion.xml                  |  2 +-
 .../go/with_proto/with_proto.bazelproject     |  7 ++++++-
 .../run/BlazeGoRunConfigurationRunner.java    |  1 -
 7 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 examples/go/with_proto/run_configurations/test_env_vars.xml

diff --git a/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java b/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
index a62aa863594..2b75ed92b9b 100644
--- a/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
+++ b/base/src/com/google/idea/blaze/base/run/state/EnvironmentVariablesState.java
@@ -25,6 +25,8 @@
 import com.intellij.openapi.util.WriteExternalException;
 import javax.swing.JComponent;
 import org.jdom.Element;
+import org.jetbrains.annotations.VisibleForTesting;
+
 import java.util.Map;
 
 /** State for user-defined environment variables. */
@@ -70,6 +72,7 @@ public RunConfigurationStateEditor getEditor(Project project) {
     return new Editor();
   }
 
+  @VisibleForTesting
   public void setEnvVars(Map<String, String> vars) {
     data = data.with(vars);
   }
diff --git a/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java b/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java
index f2dd41ffe1f..a3c6e4c4f99 100644
--- a/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java
+++ b/base/tests/integrationtests/com/google/idea/blaze/base/run/BlazeCommandRunConfigurationGenericHandlerIntegrationTest.java
@@ -138,6 +138,7 @@ public void testEditorApplyToAndResetFromMatches() throws ConfigurationException
     state.getBlazeFlagsState().setRawFlags(ImmutableList.of("--flag1", "--flag2"));
     state.getExeFlagsState().setRawFlags(ImmutableList.of("--exeFlag1"));
     state.getBlazeBinaryState().setBlazeBinary("/usr/bin/blaze");
+    state.getUserEnvVarsState().setEnvVars(ImmutableMap.of("HELLO", "world"));
 
     editor.resetFrom(configuration);
     BlazeCommandRunConfiguration readConfiguration =
diff --git a/examples/go/with_proto/go/main_test.go b/examples/go/with_proto/go/main_test.go
index 281242e243b..bcd5225425a 100644
--- a/examples/go/with_proto/go/main_test.go
+++ b/examples/go/with_proto/go/main_test.go
@@ -34,3 +34,23 @@ func TestFlagMacros(t *testing.T) {
 		}
 	}
 }
+
+func TestEnvVars(t *testing.T) {
+	testCases := []struct {
+		envVar     string
+		validation func(string) bool
+		error      string
+	}{
+		{
+			envVar:     "ENV_VAR_IN_PLAIN_RUN_CONFIG",
+			validation: func(expanded string) bool { return expanded == "it works" },
+			error:      "Expected value to be 'it works'",
+		},
+	}
+	for _, testCase := range testCases {
+		expanded := os.Getenv(testCase.envVar)
+		if !testCase.validation(expanded) {
+			t.Errorf("Failure validating expansion for env var %s: Got, %s, error is: %s", testCase.envVar, expanded, testCase.error)
+		}
+	}
+}
diff --git a/examples/go/with_proto/run_configurations/test_env_vars.xml b/examples/go/with_proto/run_configurations/test_env_vars.xml
new file mode 100644
index 00000000000..37d93b8c461
--- /dev/null
+++ b/examples/go/with_proto/run_configurations/test_env_vars.xml
@@ -0,0 +1,18 @@
+<configuration default="false" name="Test Environment Variables" type="BlazeCommandRunConfigurationType"
+               factoryName="Bazel Command">
+    <blaze-settings blaze-command="test" kind="go_test" handler-id="BlazeGoRunConfigurationHandlerProvider"
+                    context-element="$PROJECT_DIR$/../go/main_test.go#TestEnvVars">
+        <blaze-target>//go:go_test</blaze-target>
+        <blaze-user-flag>--test_env=GO_TEST_WRAP_TESTV=1</blaze-user-flag>
+        <blaze-user-flag>--test_env=GO_TEST_WRAP_TESTV=1</blaze-user-flag>
+        <blaze-user-flag>--test_filter=^TestEnvVars$</blaze-user-flag>
+        <env_state>
+            <envs>
+                <env name="ENV_VAR_IN_PLAIN_RUN_CONFIG" value="it works"/>
+            </envs>
+        </env_state>
+    </blaze-settings>
+    <method v="2">
+        <option name="Blaze.BeforeRunTask" enabled="true"/>
+    </method>
+</configuration>
diff --git a/examples/go/with_proto/run_configurations/test_macro_expansion.xml b/examples/go/with_proto/run_configurations/test_macro_expansion.xml
index 5336b5db070..6dc0a893f7e 100644
--- a/examples/go/with_proto/run_configurations/test_macro_expansion.xml
+++ b/examples/go/with_proto/run_configurations/test_macro_expansion.xml
@@ -1,4 +1,4 @@
-<configuration name="Bazel test go:go_test" type="BlazeCommandRunConfigurationType"
+<configuration name="Test Macro Expansion" type="BlazeCommandRunConfigurationType"
                factoryName="Bazel Command" nameIsGenerated="true">
     <blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" blaze-command="test"
                     kind="go_test">
diff --git a/examples/go/with_proto/with_proto.bazelproject b/examples/go/with_proto/with_proto.bazelproject
index bd1c82b4b5b..92f9899f31f 100644
--- a/examples/go/with_proto/with_proto.bazelproject
+++ b/examples/go/with_proto/with_proto.bazelproject
@@ -11,5 +11,10 @@ gazelle_target: //:gazelle
 import_run_configurations:
   # Test that validates that macro expansion works, as per issue:
   #    https://github.com/bazelbuild/intellij/issues/4112#event-7958662669
-  # This configuration should only be executed on both 'run' (the green arrow) mode.
+  # This configuration should only be executed on 'run' (the green arrow) mode,
+  # as currently macros are not expanded in debug mode.
   run_configurations/test_macro_expansion.xml
+
+  # Test that validates that environment variables are received correctly
+  # This configuration should be run on both 'run' and 'debug' modes.
+  run_configurations/test_env_vars.xml
diff --git a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
index 2217f0d3928..fa012e8e395 100644
--- a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
+++ b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
@@ -47,7 +47,6 @@
 import com.google.idea.blaze.base.run.confighandler.BlazeCommandGenericRunConfigurationRunner.BlazeCommandRunProfileState;
 import com.google.idea.blaze.base.run.confighandler.BlazeCommandRunConfigurationRunner;
 import com.google.idea.blaze.base.run.state.BlazeCommandRunConfigurationCommonState;
-import com.google.idea.blaze.base.run.state.EnvironmentVariablesState;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.google.idea.blaze.base.sync.aspects.BuildResult;