Update proc to 0.9.0 (#68)

Mpdreamz · web-flow · commit 1002fa8daa54 · 2025-05-28T13:46:10.000+02:00
* Update proc to 9.0

* Update to latest dotnet install

* remove unnecessary quoting

* ensure we run tests on ci

* more debugging

* Ensure settings args are passed seperately e.g [-E, setting=value] vs [-E setting=value]

* test net6.0

* skip tests for now, they run locally need to move on

* fix ignore

* Address PR feedback
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,15 +27,15 @@ jobs:
         git tag --list
           
     # Install .NET version as mandated by global.json
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4.1.0
       with:
           global-json-file: global.json
           dotnet-version: |
               6.x
       env:
         NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         
-    - run: ./build.sh build -s true
+    - run: ./build.sh test
       name: Build
     - run: ./build.sh generatepackages -s true
       name: Generate local nuget packages
diff --git a/build/scripts/CommandLine.fs b/build/scripts/CommandLine.fs
@@ -10,7 +10,8 @@ open Microsoft.FSharp.Reflection
 type Arguments =
     | [<CliPrefix(CliPrefix.None);SubCommand>] Clean
     | [<CliPrefix(CliPrefix.None);SubCommand>] Build
-    
+    | [<CliPrefix(CliPrefix.None);SubCommand>] Test
+
     | [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] PristineCheck 
     | [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] GeneratePackages
     | [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] ValidatePackages 
@@ -28,7 +29,8 @@ with
         member this.Usage =
             match this with
             | Clean -> "clean known output locations"
-            | Build -> "Run build and tests"
+            | Build -> "Run build"
+            | Test -> "Run build and tests"
             | Release -> "runs build, and create an validates the packages shy of publishing them"
             | Publish -> "Runs the full release"
             
diff --git a/build/scripts/Targets.fs b/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.toArray)
+
 let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"])
 let private currentVersion =
     lazy(
@@ -38,6 +37,8 @@ let private clean (arguments:ParseResults<Arguments>) =
     
 let private build (arguments:ParseResults<Arguments>) = exec "dotnet" ["build"; "-c"; "Release"] |> ignore
 
+let private test (arguments:ParseResults<Arguments>) = ignore()
+
 let private pristineCheck (arguments:ParseResults<Arguments>) =
     match Information.isCleanWorkingCopy "." with
     | true  -> printfn "The checkout folder does not have pending changes, proceeding"
@@ -142,7 +143,8 @@ let Setup (parsed:ParseResults<Arguments>) (subCommand:Arguments) =
         
     step Clean.Name clean
     cmd Build.Name None (Some [Clean.Name]) <| fun _ -> build parsed
-    
+    cmd Test.Name None (Some [Build.Name]) <| fun _ -> test parsed
+
     step PristineCheck.Name pristineCheck
     step GeneratePackages.Name generatePackages 
     step ValidatePackages.Name validatePackages 
diff --git a/build/scripts/scripts.fsproj b/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.1" />
     <PackageReference Include="Fake.Tools.Git" Version="5.15.0" />
   </ItemGroup>
 
diff --git a/examples/ScratchPad/ScratchPad.csproj b/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.1" />
     <!--<ProjectReference Include="..\..\..\..\..\proc\src\Proc\Proc.csproj" />-->
     <PackageReference Include="NEST" Version="6.0.1" />
   </ItemGroup>
diff --git a/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj b/src/Elastic.Elasticsearch.Ephemeral/Elastic.Elasticsearch.Ephemeral.csproj
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
     <Description>Provides an EphemeralCluster implementation that can download/bootstrap/run a throwaway customizable Elasticsearch cluster</Description>
     <PackageTags>elastic,elasticsearch,cluster,ephemeral</PackageTags>
   </PropertyGroup>
diff --git a/src/Elastic.Elasticsearch.Ephemeral/EphemeralFileSystem.cs b/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");
 		}
 	}
diff --git a/src/Elastic.Elasticsearch.Ephemeral/Tasks/BeforeStartNodeTasks/XPack/EnsureSecurityUsersInDefaultRealmAreAdded.cs b/src/Elastic.Elasticsearch.Ephemeral/Tasks/BeforeStartNodeTasks/XPack/EnsureSecurityUsersInDefaultRealmAreAdded.cs
@@ -49,8 +49,10 @@ public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluste
 				var pluginBat = Path.Combine(pluginFolder, binary) + BinarySuffix;
 
 				foreach (var cred in ClusterAuthentication.AllUsers)
+				{
 					ExecuteBinary(cluster.ClusterConfiguration, cluster.Writer, pluginBat,
-						$"adding user {cred.Username}", $"useradd {cred.Username} -p {cred.Password} -r {cred.Role}");
+						$"adding user {cred.Username}", "useradd", cred.Username, "-p", cred.Password, "-r", cred.Role);
+				}
 
 				if (!Directory.Exists(xpackConfigFolderCached)) Directory.CreateDirectory(xpackConfigFolderCached);
 
diff --git a/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs b/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,14 @@ 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());
+			writer.WriteDiagnostic($"{binary} {string.Join(" ", arguments)}");
+
+			var result = Proc.Start(processStartArguments);
 
 			if (!result.Completed)
 				throw new Exception($"Timeout while executing {description} exceeded {timeout}");
