File tree 7 files changed +14
-10
lines changed
ManagedElasticsearch/Clusters
7 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 1
1
using Elastic . Managed . Configuration ;
2
+ using Elastic . Stack . Artifacts ;
2
3
using Elasticsearch . Net ;
3
4
using Tests . Configuration ;
4
5
@@ -10,6 +11,6 @@ public static IConnection CreateConnection(this TestConfigurationBase configurat
10
11
configuration . RunIntegrationTests && ! forceInMemory ? ( IConnection ) new HttpConnection ( ) : new InMemoryConnection ( ) ;
11
12
12
13
public static bool InRange ( this TestConfigurationBase configuration , string range ) =>
13
- ElasticsearchVersion . From ( configuration . ElasticsearchVersion ) . InRange ( range ) ;
14
+ ElasticVersion . From ( configuration . ElasticsearchVersion ) . InRange ( range ) ;
14
15
}
15
16
}
Original file line number Diff line number Diff line change 1
1
using System . IO ;
2
2
using Elastic . Managed . Ephemeral ;
3
3
using Elastic . Managed . Ephemeral . Plugins ;
4
+ using Elastic . Stack . Artifacts . Products ;
4
5
using Elastic . Xunit ;
5
6
using Nest ;
6
7
using Tests . Configuration ;
Original file line number Diff line number Diff line change 1
1
using Elastic . Managed . Ephemeral . Plugins ;
2
+ using static Elastic . Stack . Artifacts . Products . ElasticsearchPlugin ;
2
3
3
4
namespace Tests . Core . ManagedElasticsearch . Clusters
4
5
{
@@ -7,9 +8,7 @@ namespace Tests.Core.ManagedElasticsearch.Clusters
7
8
/// </summary>
8
9
public class IntrusiveOperationCluster : ClientTestClusterBase
9
10
{
10
- public IntrusiveOperationCluster ( ) : base ( new ClientTestClusterConfiguration (
11
- ElasticsearchPlugin . IngestGeoIp , ElasticsearchPlugin . IngestAttachment
12
- )
11
+ public IntrusiveOperationCluster ( ) : base ( new ClientTestClusterConfiguration ( IngestGeoIp , IngestAttachment )
13
12
{
14
13
MaxConcurrency = 1
15
14
} ) { }
Original file line number Diff line number Diff line change 1
1
using Tests . Core . ManagedElasticsearch . NodeSeeders ;
2
- using static Elastic . Managed . Ephemeral . Plugins . ElasticsearchPlugin ;
2
+ using static Elastic . Stack . Artifacts . Products . ElasticsearchPlugin ;
3
3
4
4
namespace Tests . Core . ManagedElasticsearch . Clusters
5
5
{
Original file line number Diff line number Diff line change 1
1
using System . Collections . Generic ;
2
2
using Elastic . Managed . Configuration ;
3
3
using Elastic . Managed . Ephemeral . Plugins ;
4
+ using Elastic . Stack . Artifacts ;
5
+ using Elastic . Stack . Artifacts . Products ;
4
6
using Tests . Core . Client ;
5
7
using Tests . Core . ManagedElasticsearch . NodeSeeders ;
6
- using static Elastic . Managed . Ephemeral . Plugins . ElasticsearchPlugin ;
8
+ using static Elastic . Stack . Artifacts . Products . ElasticsearchPlugin ;
7
9
8
10
namespace Tests . Core . ManagedElasticsearch . Clusters
9
11
{
@@ -28,7 +30,7 @@ private static ClientTestClusterConfiguration CreateConfiguration()
28
30
} ;
29
31
30
32
// 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" )
32
34
plugins . Add ( new ElasticsearchPlugin ( "analysis-nori" , v => v >= "6.4.0" ) ) ;
33
35
34
36
return new ClientTestClusterConfiguration ( plugins . ToArray ( ) )
Original file line number Diff line number Diff line change 1
1
using System ;
2
2
using Elastic . Managed . Configuration ;
3
+ using Elastic . Stack . Artifacts ;
3
4
using Tests . Configuration ;
4
5
5
6
namespace Tests . Domain . Helpers
@@ -12,7 +13,7 @@ public static class TestValueHelper
12
13
13
14
public static string PercolatorType => InRange ( "<5.0.0-alpha1" ) ? ".percolator" : "query" ;
14
15
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 ) ;
16
17
17
18
public static object Dependant ( object builtin , object source ) => TestConfiguration . Instance . Random . SourceSerializer ? source : builtin ;
18
19
}
Original file line number Diff line number Diff line change 11
11
</PropertyGroup >
12
12
<ItemGroup >
13
13
<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 " />
16
16
<PackageReference Include =" Bogus" Version =" 22.1.2" />
17
17
<PackageReference Include =" Newtonsoft.Json" Version =" 12.0.1" />
18
18
<PackageReference Include =" System.Diagnostics.DiagnosticSource" Version =" 4.5.1" />
You can’t perform that action at this time.
0 commit comments