Elasticsearch Version Resolve Capabilities

integration-tests/NAME.IntegrationTests/Constants.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 public static class Constants {
     public static string ExpectedOperatingSystem;
@@ -17,6 +17,11 @@ public static class Constants {
     public static string SpecificRabbitVersion;
     public static string SpecificServiceVersion;
 
+    // Elasticsearch variables
+    public static string LatestElasticHostname;
+    public static string SpecificElasticHostname;
+    public static string SpecificElasticVersion;
+
     static Constants() {
         ExpectedOperatingSystem = Environment.GetEnvironmentVariable("OPERATING_SYSTEM") ?? "windows";
 
@@ -31,5 +36,9 @@ public static class Constants {
         SpecificMongoVersion = Environment.GetEnvironmentVariable("SPECIFIC_MONGO_VERSION") ?? "3.0.0";
         SpecificRabbitVersion = Environment.GetEnvironmentVariable("SPECIFIC_RABBIT_VERSION") ?? "3.6.5";
         SpecificServiceVersion = Environment.GetEnvironmentVariable("SPECIFIC_SERVICE_VERSION") ?? "1.0.0";
+
+        LatestElasticHostname = Environment.GetEnvironmentVariable("LATEST_ELASTIC_HOSTNAME") ?? "localhost";
+        SpecificElasticHostname = Environment.GetEnvironmentVariable("SPECIFIC_ELASTIC_HOSTNAME") ?? "localhost";
+        SpecificElasticVersion = Environment.GetEnvironmentVariable("SPECIFIC_ELASTIC_VERSION") ?? "5.5.1";
     }
 }

integration-tests/NAME.IntegrationTests/Elasticsearch/ElasticsearchVersionResolverTests.cs

@@ -0,0 +1,37 @@
+using NAME.ConnectionStrings;
+using NAME.Core;
+using NAME.Elasticsearch;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace NAME.IntegrationTests.Elasticsearch
+{
+    public class ElasticsearchVersionResolverTests
+    {
+        [Fact]
+        [Trait("TestCategory", "Integration")]
+        public async Task GetVersions_SpecificVersion()
+        {
+            ElasticsearchVersionResolver resolver = new ElasticsearchVersionResolver(new StaticConnectionStringProvider($"http://{ Constants.SpecificMongoHostname }:9200"), 10000, 10000);
+
+            var versions = await resolver.GetVersions().ConfigureAwait(false);
+
+            Assert.Equal(1, versions.Count());
+            Assert.Equal(versions.First(), DependencyVersion.Parse(Constants.SpecificElasticVersion));
+        }
+
+        [Fact]
+        [Trait("TestCategory", "Integration")]
+        public async Task GetVersions_LatestVersion()
+        {
+            ElasticsearchVersionResolver resolver = new ElasticsearchVersionResolver(new StaticConnectionStringProvider($"http://{ Constants.LatestMongoHostname }:9200"), 10000, 10000);
+
+            var versions = await resolver.GetVersions().ConfigureAwait(false);
+
+            Assert.Equal(1, versions.Count());
+            // Latest GA RELEASE: https://www.elastic.co/downloads/elasticsearch#ga-release
+            Assert.Equal(versions.First(), DependencyVersion.Parse("5.6.3"));
+        }
+    }
+}

integration-tests/docker-compose.yml

@@ -9,6 +9,8 @@ services:
       - specific-mongo
       - specific-rabbitmq
       - dummy-service
+      - elastic
+      - specific-elastic
     environment:
       - LATEST_MONGO_HOSTNAME=mongo
       - LATEST_RABBIT_HOSTNAME=rabbitmq
@@ -21,6 +23,9 @@ services:
       - SPECIFIC_SERVICE_VERSION=1.0.0
       - OPERATING_SYSTEM=debian
       - RUNNING_ON_DOCKER=true
+      - LATEST_ELASTIC_HOSTNAME=elastic
+      - SPECIFIC_ELASTIC_HOSTNAME=specific-elastic
+      - SPECIFIC_ELASTIC_VERSION=5.5.1
     volumes:
       - ../Output/Artifacts/NuGets/Release:/integration/nugets
       - ../Output/IntegrationTestsResults:/integration/TestResults
@@ -31,6 +36,8 @@ services:
       - specific-mongo
       - specific-rabbitmq
       - dummy-service
+      - elastic
+      - specific-elastic
   dummy-service:
     build: ./NAME.DummyService
     environment:
@@ -61,4 +68,17 @@ services:
       - "1433"
     environment:
       - SA_PASSWORD=W1#llnotbeused
-      - ACCEPT_EULA=Y
+      - ACCEPT_EULA=Y
+  elastic:
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.6.3
+    expose:
+      - "9200"
+    environment:
+      - xpack.security.enabled=false
+  specific-elastic:
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
+    expose:
+      - "9200"
+    environment:
+      - xpack.security.enabled=false
+

src/NAME.Core/ConnectedVersionResolver.cs

@@ -1,5 +1,7 @@
-using NAME.Core.Exceptions;
+using NAME.Core.Exceptions;
+using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
 
@@ -80,5 +82,27 @@ protected async Task<TcpClient> OpenTcpClient(string host, int port, string depe
                 throw new DependencyNotReachableException(dependencyName, ex);
             }
         }
+
+        /// <summary>
+        /// Gets a HttpWebRequest
+        /// </summary>
+        /// <param name="requestUriString">Request Uri String</param>
+        /// <param name="dependencyName">Dependency Name</param>
+        /// <returns>Returns a HttpWebRequest</returns>
+        protected HttpWebRequest GetHttpWebRequest(string requestUriString, string dependencyName)
+        {
+            HttpWebRequest request = null;
+            try
+            {
+                request = WebRequest.CreateHttp(requestUriString);
+                request.ContinueTimeout = this.ConnectTimeout;
+                request.ContentType = "application/json; charset=utf-8";
+                return request;
+            }
+            catch (Exception e)
+            {
+                throw new DependencyNotReachableException(dependencyName, e);
+            }
+        }
     }
