xpack beta1 related fixes

Author: Mpdreamz

src/Nest/Nest.csproj

@@ -1278,6 +1278,7 @@
     <Compile Include="XPack\Security\Role\ClearCachedRoles\ClearCachedRolesRequest.cs" />
     <Compile Include="XPack\Security\Role\ClearCachedRoles\ClearCachedRolesResponse.cs" />
     <Compile Include="XPack\Security\Role\ClearCachedRoles\ElasticClient-ClearCachedRoles.cs" />
+    <Compile Include="XPack\Security\Role\FieldSecurity.cs" />
     <Compile Include="XPack\Security\ShieldNode.cs" />
     <Compile Include="XPack\Security\ShieldNodeStatus.cs" />
     <Compile Include="XPack\Security\Role\DeleteRole\DeleteRoleRequest.cs" />

src/Nest/XPack/Security/Role/PutRole/IndicesPrivileges.cs

@@ -15,37 +15,35 @@ public interface IIndicesPrivileges
 		[JsonProperty("privileges")]
 		IEnumerable<string> Privileges { get; set; }
 
-		[JsonProperty("fields")]
-		Fields Fields { get; set; }
+		[JsonProperty("field_security")]
+		IFieldSecurity FieldSecurity { get; set; }
 
 		[JsonProperty("query")]
 		QueryContainer Query { get; set; }
-
 	}
 	public class IndicesPrivileges : IIndicesPrivileges
 	{
 		[JsonConverter(typeof(IndicesJsonConverter))]
 		public Indices Names { get; set; }
 		public IEnumerable<string> Privileges { get; set; }
-		public Fields Fields { get; set; }
+		public IFieldSecurity FieldSecurity { get; set; }
 		public QueryContainer Query { get; set; }
 	}
 
-
 	public class IndicesPrivilegesDescriptor : DescriptorPromiseBase<IndicesPrivilegesDescriptor, IList<IIndicesPrivileges>>
 	{
 		public IndicesPrivilegesDescriptor() : base(new List<IIndicesPrivileges>()) { }
 
 		public IndicesPrivilegesDescriptor Add<T>(Func<IndicesPrivilegesDescriptor<T>, IIndicesPrivileges> selector) where T : class  =>
 			Assign(a => a.AddIfNotNull(selector?.Invoke(new IndicesPrivilegesDescriptor<T>())));
-
 	}
+
 	public class IndicesPrivilegesDescriptor<T>: DescriptorBase<IndicesPrivilegesDescriptor<T>, IIndicesPrivileges>, IIndicesPrivileges
 		where T :class
 	{
 		Indices IIndicesPrivileges.Names { get; set; }
 		IEnumerable<string> IIndicesPrivileges.Privileges { get; set; }
-		Fields IIndicesPrivileges.Fields { get; set; }
+		IFieldSecurity IIndicesPrivileges.FieldSecurity { get; set; }
 		QueryContainer IIndicesPrivileges.Query { get; set; }
 
 		public IndicesPrivilegesDescriptor<T> Names(Indices indices) => Assign(a => a.Names = indices);
@@ -55,13 +53,10 @@ public class IndicesPrivilegesDescriptor<T>: DescriptorBase<IndicesPrivilegesDes
 		public IndicesPrivilegesDescriptor<T> Privileges(params string[] privileges) => Assign(a => a.Privileges = privileges);
 		public IndicesPrivilegesDescriptor<T> Privileges(IEnumerable<string> privileges) => Assign(a => a.Privileges = privileges);
 
-		public IndicesPrivilegesDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
-			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
-
-		public IndicesPrivilegesDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+		public IndicesPrivilegesDescriptor<T> FieldSecurity(Func<FieldSecurityDescriptor<T>, IFieldSecurity> fields) =>
+			Assign(a => a.FieldSecurity = fields?.Invoke(new FieldSecurityDescriptor<T>()));
 
 		public IndicesPrivilegesDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> query) =>
 			Assign(a => a.Query = query?.Invoke(new QueryContainerDescriptor<T>()));
-
 	}
 }

src/Tests/Document/Multiple/BulkAll/BulkAllApiTests.cs

