fix change in GetAlias behavior, since 5.5 now returns 404 when some aliases suplied are not found

Author: Mpdreamz

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -234,6 +234,12 @@ private IAggregate GetGeoCentroidAggregate(JsonReader reader, JsonSerializer ser
 			reader.Read();
 			var geoCentroid = new GeoCentroidAggregate {Location = serializer.Deserialize<GeoLocation>(reader)};
 			reader.Read();
+			if (reader.TokenType == JsonToken.PropertyName && (string) reader.Value == Parser.Count)
+			{
+				reader.Read();
+				geoCentroid.Count = (long) reader.Value;
+				reader.Read();
+			}
 			return geoCentroid;
 		}
 

src/Nest/Aggregations/Metric/GeoCentroid/GeoCentroidAggregate.cs

@@ -3,5 +3,8 @@
 	public class GeoCentroidAggregate : MetricAggregateBase
 	{
 		public GeoLocation Location { get; set; }
+
+		//TODO non nullable in 6.0, introduced in 5.5
+		public long? Count { get; set; }
 	}
 }

src/Nest/Indices/AliasManagement/GetAlias/ElasticClient-GetAlias.cs

@@ -40,7 +40,7 @@ public IGetAliasResponse GetAlias(Func<GetAliasDescriptor, IGetAliasRequest> sel
 		/// <inheritdoc/>
 		public IGetAliasResponse GetAlias(IGetAliasRequest request) =>
 			this.Dispatcher.Dispatch<IGetAliasRequest, GetAliasRequestParameters, GetAliasResponse>(
-				request,
+				this.ForceConfiguration<IGetAliasRequest, GetAliasRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
 				(p, d) => this.LowLevelDispatch.IndicesGetAliasDispatch<GetAliasResponse>(p)
 			);
 
@@ -53,7 +53,7 @@ public Task<IGetAliasResponse> GetAliasAsync(
 		/// <inheritdoc/>
 		public Task<IGetAliasResponse> GetAliasAsync(IGetAliasRequest request, CancellationToken cancellationToken = default(CancellationToken)) =>
 			this.Dispatcher.DispatchAsync<IGetAliasRequest, GetAliasRequestParameters, GetAliasResponse, IGetAliasResponse>(
-				request,
+				this.ForceConfiguration<IGetAliasRequest, GetAliasRequestParameters>(request, c => c.AllowedStatusCodes = new[] { -1 }),
 				cancellationToken,
 				(p, d, c) => this.LowLevelDispatch.IndicesGetAliasDispatchAsync<GetAliasResponse>(p, c)
 			);

src/Nest/Indices/AliasManagement/GetAlias/GetAliasResponse.cs

@@ -1,19 +1,32 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
+using Elasticsearch.Net;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
 	[JsonConverter(typeof(GetAliasResponseConverter))]
 	public interface IGetAliasResponse : IResponse
 	{
 		IReadOnlyDictionary<string, IReadOnlyList<AliasDefinition>> Indices { get; }
+		/// <summary>
+		/// Starting from elasticsearch 5.5 if only some indices are not found an additonal error message will be returned.
+		/// </summary>
+		string Error { get; }
+		int? StatusCode { get; }
 	}
 
 	public class GetAliasResponse : ResponseBase, IGetAliasResponse
 	{
 		public IReadOnlyDictionary<string, IReadOnlyList<AliasDefinition>> Indices { get; internal set; } = EmptyReadOnly<string, IReadOnlyList<AliasDefinition>>.Dictionary;
+
+
+		public override bool IsValid => this.Indices.Count > 0 ? true : false;
+		public string Error { get; internal set; }
+		public int? StatusCode { get; internal set; }
 	}
 
 	internal class GetAliasResponseConverter : JsonConverter
@@ -27,7 +40,24 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			var dict = serializer.Deserialize<Dictionary<string, Dictionary<string, Dictionary<string, AliasDefinition>>>>(reader);
+			var j = JObject.Load(reader);
+			var errorProperty =j.Property("error");
+			string error = null;
+			if (errorProperty?.Value?.Type == JTokenType.String)
+			{
+				error = errorProperty.Value.Value<string>();
+				errorProperty.Remove();
+			}
+			var statusProperty =j.Property("status");
+			int? statusCode = null;
+			if (statusProperty?.Value?.Type == JTokenType.Integer)
+			{
+				statusCode = statusProperty.Value.Value<int>();
+				statusProperty.Remove();
+			}
+
+			//Read the remaining properties as aliases
+			var dict = serializer.Deserialize<Dictionary<string, Dictionary<string, Dictionary<string, AliasDefinition>>>>(j.CreateReader());
 			var indices = new Dictionary<string, IReadOnlyList<AliasDefinition>>();
 
 			foreach (var kv in dict)
@@ -49,7 +79,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				indices.Add(indexDict, aliases);
 			}
 
-			return new GetAliasResponse { Indices = indices };
+			return new GetAliasResponse { Indices = indices, Error = error, StatusCode = statusCode};
 		}
 
 		public override bool CanConvert(Type objectType) => true;

src/Tests/ClientConcepts/Certificates/SslAndKpiXPackCluster.cs

@@ -31,17 +31,21 @@ public abstract class SslAndKpiXPackCluster : XPackCluster
 			"xpack.security.http.ssl.enabled=true",
 		};
 
