Skip to content

Commit c7b5136

Browse files
committed
Move ClientTestClusterConfiguration into static method
Only add analysis-nori plugin to install when version is >=6.4.0.
1 parent 1ea6468 commit c7b5136

File tree

1 file changed

+29
-13
lines changed

1 file changed

+29
-13
lines changed

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

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,41 @@
1+
using System.Collections.Generic;
2+
using Elastic.Managed.Configuration;
13
using Elastic.Managed.Ephemeral.Plugins;
4+
using Tests.Core.Client;
25
using Tests.Core.ManagedElasticsearch.NodeSeeders;
36
using static Elastic.Managed.Ephemeral.Plugins.ElasticsearchPlugin;
47

58
namespace Tests.Core.ManagedElasticsearch.Clusters
69
{
7-
/// <summary> Use this cluster for api's that do writes. If they are however intrusive or long running consider IntrusiveOperationCluster instead. </summary>
10+
/// <summary> Use this cluster for APIs that do writes. If they are however intrusive or long running consider IntrusiveOperationCluster instead. </summary>
811
public class WritableCluster : ClientTestClusterBase
912
{
10-
public WritableCluster() : base(new ClientTestClusterConfiguration(
11-
IngestGeoIp,
12-
IngestAttachment,
13-
AnalysisKuromoji,
14-
AnalysisIcu,
15-
AnalysisPhonetic,
16-
MapperMurmur3,
17-
//TODO move this to elasticsearch-net abstractions
18-
new ElasticsearchPlugin("analysis-nori", v => v >= "6.4.0")
19-
)
13+
public WritableCluster() : base(CreateConfiguration()) { }
14+
15+
private static ClientTestClusterConfiguration CreateConfiguration()
2016
{
21-
MaxConcurrency = 4
22-
}) { }
17+
var plugins = new List<ElasticsearchPlugin>
18+
{
19+
IngestGeoIp,
20+
IngestAttachment,
21+
AnalysisKuromoji,
22+
AnalysisIcu,
23+
AnalysisPhonetic,
24+
MapperMurmur3,
25+
};
26+
27+
// TODO: temporary until https://github.com/elastic/elasticsearch-net-abstractions/commit/3977ccb6449870fb4f1e6059be960e12ec5e5125 is released
28+
if (ElasticsearchVersion.From(TestClient.Configuration.ElasticsearchVersion) >= "6.4.0")
29+
{
30+
//TODO move this to elasticsearch-net abstractions
31+
plugins.Add(new ElasticsearchPlugin("analysis-nori", v => v >= "6.4.0"));
32+
}
33+
34+
return new ClientTestClusterConfiguration(plugins.ToArray())
35+
{
36+
MaxConcurrency = 4
37+
};
38+
}
2339

2440
protected override void SeedCluster()
2541
{

0 commit comments

Comments
 (0)