ElasticsearchVersion on Tests.Configuration is now ElasticVersion not string

Author: Mpdreamz

src/Tests/Tests.Configuration/EnvironmentConfiguration.cs

@@ -13,7 +13,7 @@ public EnvironmentConfiguration(YamlConfiguration yamlConfiguration)
 
 			var version = Environment.GetEnvironmentVariable("NEST_INTEGRATION_VERSION");
 			ElasticsearchVersion = string.IsNullOrWhiteSpace(version) ? yamlConfiguration.ElasticsearchVersion : version;
-			if (string.IsNullOrWhiteSpace(ElasticsearchVersion))
+			if (ElasticsearchVersion == null)
 				throw new Exception("Elasticsearch Version could not be determined from env var NEST_INTEGRATION_VERSION nor the test yaml configuration");
 
 			var externalSeed = TryGetEnv("NEST_TEST_SEED", out var seed)

src/Tests/Tests.Configuration/TestConfigurationBase.cs

@@ -1,4 +1,5 @@
 using System;
+using Elastic.Stack.Artifacts;
 
 namespace Tests.Configuration
 {
@@ -11,10 +12,9 @@ public abstract class TestConfigurationBase
 		public string TestFilter { get; protected set; }
 
 		/// <summary> The Elasticsearch version to test against, defined for both unit and integration tests</summary>
-		public string ElasticsearchVersion { get; protected set; }
+		public ElasticVersion ElasticsearchVersion { get; protected set; }
 
-		public bool ElasticsearchVersionIsSnapshot => !string.IsNullOrWhiteSpace(ElasticsearchVersion)
-			&& (ElasticsearchVersion.Contains("SNAPSHOT") || ElasticsearchVersion.Contains("latest"));
+		public bool ElasticsearchVersionIsSnapshot => ElasticsearchVersion.ArtifactBuildState == ArtifactBuildState.Snapshot;
 
 		/// <summary> Force a reseed (bootstrap) of the cluster even if checks indicate bootstrap already ran </summary>
 		public bool ForceReseed { get; protected set; }
@@ -69,7 +69,7 @@ public class RandomConfiguration
 
 		/// <summary> Randomly enable typed keys on searches (defaults to true) on NEST search requests</summary>
 		public bool TypedKeys { get; set; }
-		
+
 		/// <summary> Randomly enable compression on the http requests</summary>
 		public bool HttpCompression { get; set; }
 	}

src/Tests/Tests.Configuration/Tests.Configuration.csproj

@@ -3,4 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20191017T152836" />
+  </ItemGroup>
 </Project>

src/Tests/Tests.Core/Extensions/TestConfigurationExtensions.cs

@@ -11,6 +11,6 @@ public static IConnection CreateConnection(this TestConfigurationBase configurat
 			configuration.RunIntegrationTests && !forceInMemory ? (IConnection)new HttpConnection() : new InMemoryConnection();
 
 		public static bool InRange(this TestConfigurationBase configuration, string range) =>
-			ElasticVersion.From(configuration.ElasticsearchVersion).InRange(range);
+			configuration.ElasticsearchVersion.InRange(range);
 	}
 }

src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs

@@ -30,7 +30,7 @@ private static ClientTestClusterConfiguration CreateConfiguration()
 			};
 
 			// TODO: temporary until https://github.com/elastic/elasticsearch-net-abstractions/commit/3977ccb6449870fb4f1e6059be960e12ec5e5125 is released
-			if (ElasticVersion.From(TestClient.Configuration.ElasticsearchVersion) >= "6.4.0")
+			if (TestClient.Configuration.ElasticsearchVersion >= "6.4.0")
 				plugins.Add(new ElasticsearchPlugin("analysis-nori", v => v >= "6.4.0"));
 
 			return new ClientTestClusterConfiguration(plugins.ToArray())

src/Tests/Tests.Domain/Helpers/TestValueHelper.cs

@@ -13,7 +13,7 @@ public static class TestValueHelper
 
 		public static string PercolatorType => InRange("<5.0.0-alpha1") ? ".percolator" : "query";
 
-		private static bool InRange(string range) => ElasticVersion.From(TestConfiguration.Instance.ElasticsearchVersion).InRange(range);
+		private static bool InRange(string range) => TestConfiguration.Instance.ElasticsearchVersion.InRange(range);
 
 		public static object Dependant(object builtin, object source) => TestConfiguration.Instance.Random.SourceSerializer ? source : builtin;
 	}

src/Tests/Tests.Domain/Tests.Domain.csproj

@@ -12,7 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bogus" Version="22.1.2" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20191017T152836" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <ProjectReference Include="..\Tests.Configuration\Tests.Configuration.csproj" />
   </ItemGroup>