Skip to content

Commit 827aa6b

Browse files
committed
Update Elastic abstractions code
This commit updates references to types from the Elastic abstractions packages where type names and namespaces have changed.
1 parent 81053d3 commit 827aa6b

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Elastic.Managed.Configuration;
2+
using Elastic.Stack.Artifacts;
23
using Elasticsearch.Net;
34
using Tests.Configuration;
45

@@ -10,6 +11,6 @@ public static IConnection CreateConnection(this TestConfigurationBase configurat
1011
configuration.RunIntegrationTests && !forceInMemory ? (IConnection)new HttpConnection() : new InMemoryConnection();
1112

1213
public static bool InRange(this TestConfigurationBase configuration, string range) =>
13-
ElasticsearchVersion.From(configuration.ElasticsearchVersion).InRange(range);
14+
ElasticVersion.From(configuration.ElasticsearchVersion).InRange(range);
1415
}
1516
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.IO;
22
using Elastic.Managed.Ephemeral;
33
using Elastic.Managed.Ephemeral.Plugins;
4+
using Elastic.Stack.Artifacts.Products;
45
using Elastic.Xunit;
56
using Nest;
67
using Tests.Configuration;

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Elastic.Managed.Ephemeral.Plugins;
2+
using static Elastic.Stack.Artifacts.Products.ElasticsearchPlugin;
23

34
namespace Tests.Core.ManagedElasticsearch.Clusters
45
{
@@ -7,9 +8,7 @@ namespace Tests.Core.ManagedElasticsearch.Clusters
78
/// </summary>
89
public class IntrusiveOperationCluster : ClientTestClusterBase
910
{
10-
public IntrusiveOperationCluster() : base(new ClientTestClusterConfiguration(
11-
ElasticsearchPlugin.IngestGeoIp, ElasticsearchPlugin.IngestAttachment
12-
)
11+
public IntrusiveOperationCluster() : base(new ClientTestClusterConfiguration(IngestGeoIp, IngestAttachment)
1312
{
1413
MaxConcurrency = 1
1514
}) { }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Tests.Core.ManagedElasticsearch.NodeSeeders;
2-
using static Elastic.Managed.Ephemeral.Plugins.ElasticsearchPlugin;
2+
using static Elastic.Stack.Artifacts.Products.ElasticsearchPlugin;
33

44
namespace Tests.Core.ManagedElasticsearch.Clusters
55
{

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using System.Collections.Generic;
22
using Elastic.Managed.Configuration;
33
using Elastic.Managed.Ephemeral.Plugins;
4+
using Elastic.Stack.Artifacts;
5+
using Elastic.Stack.Artifacts.Products;
46
using Tests.Core.Client;
57
using Tests.Core.ManagedElasticsearch.NodeSeeders;
6-
using static Elastic.Managed.Ephemeral.Plugins.ElasticsearchPlugin;
8+
using static Elastic.Stack.Artifacts.Products.ElasticsearchPlugin;
79

810
namespace Tests.Core.ManagedElasticsearch.Clusters
911
{
@@ -28,7 +30,7 @@ private static ClientTestClusterConfiguration CreateConfiguration()
2830
};
2931

3032
// TODO: temporary until https://github.com/elastic/elasticsearch-net-abstractions/commit/3977ccb6449870fb4f1e6059be960e12ec5e5125 is released
31-
if (ElasticsearchVersion.From(TestClient.Configuration.ElasticsearchVersion) >= "6.4.0")
33+
if (ElasticVersion.From(TestClient.Configuration.ElasticsearchVersion) >= "6.4.0")
3234
plugins.Add(new ElasticsearchPlugin("analysis-nori", v => v >= "6.4.0"));
3335

3436
return new ClientTestClusterConfiguration(plugins.ToArray())

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using Elastic.Managed.Configuration;
3+
using Elastic.Stack.Artifacts;
34
using Tests.Configuration;
45

56
namespace Tests.Domain.Helpers
@@ -12,7 +13,7 @@ public static class TestValueHelper
1213

1314
public static string PercolatorType => InRange("<5.0.0-alpha1") ? ".percolator" : "query";
1415

15-
private static bool InRange(string range) => ElasticsearchVersion.From(TestConfiguration.Instance.ElasticsearchVersion).InRange(range);
16+
private static bool InRange(string range) => ElasticVersion.From(TestConfiguration.Instance.ElasticsearchVersion).InRange(range);
1617

1718
public static object Dependant(object builtin, object source) => TestConfiguration.Instance.Random.SourceSerializer ? source : builtin;
1819
}

src/Tests/Tests/Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\Tests.Core\Tests.Core.csproj" />
14-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
15-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
14+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
15+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
1616
<PackageReference Include="Bogus" Version="22.1.2" />
1717
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
1818
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />

0 commit comments

Comments
 (0)