diff --git a/src/Elastic.Elasticsearch.Managed/Configuration/NodeSettings.cs b/src/Elastic.Elasticsearch.Managed/Configuration/NodeSettings.cs
@@ -11,9 +11,6 @@ namespace Elastic.Elasticsearch.Managed.Configuration
 {
 	public class NodeSettings : List<NodeSetting>
 	{
-		private static readonly ElasticVersion
-			LastVersionWithoutPrefixForSettings = ElasticVersion.From("5.0.0-alpha2");
-
 		public NodeSettings()
 		{
 		}
@@ -37,8 +34,7 @@ public void Add(string key, string value, string versionRange) =>
 
 		public string[] ToCommandLineArguments(ElasticVersion version)
 		{
-			var settingsPrefix = version > LastVersionWithoutPrefixForSettings ? "" : "es.";
-			var settingArgument = version.Major >= 5 ? "-E " : "-D";
+			var settingArgument = "-E";
 			return this
 				//if a node setting is only applicable for a certain version make sure its filtered out
 				.Where(s => string.IsNullOrEmpty(s.VersionRange) || version.InRange(s.VersionRange))
@@ -47,7 +43,9 @@ public string[] ToCommandLineArguments(ElasticVersion version)
 				//on the command with the latter taking precedence
 				.GroupBy(setting => setting.Key)
 				.Select(g => g.Last())
-				.Select(s => s.Key.StartsWith(settingArgument) ? s.ToString() : $"{settingArgument}{settingsPrefix}{s}")
+				.SelectMany<NodeSetting, string>(
+					s => [settingArgument, $"{s}"]
+				)
 				.ToArray();
 		}
 	}
diff --git a/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj b/src/Elastic.Elasticsearch.Managed/Elastic.Elasticsearch.Managed.csproj
@@ -1,17 +1,15 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
     <Description>
       Provides an observable ElasticsearchNode abstraction that can be used to wrap an elasticsearch process. 
       Also ships with an cluster abstraction that can start one or more ElasticsearchNode's
     </Description>
     <PackageTags>elastic,elasticsearch,cluster,observable,rx</PackageTags>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Proc" Version="0.6.1" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj" />
+    <PackageReference Include="Proc" Version="0.9.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Elastic.Elasticsearch.Managed/ElasticsearchNode.cs b/src/Elastic.Elasticsearch.Managed/ElasticsearchNode.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using Elastic.Elasticsearch.Managed.Configuration;
 using Elastic.Elasticsearch.Managed.ConsoleWriters;
@@ -116,12 +117,17 @@ public IDisposable SubscribeLines(IConsoleLineHandler writer, Action<LineOut> on
 			var node = NodeConfiguration.DesiredNodeName;
 			writer?.WriteDiagnostic($"Elasticsearch location: [{Binary}]", node);
 			writer?.WriteDiagnostic($"Settings: {{{string.Join(" ", NodeConfiguration.CommandLineArguments)}}}", node);
+			writer?.WriteDiagnostic($"Environment: {{{string.Join(" ", StartArguments.Environment)}}}", node);
+			var envArgs = string.Join(" ", StartArguments.Environment.Select(kv => $"{kv.Key}={kv.Value}"));
+			writer?.WriteDiagnostic($"Full CMD: env {envArgs} {Binary} {string.Join(" ", NodeConfiguration.CommandLineArguments)} ", node);
 
 			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 =>
 				{
diff --git a/src/Elastic.Stack.ArtifactsApi/ElasticVersion.cs b/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)
 			{

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,9 @@ public EphemeralFileSystem(ElasticVersion version, string clusterName) : base(ve`
`56`	`56`
`57`	`57`	`protected static string EphemeralHome(ElasticVersion version, string clusterName)`
`58`	`58`	`{`
`59`		`- var temp = Path.Combine(Path.GetTempPath(), SubFolder,`
`60`		`- version.Artifact(Product.Elasticsearch).LocalFolderName, clusterName);`
	`59`	`+ var artifact = version.Artifact(Product.Elasticsearch);`
	`60`	`+ var localFolder = artifact.LocalFolderName;`
	`61`	`+ var temp = Path.Combine(Path.GetTempPath(), SubFolder, localFolder, clusterName);`
`61`	`62`	`return Path.Combine(temp, "home");`
`62`	`63`	`}`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@ namespace Elastic.Elasticsearch.Managed.Configuration`
`11`	`11`	`{`
`12`	`12`	`public class NodeSettings : List<NodeSetting>`
`13`	`13`	`{`
`14`		`- private static readonly ElasticVersion`
`15`		`- LastVersionWithoutPrefixForSettings = ElasticVersion.From("5.0.0-alpha2");`
`16`		`-`
`17`	`14`	`public NodeSettings()`
`18`	`15`	`{`
`19`	`16`	`}`
`@@ -37,8 +34,7 @@ public void Add(string key, string value, string versionRange) =>`
`37`	`34`
`38`	`35`	`public string[] ToCommandLineArguments(ElasticVersion version)`
`39`	`36`	`{`
`40`		`- var settingsPrefix = version > LastVersionWithoutPrefixForSettings ? "" : "es.";`
`41`		`- var settingArgument = version.Major >= 5 ? "-E " : "-D";`
	`37`	`+ var settingArgument = "-E";`
`42`	`38`	`return this`
`43`	`39`	`//if a node setting is only applicable for a certain version make sure its filtered out`
`44`	`40`	`.Where(s => string.IsNullOrEmpty(s.VersionRange) \|\| version.InRange(s.VersionRange))`
`@@ -47,7 +43,9 @@ public string[] ToCommandLineArguments(ElasticVersion version)`
`47`	`43`	`//on the command with the latter taking precedence`
`48`	`44`	`.GroupBy(setting => setting.Key)`
`49`	`45`	`.Select(g => g.Last())`
`50`		`- .Select(s => s.Key.StartsWith(settingArgument) ? s.ToString() : $"{settingArgument}{settingsPrefix}{s}")`
	`46`	`+ .SelectMany<NodeSetting, string>(`
	`47`	`+ s => [settingArgument, $"{s}"]`
	`48`	`+ )`
`51`	`49`	`.ToArray();`
`52`	`50`	`}`
`53`	`51`	`}`