Environment variables should be an argument as the context may differ between external execution interfaces.

Author: cotti

src/tooling/Elastic.Documentation.Tooling/ExternalCommands/ExternalCommandExecutor.cs

@@ -12,18 +12,12 @@ namespace Elastic.Documentation.Tooling.ExternalCommands;
 public abstract class ExternalCommandExecutor(DiagnosticsCollector collector, IDirectoryInfo workingDirectory)
 {
 	protected IDirectoryInfo WorkingDirectory => workingDirectory;
-	protected void ExecIn(string binary, params string[] args)
+	protected void ExecIn(Dictionary<string, string> environmentVars, string binary, params string[] args)
 	{
 		var arguments = new ExecArguments(binary, args)
 		{
 			WorkingDirectory = workingDirectory.FullName,
-			Environment = new Dictionary<string, string>
-			{
-				// Disable git editor prompts:
-				// There are cases where `git pull` would prompt for an editor to write a commit message.
-				// This env variable prevents that.
-				{ "GIT_EDITOR", "true" }
-			},
+			Environment = environmentVars
 		};
 		var result = Proc.Exec(arguments);
 		if (result != 0)

src/tooling/docs-assembler/Sourcing/GitFacade.cs

@@ -26,15 +26,23 @@ public interface IGitRepository
 // It uses `git pull --depth 1` and `git fetch --depth 1` to minimize the amount of data transferred.
 public class SingleCommitOptimizedGitRepository(DiagnosticsCollector collector, IDirectoryInfo workingDirectory) : ExternalCommandExecutor(collector, workingDirectory), IGitRepository
 {
+	private static readonly Dictionary<string, string> EnvironmentVars = new()
+	{
+		// Disable git editor prompts:
+		// There are cases where `git pull` would prompt for an editor to write a commit message.
+		// This env variable prevents that.
+		{ "GIT_EDITOR", "true" }
+	};
+
 	public string GetCurrentCommit() => Capture("git", "rev-parse", "HEAD");
 
-	public void Init() => ExecIn("git", "init");
+	public void Init() => ExecIn(EnvironmentVars, "git", "init");
 	public bool IsInitialized() => Directory.Exists(Path.Combine(WorkingDirectory.FullName, ".git"));
-	public void Pull(string branch) => ExecIn("git", "pull", "--depth", "1", "--allow-unrelated-histories", "--no-ff", "origin", branch);
-	public void Fetch(string reference) => ExecIn("git", "fetch", "--no-tags", "--prune", "--no-recurse-submodules", "--depth", "1", "origin", reference);
-	public void EnableSparseCheckout(string folder) => ExecIn("git", "sparse-checkout", "set", folder);
-	public void DisableSparseCheckout() => ExecIn("git", "sparse-checkout", "disable");
-	public void Checkout(string reference) => ExecIn("git", "checkout", "--force", reference);
+	public void Pull(string branch) => ExecIn(EnvironmentVars, "git", "pull", "--depth", "1", "--allow-unrelated-histories", "--no-ff", "origin", branch);
+	public void Fetch(string reference) => ExecIn(EnvironmentVars, "git", "fetch", "--no-tags", "--prune", "--no-recurse-submodules", "--depth", "1", "origin", reference);
+	public void EnableSparseCheckout(string folder) => ExecIn(EnvironmentVars, "git", "sparse-checkout", "set", folder);
+	public void DisableSparseCheckout() => ExecIn(EnvironmentVars, "git", "sparse-checkout", "disable");
+	public void Checkout(string reference) => ExecIn(EnvironmentVars, "git", "checkout", "--force", reference);
 
-	public void GitAddOrigin(string origin) => ExecIn("git", "remote", "add", "origin", origin);
+	public void GitAddOrigin(string origin) => ExecIn(EnvironmentVars, "git", "remote", "add", "origin", origin);
 }

src/tooling/docs-builder/Cli/LinkHealthCommands.cs

@@ -7,11 +7,10 @@
 using Actions.Core.Services;
 using ConsoleAppFramework;
 using Documentation.Builder.Tracking;
+using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Builder;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Documentation.Tooling.Filters;
-using Elastic.Markdown;
-using Elastic.Markdown.IO;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Builder.Cli;