-}
+}

src/NAME.Core/SupportedDependencies.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace NAME.Core
 {
     /// <summary>
@@ -14,25 +9,30 @@ public enum SupportedDependencies
         /// MongoDb
         /// </summary>
         MongoDb = 10,
-        
+
         /// <summary>
         /// Operating System
         /// </summary>
         OperatingSystem = 20,
-        
+
         /// <summary>
         /// RabbitMq
         /// </summary>
         RabbitMq = 30,
-        
+
         /// <summary>
         /// SQL Server
         /// </summary>
         SqlServer = 40,
-        
+
         /// <summary>
         /// A service with NAME
         /// </summary>
-        Service = 50
+        Service = 50,
+
+        /// <summary>
+        /// Elasticsearch
+        /// </summary>
+        Elasticsearch = 60
     }
-}
+}

src/NAME/DependenciesReader.cs

@@ -1,4 +1,4 @@
-using NAME.Core.Exceptions;
+using NAME.Core.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -265,6 +265,8 @@ private static IVersionResolver GetConnectedDependencyVersionResolver(SupportedD
                     return new SqlServer.SqlServerVersionResolver(connectionStringProvider, configuration.DependencyConnectTimeout, configuration.DependencyReadWriteTimeout);
                 case SupportedDependencies.Service:
                     return new Service.ServiceVersionResolver(connectionStringProvider, context.ServiceDependencyCurrentNumberOfHops, configuration.ServiceDependencyMaxHops, configuration.DependencyConnectTimeout, configuration.DependencyReadWriteTimeout);
+                case SupportedDependencies.Elasticsearch:
+                    return new Elasticsearch.ElasticsearchVersionResolver(connectionStringProvider, configuration.DependencyConnectTimeout, configuration.DependencyReadWriteTimeout);
                 default:
                     throw new NAMEException($"The dependency of type {dependencyType} is not supported as a connected dependency.");
             }

src/NAME/Elasticsearch/ElasticsearchVersionResolver.cs

@@ -0,0 +1,65 @@
+using NAME.Core;
+using NAME.Core.Exceptions;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace NAME.Elasticsearch
+{
+    internal class ElasticsearchVersionResolver : ConnectedVersionResolver
+    {
+        private IConnectionStringProvider connectionStringProvider;
+
+        public ElasticsearchVersionResolver(IConnectionStringProvider connectionStringProvider, int connectTimeout, int readWriteTimeout)
+            : base(connectTimeout, readWriteTimeout)
+        {
+            this.connectionStringProvider = connectionStringProvider;
+        }
+
+        public override async Task<IEnumerable<DependencyVersion>> GetVersions()
+        {
+            var versions = new List<DependencyVersion>();
+            var connectionString = string.Empty;
+
+            if (!this.connectionStringProvider.TryGetConnectionString(out connectionString))
+            {
+                throw new ConnectionStringNotFoundException(this.connectionStringProvider.ToString());
+            }
+
+            HttpWebResponse response;
+            try
+            {
+                var request = this.GetHttpWebRequest(connectionString, SupportedDependencies.Elasticsearch.ToString());
+                response = await request.GetResponseAsync() as HttpWebResponse;
+            }
+            catch (Exception e)
+            {
+                throw new DependencyNotReachableException($"{SupportedDependencies.Elasticsearch}: {e.Message}");
+            }
+            using (var reader = new StreamReader(response.GetResponseStream()))
+            {
+                var body = await reader.ReadToEndAsync();
+                var version = string.Empty;
+                try
+                {
+                    version = this.DeserializeJsonResponse(body);
+                    versions.Add(DependencyVersion.Parse(version));
+                }
+                catch (Exception e)
+                {
+                    throw new VersionParsingException(version, e.Message);
+                }
+            }
+
+            return versions;
+        }
+
+        private string DeserializeJsonResponse(string result)
+        {
+            var jsonResult = Json.Json.Parse(result);
+            return jsonResult["version"]["number"];
+        }
+    }
+}

