Add environment= to experimental_shell_command.

src/python/pants/backend/shell/shell_command.py

@@ -25,6 +25,7 @@
 from pants.core.goals.package import BuiltPackage, PackageFieldSet
 from pants.core.goals.run import RunDebugAdapterRequest, RunFieldSet, RunRequest
 from pants.core.target_types import FileSourceField
+from pants.core.util_rules.environments import EnvironmentNameRequest
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
 from pants.core.util_rules.system_binaries import (
     BashBinary,
@@ -33,6 +34,7 @@
     BinaryPaths,
 )
 from pants.engine.env_vars import EnvironmentVars, EnvironmentVarsRequest
+from pants.engine.environment import EnvironmentName
 from pants.engine.fs import (
     EMPTY_DIGEST,
     AddPrefix,
@@ -84,7 +86,16 @@ async def run_shell_command(
     request: GenerateFilesFromShellCommandRequest,
 ) -> GeneratedSources:
     shell_command = request.protocol_target
-    result = await Get(ProcessResult, ShellCommandProcessRequest(shell_command))
+    environment_name = await Get(
+        EnvironmentName, EnvironmentNameRequest, EnvironmentNameRequest.from_target(shell_command)
+    )
+    result = await Get(
+        ProcessResult,
+        {
+            environment_name: EnvironmentName,
+            ShellCommandProcessRequest(shell_command): ShellCommandProcessRequest,
+        },
+    )
 
     if shell_command[ShellCommandLogOutputField].value:
         if result.stdout:

src/python/pants/backend/shell/target_types.py

@@ -8,6 +8,7 @@
 
 from pants.backend.shell.shell_setup import ShellSetup
 from pants.core.goals.test import RuntimePackageDependenciesField, TestTimeoutField
+from pants.core.util_rules.environments import EnvironmentField
 from pants.core.util_rules.system_binaries import BinaryPathTest
 from pants.engine.rules import collect_rules, rule
 from pants.engine.target import (
@@ -336,6 +337,7 @@ class ShellCommandTarget(Target):
         ShellCommandTimeoutField,
         ShellCommandToolsField,
         ShellCommandExtraEnvVarsField,
+        EnvironmentField,
     )
     help = softwrap(
         """

src/python/pants/core/util_rules/environments.py

@@ -522,6 +522,16 @@ class EnvironmentNameRequest(EngineAwareParameter):
     raw_value: str
     description_of_origin: str = dataclasses.field(hash=False, compare=False)
 
+    @classmethod
+    def from_target(cls, target: Target) -> EnvironmentNameRequest:
+        f"""Return a `EnvironmentNameRequest` with the environment this target should use when built.
+
+        If the Target includes `EnvironmentField` in its class definition, then this method will
+        use the value of that field. Otherwise, it will fall back to `{LOCAL_ENVIRONMENT_MATCHER}`.
+        """
+        env_field = target.get(EnvironmentField)
+        return cls._from_field(env_field, target.address)
+
     @classmethod
     def from_field_set(cls, field_set: FieldSet) -> EnvironmentNameRequest:
         f"""Return a `EnvironmentNameRequest` with the environment this target should use when built.
@@ -535,15 +545,17 @@ def from_field_set(cls, field_set: FieldSet) -> EnvironmentNameRequest:
         environment is used for the subgraph.
         """
         env_field = _compute_env_field(field_set)
+        return cls._from_field(env_field, field_set.address)
+
+    @classmethod
+    def _from_field(cls, env_field: EnvironmentField, address: Address) -> EnvironmentNameRequest:
         return EnvironmentNameRequest(
             env_field.value,
             # Note that if the field was not registered, we will have fallen back to the default
             # LOCAL_ENVIRONMENT_MATCHER, which we expect to be infallible when normalized. That
             # implies that the error message using description_of_origin should not trigger, so
             # it's okay that the field is not actually registered on the target.
-            description_of_origin=(
-                f"the `{env_field.alias}` field from the target {field_set.address}"
-            ),
+            description_of_origin=(f"the `{env_field.alias}` field from the target {address}"),
         )
 
     def debug_hint(self) -> str: