Add GET List Ingress Health for Service

Consul.Test/HealthTest.cs

@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Consul.Filtering;
+using NuGet.Versioning;
 using Xunit;
 
 namespace Consul.Test
@@ -157,6 +158,54 @@ public async Task Health_Connect()
             }
         }
 
+        [SkippableFact]
+        public async void Health_Ingress()
+        {
+            var cutOffVersion = SemanticVersion.Parse("1.8.0");
+            Skip.If(AgentVersion < cutOffVersion, $"Current version is {AgentVersion}, but Terminating and Ingress GatewayEntrys are different since {cutOffVersion}");
+
+            var registration = new AgentServiceRegistration
+            {
+                Name = "foo-ingress",
+                Port = 8000
+            };
+            await _client.Agent.ServiceRegister(registration);
+
+            var gatewayRegistration = new AgentServiceRegistration
+            {
+                Name = "foo-ingress-gateway",
+                Port = 8001,
+                Kind = ServiceKind.IngressGateway
+            };
+            await _client.Agent.ServiceRegister(gatewayRegistration);
+
+            var ingressGatewayConfigEntry = new IngressGatewayEntry
+            {
+                Name = "foo-ingress-gateway",
+                Listeners = new List<GatewayListener>
+                {
+                    new GatewayListener
+                    {
+                        Port = 2222,
+                        Protocol = "tcp",
+                        Services = new List<ExternalService>
+                        {
+                            new ExternalService
+                            {
+                                Name = "foo-ingress"
+                            }
+                        }
+                    }
+                }
+            };
+            await _client.Configuration.ApplyConfig(ingressGatewayConfigEntry);
+
+            var services = await _client.Health.Ingress("foo-ingress", "", false);
+            Assert.Single(services.Response);
+            Assert.NotEmpty(services.Response[0].Node.Datacenter);
+            Assert.Equal(gatewayRegistration.Name, services.Response[0].Service.Service);
+        }
+
         [Fact]
         public void Health_GetAggregatedStatus()
         {

Consul/Catalog.cs

@@ -32,6 +32,7 @@ public class Node
         [JsonProperty(PropertyName = "Node")]
         public string Name { get; set; }
         public string Address { get; set; }
+        public string Datacenter { get; set; }
         public Dictionary<string, string> TaggedAddresses { get; set; }
     }
 

Consul/Health.cs

@@ -337,6 +337,54 @@ public Task<QueryResult<ServiceEntry[]>> Connect(string service, string tag, boo
             return Connect(service, tag, passingOnly, q, null, ct);
         }
 
+        /// <summary>
+        /// Ingress is equivalent to Service and Connect, except that it will only return ingress services
+        /// <param name="service">The service ID</param>
+        /// <param name="tag">The service member tag</param>
+        /// <param name="passingOnly">Only return if the health check is in the Passing state</param>
+        /// <param name="q">Customized query options</param>
+        /// <param name="filter">Specifies the expression used to filter the queries results prior to returning the data</param>
+        /// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
+        /// <returns>This endpoint returns the nodes providing an ingress service in a given datacenter, or a query result with a null response</returns>
+        public Task<QueryResult<ServiceEntry[]>> Ingress(string service, string tag, bool passingOnly, QueryOptions q, Filter filter, CancellationToken ct = default)
+        {
+            var req = _client.Get<ServiceEntry[]>(string.Format("/v1/health/ingress/{0}", service), q, filter);
+            if (!string.IsNullOrEmpty(tag))
+            {
+                req.Params["tag"] = tag;
+            }
+            if (passingOnly)
+            {
+                req.Params["passing"] = "1";
+            }
+            return req.Execute(ct);
+        }
+
+        /// <summary>
+        /// Ingress is equivalent to Service and Connect, except that it will only return ingress services
+        /// <param name="service">The service ID</param>
+        /// <param name="tag">The service member tag</param>
+        /// <param name="passingOnly">Only return if the health check is in the Passing state</param>
+        /// <param name="q">Customized query options</param>
+        /// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
+        /// <returns>This endpoint returns the nodes providing an ingress service in a given datacenter, or a query result with a null response</returns>
+        public Task<QueryResult<ServiceEntry[]>> Ingress(string service, string tag, bool passingOnly, QueryOptions q, CancellationToken ct = default)
+        {
+            return Ingress(service, tag, passingOnly, q, null, ct);
+        }
+
+        /// <summary>
+        /// Ingress is equivalent to Service and Connect, except that it will only return ingress services
+        /// <param name="service">The service ID</param>
+        /// <param name="tag">The service member tag</param>
+        /// <param name="passingOnly">Only return if the health check is in the Passing state</param>
+        /// <param name="ct">Cancellation token for long poll request. If set, OperationCanceledException will be thrown if the request is cancelled before completing</param>
+        /// <returns>This endpoint returns the nodes providing an ingress service in a given datacenter, or a query result with a null response</returns>
+        public Task<QueryResult<ServiceEntry[]>> Ingress(string service, string tag, bool passingOnly, CancellationToken ct = default)
+        {
+            return Ingress(service, tag, passingOnly, QueryOptions.Default, null, ct);
+        }
+
         /// <summary>
         /// State is used to retrieve all the checks in a given state. The wildcard "any" state can also be used for all checks.
         /// </summary>

Consul/Interfaces/IHealthEndpoint.cs

@@ -39,6 +39,9 @@ public interface IHealthEndpoint
         Task<QueryResult<ServiceEntry[]>> Service(string service, string tag, bool passingOnly, QueryOptions q, Filter filter, CancellationToken ct = default);
         Task<QueryResult<ServiceEntry[]>> Connect(string service, string tag, bool passingOnly, QueryOptions q, Filter filter, CancellationToken ct = default);
         Task<QueryResult<ServiceEntry[]>> Connect(string service, string tag, bool passingOnly, QueryOptions q, CancellationToken ct = default);
+        Task<QueryResult<ServiceEntry[]>> Ingress(string service, string tag, bool passingOnly, QueryOptions q, Filter filter, CancellationToken ct = default);
+        Task<QueryResult<ServiceEntry[]>> Ingress(string service, string tag, bool passingOnly, QueryOptions q, CancellationToken ct = default);
+        Task<QueryResult<ServiceEntry[]>> Ingress(string service, string tag, bool passingOnly, CancellationToken ct = default);
         Task<QueryResult<HealthCheck[]>> State(HealthStatus status, CancellationToken ct = default);
         Task<QueryResult<HealthCheck[]>> State(HealthStatus status, QueryOptions q, CancellationToken ct = default);
     }