Add Indices and Aliases in BulkAlias API (#4816)

* Add Indices and Aliases in BulkAlias API

This commit adds the aliases and indices
options to add and remove alias operations
for the bulk alias API.

Closes #4721

(cherry picked from commit 126106c)

Author: russcam

src/Nest/Indices/AliasManagement/Alias/Actions/AliasAdd.cs

@@ -2,7 +2,8 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
+using System;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Elasticsearch.Net.Utf8Json;
 
@@ -47,13 +48,34 @@ public AliasAddDescriptor Index<T>() where T : class
 			return this;
 		}
 
+		/// <inheritdoc cref="AliasAddOperation.Indices"/>
+		public AliasAddDescriptor Indices(Indices indices)
+		{
+			Self.Add.Indices = indices;
+			return this;
+		}
+
 		/// <inheritdoc cref="AliasAddOperation.Alias"/>
 		public AliasAddDescriptor Alias(string alias)
 		{
 			Self.Add.Alias = alias;
 			return this;
 		}
 
+		/// <inheritdoc cref="AliasAddOperation.Aliases"/>
+		public AliasAddDescriptor Aliases(IEnumerable<string> aliases)
+		{
+			Self.Add.Aliases = aliases;
+			return this;
+		}
+
+		/// <inheritdoc cref="AliasAddOperation.Aliases"/>
+		public AliasAddDescriptor Aliases(params string[] aliases)
+		{
+			Self.Add.Aliases = aliases;
+			return this;
+		}
+
 		/// <inheritdoc cref="AliasAddOperation.Routing"/>
 		public AliasAddDescriptor Routing(string routing)
 		{

src/Nest/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs

@@ -2,18 +2,27 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Elasticsearch.Net.Utf8Json;
 
 namespace Nest
 {
 	public class AliasAddOperation
 	{
 		/// <summary>
-		/// The name of the alias
+		/// An alias to add.
+		/// Multiple aliases can be specified with <see cref="Aliases"/>
 		/// </summary>
 		[DataMember(Name ="alias")]
 		public string Alias { get; set; }
 
+		/// <summary>
+		/// A collection of aliases to add
+		/// </summary>
+		[DataMember(Name ="aliases")]
+		public IEnumerable<string> Aliases { get; set; }
+
 		/// <summary>
 		/// Filter query used to limit the index alias.
 		/// If specified, the index alias only applies to documents returned by the filter.
@@ -22,11 +31,19 @@ public class AliasAddOperation
 		public QueryContainer Filter { get; set; }
 
 		/// <summary>
-		/// The index to which to add the alias
+		/// The index to which to add the alias.
+		/// Multiple indices can be specified with <see cref="Indices"/>
 		/// </summary>
 		[DataMember(Name ="index")]
 		public IndexName Index { get; set; }
 
+		/// <summary>
+		/// The indices to which to add the alias
+		/// </summary>
+		[DataMember(Name = "indices")]
+		[JsonFormatter(typeof(IndicesFormatter))]
+		public Indices Indices { get; set; }
+
 		/// <inheritdoc cref="IAlias.IndexRouting"/>
 		[DataMember(Name ="index_routing")]
 		public string IndexRouting { get; set; }

src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemove.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Elasticsearch.Net.Utf8Json;
 
@@ -26,28 +27,53 @@ public class AliasRemoveDescriptor : DescriptorBase<AliasRemoveDescriptor, IAlia
 
 		AliasRemoveOperation IAliasRemoveAction.Remove { get; set; }
 
+		/// <inheritdoc cref="AliasRemoveOperation.Index"/>
 		public AliasRemoveDescriptor Index(string index)
 		{
 			Self.Remove.Index = index;
 			return this;
 		}
 
+		/// <inheritdoc cref="AliasRemoveOperation.Index"/>
 		public AliasRemoveDescriptor Index(Type index)
 		{
 			Self.Remove.Index = index;
 			return this;
 		}
 
+		/// <inheritdoc cref="AliasRemoveOperation.Index"/>
 		public AliasRemoveDescriptor Index<T>() where T : class
 		{
 			Self.Remove.Index = typeof(T);
 			return this;
 		}
 
+		/// <inheritdoc cref="AliasRemoveOperation.Indices"/>
+		public AliasRemoveDescriptor Indices(Indices indices)
+		{
+			Self.Remove.Indices = indices;
+			return this;
+		}
+
+		/// <inheritdoc cref="AliasRemoveOperation.Alias"/>
 		public AliasRemoveDescriptor Alias(string alias)
 		{
 			Self.Remove.Alias = alias;
 			return this;
 		}
+
+		/// <inheritdoc cref="AliasRemoveOperation.Aliases"/>
+		public AliasRemoveDescriptor Aliases(IEnumerable<string> aliases)
+		{
+			Self.Remove.Aliases = aliases;
+			return this;
+		}
+
+		/// <inheritdoc cref="AliasRemoveOperation.Aliases"/>
+		public AliasRemoveDescriptor Aliases(params string[] aliases)
+		{
+			Self.Remove.Aliases = aliases;
+			return this;
+		}
 	}
 }

src/Nest/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs

@@ -2,16 +2,39 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Runtime.Serialization;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Elasticsearch.Net.Utf8Json;
 
 namespace Nest
 {
 	public class AliasRemoveOperation
 	{
+		/// <summary>
+		/// An alias to remove.
+		/// Multiple aliases can be specified with <see cref="Aliases"/>
+		/// </summary>
 		[DataMember(Name ="alias")]
 		public string Alias { get; set; }
 
+		/// <summary>
+		/// A collection of aliases to remove
+		/// </summary>
+		[DataMember(Name ="aliases")]
+		public IEnumerable<string> Aliases { get; set; }
+
+		/// <summary>
+		/// The index to which to add the alias.
+		/// Multiple indices can be specified with <see cref="Indices"/>
+		/// </summary>
 		[DataMember(Name ="index")]
 		public IndexName Index { get; set; }
+
+		/// <summary>
+		/// The indices to which to add the alias
+		/// </summary>
+		[DataMember(Name = "indices")]
+		[JsonFormatter(typeof(IndicesFormatter))]
+		public Indices Indices { get; set; }
 	}
 }

src/Nest/Indices/AliasManagement/Alias/Actions/IAliasAction.cs

@@ -2,7 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Elasticsearch.Net.Utf8Json;
+using Elasticsearch.Net.Utf8Json;
 using Elasticsearch.Net.Utf8Json.Internal;
 
 

src/Nest/Indices/AliasManagement/Alias/BulkAliasRequest.cs

@@ -2,7 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 

tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs

@@ -2,7 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
+using System;
 using System.Collections.Generic;
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Elasticsearch.Net;
@@ -28,15 +28,20 @@ public AliasApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluste
 			{
 				new Dictionary<string, object>
 					{ { "add", new { alias = "alias", index = CallIsolatedValue, index_routing = "x", search_routing = "y" } } },
+				new Dictionary<string, object>
+					{ { "add", new { aliases = new [] { "alias1", "alias2" }, indices = new [] { CallIsolatedValue } } } },
 				new Dictionary<string, object> { { "remove", new { alias = "alias", index = CallIsolatedValue } } },
+				new Dictionary<string, object> { { "remove", new { aliases = new [] { "alias1", "alias2" }, indices = new[] { CallIsolatedValue } } } },
 			}
 		};
 
 		protected override int ExpectStatusCode => 200;
 
 		protected override Func<BulkAliasDescriptor, IBulkAliasRequest> Fluent => d => d
 			.Add(a => a.Alias("alias").Index(CallIsolatedValue).IndexRouting("x").SearchRouting("y"))
-			.Remove(a => a.Alias("alias").Index(CallIsolatedValue));
+			.Add(a => a.Aliases("alias1", "alias2").Indices(CallIsolatedValue))
+			.Remove(a => a.Alias("alias").Index(CallIsolatedValue))
+			.Remove(a => a.Aliases("alias1", "alias2").Indices(CallIsolatedValue));
 
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 
@@ -46,7 +51,10 @@ public AliasApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluste
 			{
 				new AliasAddAction
 					{ Add = new AliasAddOperation { Alias = "alias", Index = CallIsolatedValue, IndexRouting = "x", SearchRouting = "y" } },
+				new AliasAddAction
+					{ Add = new AliasAddOperation { Aliases = new[] { "alias1", "alias2" }, Indices = CallIsolatedValue } },
 				new AliasRemoveAction { Remove = new AliasRemoveOperation { Alias = "alias", Index = CallIsolatedValue } },
+				new AliasRemoveAction { Remove = new AliasRemoveOperation { Aliases = new[] { "alias1", "alias2" }, Indices = CallIsolatedValue } },
 			}
 		};