src/NAME/MongoDb/MongoDBVersionResolver.cs

@@ -1,17 +1,14 @@
-using NAME.Core.Exceptions;
+using NAME.Core;
+using NAME.Core.Exceptions;
 using NAME.MongoDb.Bson;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using NAME.Core.Utils;
-using NAME.Core;
 
 namespace NAME.MongoDb
 {
@@ -148,4 +145,4 @@ private byte[] CreateServerStatusMessagePayload(MongoConnectionStringBuilder con
             return message;
         }
     }
-}
+}

src/NAME/Nuget/Content/dependencies.json

@@ -26,6 +26,15 @@
     //    "locator": "ConnectionStrings",
     //    "key": "EventaConnectionString"
     //  }
+    //},
+    //{
+    //  "type": "Elasticsearch",
+    //  "min_version": "5.5.1",
+    //  "max_version": "5.6.3",
+    //  "connection_string": {
+    //    "locator": "ConnectionStrings",
+    //    "key":  "ElasticConnectionString"
+    //  }
     //}
   ],
   "service_dependencies": [

src/NAME/Service/ServiceVersionResolver.cs

@@ -1,12 +1,10 @@
-using NAME.Core;
+using NAME.Core;
 using NAME.Core.Exceptions;
 using NAME.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace NAME.Service
@@ -18,7 +16,7 @@ namespace NAME.Service
     public class ServiceVersionResolver : ConnectedVersionResolver
     {
         private readonly IConnectionStringProvider _connectionStringProvider;
-        private readonly Func<string, HttpWebRequest> _webRequestFactory;
+
         private const string InfrastructureDependenciesKey = "infrastructure_dependencies";
         private const string ServiceDependenciesKey = "service_dependencies";
 
@@ -46,15 +44,12 @@ public class ServiceVersionResolver : ConnectedVersionResolver
         /// <param name="maxHopCount">The maximum hop count.</param>
         /// <param name="connectTimeout">The connect timeout.</param>
         /// <param name="readWriteTimeout">The read write timeout.</param>
-        /// <param name="webRequestFactory">The web request factory.</param>
-        public ServiceVersionResolver(IConnectionStringProvider connectionStringProvider, int currentHopNumber, int maxHopCount, int connectTimeout, int readWriteTimeout, Func<string, HttpWebRequest> webRequestFactory = null)
+        public ServiceVersionResolver(IConnectionStringProvider connectionStringProvider, int currentHopNumber, int maxHopCount, int connectTimeout, int readWriteTimeout)
             : base(connectTimeout, readWriteTimeout)
         {
             this._connectionStringProvider = connectionStringProvider;
             this.HopNumber = currentHopNumber;
             this.MaxHopCount = maxHopCount;
-
-            this._webRequestFactory = webRequestFactory ?? WebRequest.CreateHttp;
         }
 
         /// <summary>
@@ -150,12 +145,11 @@ public async Task GetDependantManifests(DependencyVersion rootDependency)
 
         private async Task<string> GetManifest(Uri endpointUri, bool retry, int hop)
         {
-            HttpWebRequest request = this._webRequestFactory.Invoke(endpointUri.AbsoluteUri);
-            request.ContentType = "application/json; charset=utf-8";
+            HttpWebRequest request = this.GetHttpWebRequest(endpointUri.AbsoluteUri, SupportedDependencies.Service.ToString());
             request.Headers[Constants.HOP_COUNT_HEADER_NAME] = hop.ToString();
 
             // This timeout defines the time it should take to connect to the instance.
-            request.ContinueTimeout = this.ConnectTimeout;
+
             try
             {
                 var getResponseTask = request.GetResponseAsync();
@@ -225,4 +219,4 @@ private async Task<string> GetManifest(Uri endpointUri, bool retry, int hop)
             }
         }
     }
-}
+}