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

… [-E setting=value]
elastic · Dec 3, 2024 · da9ae70 · da9ae70
1 parent 80e74c0
commit da9ae70
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
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.9.0" />
+    <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.9.0" />
+    <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.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.9.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Stack.ArtifactsApi\Elastic.Stack.ArtifactsApi.csproj" />
+    <PackageReference Include="Proc" Version="0.9.1" />
   </ItemGroup>
 </Project>