Update proc to 9.0

Author: Mpdreamz

build/scripts/Targets.fs

@@ -14,9 +14,8 @@ open ProcNet
 
 
 let exec binary args =
-    let r = Proc.Exec (binary, args |> List.map (fun a -> sprintf "\"%s\"" a) |> List.toArray)
-    match r.HasValue with | true -> r.Value | false -> failwithf "invocation of `%s` timed out" binary
-    
+    Proc.Exec (binary, args |> List.map (fun a -> sprintf "\"%s\"" a) |> List.toArray)
+
 let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"])
 let private currentVersion =
     lazy(

build/scripts/scripts.fsproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Argu" Version="6.0.0" />
     <PackageReference Include="Bullseye" Version="3.3.0" />
-    <PackageReference Include="Proc" Version="0.6.2" />
+    <PackageReference Include="Proc" Version="0.9.0" />
     <PackageReference Include="Fake.Tools.Git" Version="5.15.0" />
   </ItemGroup>
 

examples/Elastic.Xunit.ExampleMinimal/ExampleTest.cs

@@ -21,7 +21,8 @@ public class MyTestCluster : XunitClusterBase
 		///     We pass our configuration instance to the base class.
 		///     We only configure it to run version 6.2.3 here but lots of additional options are available.
 		/// </summary>
-		public MyTestCluster() : base(new XunitClusterConfiguration("latest-8"))
+		public MyTestCluster() : base(new XunitClusterConfiguration("8.16.0")
+			{ PrintYamlFilesInConfigFolder = true, NoCleanupAfterNodeStopped = true })
 		{
 		}
 	}

examples/ScratchPad/ScratchPad.csproj

@@ -5,7 +5,7 @@
     <IsPackable>False</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Proc" Version="0.6.1" />
+    <PackageReference Include="Proc" Version="0.9.0" />
     <!--<ProjectReference Include="..\..\..\..\..\proc\src\Proc\Proc.csproj" />-->
     <PackageReference Include="NEST" Version="6.0.1" />
   </ItemGroup>

src/Elastic.Elasticsearch.Ephemeral/EphemeralFileSystem.cs

@@ -56,8 +56,9 @@ public EphemeralFileSystem(ElasticVersion version, string clusterName) : base(ve
 
 		protected static string EphemeralHome(ElasticVersion version, string clusterName)
 		{
-			var temp = Path.Combine(Path.GetTempPath(), SubFolder,
-				version.Artifact(Product.Elasticsearch).LocalFolderName, clusterName);
+			var artifact = version.Artifact(Product.Elasticsearch);
+			var localFolder = artifact.LocalFolderName;
+			var temp = Path.Combine(Path.GetTempPath(), SubFolder, localFolder, clusterName);
 			return Path.Combine(temp, "home");
 		}
 	}

src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs

@@ -148,14 +148,10 @@ protected static void WriteFileIfNotExist(string fileLocation, string contents)
 
 		protected static void ExecuteBinary(EphemeralClusterConfiguration config, IConsoleLineHandler writer,
 			string binary, string description, params string[] arguments) =>
-			ExecuteBinaryInternal(config, writer, binary, description, null, arguments);
-
-		protected static void ExecuteBinary(EphemeralClusterConfiguration config, IConsoleLineHandler writer,
-			string binary, string description, StartedHandler startedHandler, params string[] arguments) =>
-			ExecuteBinaryInternal(config, writer, binary, description, startedHandler, arguments);
+			ExecuteBinaryInternal(config, writer, binary, description, arguments);
 
 		private static void ExecuteBinaryInternal(EphemeralClusterConfiguration config, IConsoleLineHandler writer,
-			string binary, string description, StartedHandler startedHandler, params string[] arguments)
+			string binary, string description, params string[] arguments)
 		{
 			var command = $"{{{binary}}} {{{string.Join(" ", arguments)}}}";
 			writer?.WriteDiagnostic($"{{{nameof(ExecuteBinary)}}} starting process [{description}] {command}");
@@ -167,12 +163,12 @@ private static void ExecuteBinaryInternal(EphemeralClusterConfiguration config,
 				{
 					{config.FileSystem.ConfigEnvironmentVariableName, config.FileSystem.ConfigPath},
 					{"ES_HOME", config.FileSystem.ElasticsearchHome}
-				}
+				},
+				Timeout = timeout,
+				ConsoleOutWriter = new ConsoleOutColorWriter(),
 			};
 
-			var result = startedHandler != null
-				? Proc.Start(processStartArguments, timeout, new ConsoleOutColorWriter(), startedHandler)
-				: Proc.Start(processStartArguments, timeout, new ConsoleOutColorWriter());
+			var result = Proc.Start(processStartArguments);
 
 			if (!result.Completed)
 				throw new Exception($"Timeout while executing {description} exceeded {timeout}");

src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj

@@ -9,7 +9,7 @@
     <PackageTags>elastic,elasticsearch,cluster,observable,rx</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Proc" Version="0.6.1" />
+    <PackageReference Include="Proc" Version="0.9.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj" />

src/Elastic.Elasticsearch.Managed/ElasticsearchNode.cs

@@ -119,9 +119,11 @@ public IDisposable SubscribeLines(IConsoleLineHandler writer, Action<LineOut> on
 
 			var envVarName = NodeConfiguration.Version.InRange("<7.12.0") ? "JAVA_HOME" : "ES_JAVA_HOME";
 			var javaHome = Environment.GetEnvironmentVariable(envVarName);
-			writer?.WriteDiagnostic($"{envVarName}: {{{javaHome}}}", node);
-			Process.StartInfo.Environment[envVarName] = javaHome;
-
+			if (!string.IsNullOrWhiteSpace(javaHome))
+			{
+				writer?.WriteDiagnostic($"{envVarName}: {{{javaHome}}}", node);
+				Process.StartInfo.Environment[envVarName] = javaHome;
+			}
 			return SubscribeLines(
 				l =>
 				{

src/Elastic.Stack.ArtifactsApi/ElasticVersion.cs

@@ -34,7 +34,7 @@ public int CompareTo(string other)
 		public Artifact Artifact(Product product)
 		{
 			var cacheKey = product.ToString();
-			if (_resolved.TryGetValue(cacheKey, out var artifact))
+			if (_resolved.TryGetValue(cacheKey, out var artifact) && artifact != null)
 				return artifact;
 			switch (ArtifactBuildState)
 			{