-		private static int _port = 9200;
-		private int? _desiredPort;
-		public override int DesiredPort
-		{
-			get
-			{
-				if (!this._desiredPort.HasValue)
-					this._desiredPort = ++_port;
-				return this._desiredPort.Value;
-			}
-		}
+//		private static readonly object _lock = new object();
+//		private static int _port = 9200;
+//		private int? _desiredPort;
+//		public override int DesiredPort
+//		{
+//			get
+//			{
+//				lock (_lock)
+//				{
+//                    if (!this._desiredPort.HasValue)
+//                        this._desiredPort = ++_port;
+//                    return this._desiredPort.Value;
+//				}
+//			}
+//		}
 
 		public override ConnectionSettings ClusterConnectionSettings(ConnectionSettings s) =>
 			this.ConnectionSettings(Authenticate(s));

src/Tests/ClientConcepts/Certificates/WorkingWithCertificates.doc.cs

@@ -24,6 +24,7 @@ namespace Tests.ClientConcepts.Certificates
 	 * `ServicePointManager.ServerCertificateValidationCallback`. Most examples you will find doing this this will simply return `true` from the
 	 * validation callback and merrily whistle off into the sunset. **This is not advisable** as it allows *any* HTTPS traffic through in the
 	 * current `AppDomain` *without* any validation. Here's a concrete example:
+	 *
 	 */
 	public class WorkingWithCertificates
 	{
@@ -65,9 +66,7 @@ protected override ConnectionSettings ConnectionSettings(ConnectionSettings s) =
 		[IntegrationOnly]
 		public class DenyAllSslCertificatesApiTests : ConnectionErrorTestBase<DenyAllCertificatesCluster>
 		{
-			public DenyAllSslCertificatesApiTests(DenyAllCertificatesCluster cluster, EndpointUsage usage) : base(cluster, usage)
-			{
-			}
+			public DenyAllSslCertificatesApiTests(DenyAllCertificatesCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
 			[I]
 			public async Task UsedHttps() => await AssertOnAllResponses(r => r.ApiCall.Uri.Scheme.Should().Be("https"));

src/Tests/Framework/ManagedElasticsearch/Clusters/ClusterBase.cs

@@ -45,7 +45,7 @@ public void Start()
 			if (!this.SkipValidation)
 				this.TaskRunner.ValidateAfterStart(this.Node.Client);
 			if (this.NodeConfiguration.RunIntegrationTests && this.Node.Port != this.DesiredPort)
-				throw new Exception($"The cluster that was started runs on {this.Node.Port} but this cluster wants {this.DesiredPort}");
+				throw new Exception($"The cluster that was started of type {this.GetType().Name} runs on {this.Node.Port} but this cluster wants {this.DesiredPort}");
 			this.SeedNode();
 		}
 

src/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs

@@ -7,13 +7,14 @@
 using Tests.Framework;
 using Tests.Framework.Integration;
 using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.ManagedElasticsearch.NodeSeeders;
 using Xunit;
 
 namespace Tests.Indices.AliasManagement.GetAlias
 {
 	public class GetAliasApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetAliasResponse, IGetAliasRequest, GetAliasDescriptor, GetAliasRequest>
 	{
-		private static readonly Names Names = Infer.Names("alias, x", "y");
+		private static readonly Names Names = Infer.Names(DefaultSeeder.ProjectsAliasName);
 
 		public GetAliasApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
@@ -27,10 +28,42 @@ protected override LazyResponses ClientUsage() => Calls(
 		protected override bool ExpectIsValid => true;
 		protected override int ExpectStatusCode => 200;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
-		protected override string UrlPath => $"_all/_alias/alias%2Cx%2Cy";
+		protected override string UrlPath => $"_all/_alias/{DefaultSeeder.ProjectsAliasName}";
 		protected override void ExpectResponse(IGetAliasResponse response)
 		{
 			response.Indices.Should().NotBeNull();
+			response.Indices.Count.Should().BeGreaterThan(0);
+		}
+		protected override bool SupportsDeserialization => false;
+
+		protected override Func<GetAliasDescriptor, IGetAliasRequest> Fluent => d=>d
+			.AllIndices()
+			.Name(Names)
+		;
+		protected override GetAliasRequest Initializer => new GetAliasRequest(Nest.Indices.All, Names);
+	}
+
+	public class GetAliasPartialMatchApiTests : ApiIntegrationTestBase<ReadOnlyCluster, IGetAliasResponse, IGetAliasRequest, GetAliasDescriptor, GetAliasRequest>
+	{
+		private static readonly Names Names = Infer.Names(DefaultSeeder.ProjectsAliasName,"x", "y");
+
+		public GetAliasPartialMatchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override LazyResponses ClientUsage() => Calls(
+			fluent: (client, f) => client.GetAlias(f),
+			fluentAsync: (client, f) => client.GetAliasAsync(f),
+			request: (client, r) => client.GetAlias(r),
+			requestAsync: (client, r) => client.GetAliasAsync(r)
+		);
+
+		protected override bool ExpectIsValid => true;
+		protected override int ExpectStatusCode => TestClient.VersionUnderTestSatisfiedBy("<5.5.0") ? 200 : 404;
+		protected override HttpMethod HttpMethod => HttpMethod.GET;
+		protected override string UrlPath => $"_all/_alias/{DefaultSeeder.ProjectsAliasName}%2Cx%2Cy";
+		protected override void ExpectResponse(IGetAliasResponse response)
+		{
+			response.Indices.Should().NotBeNull();
+			response.Indices.Count.Should().BeGreaterThan(0);
 		}
 		protected override bool SupportsDeserialization => false;
 

src/Tests/tests.default.yaml

@@ -8,7 +8,7 @@
 mode: i
 # the elasticsearch version that should be started
 # Can be a snapshot version of sonatype or "latest" to get the latest snapshot of sonatype
-elasticsearch_version: 5.5.0
+elasticsearch_version: 5.4.1
 # cluster filter allows you to only run the integration tests of a particular cluster (cluster suffix not needed)
 # cluster_filter:
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running