@@ -11,7 +11,7 @@
 
 namespace Tests.Document.Multiple.BulkAll
 {
-	public class BulkAllApiTests : SerializationTestBase, IClusterFixture<WritableCluster>
+	public class BulkAllApiTests : SerializationTestBase, IClusterFixture<IntrusiveOperationCluster>
 	{
 		private class SmallObject
 		{
@@ -28,7 +28,7 @@ private IEnumerable<SmallObject> CreateLazyStreamOfDocuments(int count)
 				yield return new SmallObject() { Id = i };
 		}
 
-		public BulkAllApiTests(WritableCluster cluster, EndpointUsage usage)
+		public BulkAllApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage)
 		{
 			this._client = cluster.Client;
 		}

src/Tests/Document/Multiple/Reindex/ReindexApiTests.cs

@@ -44,10 +44,10 @@ public ReindexApiTests(ReindexCluster cluster, EndpointUsage usage)
 			// create a thousand commits and associate with the projects
 			var commits = CommitActivity.CommitActivities;
 			var bb = new BulkDescriptor();
-			for (int index = 0; index < commits.Count; index++)
+			for (int i = 0; i < commits.Count; i++)
 			{
-				var commit = commits[index];
-				var project = index % 2 == 0
+				var commit = commits[i];
+				var project = i % 2 == 0
 					? projects[0].Name
 					: projects[1].Name;
 

src/Tests/Document/Single/Index/IndexIngestApiTests.cs

@@ -10,11 +10,11 @@
 namespace Tests.Document.Single.Index
 {
 	public class IndexIngestApiTests :
-		ApiIntegrationTestBase<WritableCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
+		ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
 	{
 		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		public IndexIngestApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage)
+		public IndexIngestApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
 		{
 		}
 

src/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs

@@ -11,7 +11,7 @@
 namespace Tests.Document.Single.Index
 {
 	public class IndexIngestAttachmentApiTests :
-		ApiIntegrationTestBase<WritableCluster, IIndexResponse,
+		ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse,
 			IIndexRequest<IndexIngestAttachmentApiTests.IngestedAttachment>,
 			IndexDescriptor<IndexIngestAttachmentApiTests.IngestedAttachment>,
 			IndexRequest<IndexIngestAttachmentApiTests.IngestedAttachment>>
@@ -27,7 +27,7 @@ public class IngestedAttachment
 
 		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		public IndexIngestAttachmentApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		public IndexIngestAttachmentApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 		protected override void IntegrationSetup(IElasticClient client, CallUniqueValues values)
 		{

src/Tests/Document/Single/Index/IndexIngestGeoIpApiTests.cs

@@ -13,11 +13,11 @@
 namespace Tests.Document.Single.Index
 {
 	public class IndexIngestGeoIpApiTests :
-		ApiIntegrationTestBase<WritableCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
+		ApiIntegrationTestBase<IntrusiveOperationCluster, IIndexResponse, IIndexRequest<Project>, IndexDescriptor<Project>, IndexRequest<Project>>
 	{
 		private static string PipelineId { get; } = "pipeline-" + Guid.NewGuid().ToString("N").Substring(0, 8);
 
-		public IndexIngestGeoIpApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage)
+		public IndexIngestGeoIpApiTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage)
 		{
 		}
 

src/Tests/Framework/EndpointTests/Clusters/WritableCluster.cs

@@ -8,6 +8,9 @@ namespace Tests.Framework.Integration
 	[RequiresPlugin(ElasticsearchPlugin.MapperAttachments, ElasticsearchPlugin.IngestGeoIp, ElasticsearchPlugin.IngestAttachment)]
 	public class WritableCluster : ClusterBase
 	{
+		public override int MaxConcurrency => 4;
+
+
 		public override void Bootstrap()
 		{
 			var seeder = new Seeder(this.Node);

src/Tests/Framework/Xunit/ForEachAsyncExtensions.cs

@@ -23,4 +23,4 @@ select Task.Run(async delegate
 		}
 
 	}
-}
+}

src/Tests/Framework/Xunit/TestAssemblyRunner.cs

@@ -66,7 +66,7 @@ orderby g.Count() descending
 			var clusterTotals = new Dictionary<string, Stopwatch>();
 			foreach (var group in grouped)
 			{
-				if (group.Key?.GetType() != typeof(WritableCluster)) continue;
+				//if (group.Key?.GetType() != typeof(XPackCluster)) continue;
 				var type = group.Key?.GetType();
 				var clusterName = type?.Name.Replace("Cluster", "") ?? "UNKNOWN";
 				var dop = group.Key != null && group.Key.MaxConcurrency > 0