Merge branch 'master' of https://github.com/Xabaril/AspNetCore.Diagno…

…stics.HealthChecks
Xabaril · Dec 16, 2019 · c00f82b · c00f82b
2 parents 366ee78 + 8ae38ef
commit c00f82b
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Install-Package AspNetCore.HealthChecks.EventStore
 Install-Package AspNetCore.HealthChecks.AzureStorage
 Install-Package AspNetCore.HealthChecks.AzureServiceBus
 Install-Package AspNetCore.HealthChecks.AzureKeyVault
-Install-Package AspNetCore.HealthChecks.AzureIoTHub
+Install-Package AspNetCore.HealthChecks.Azure.IoTHub
 Install-Package AspNetCore.HealthChecks.MySql
 Install-Package AspNetCore.HealthChecks.DocumentDb
 Install-Package AspNetCore.HealthChecks.SqLite

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -85,7 +85,7 @@
     <HealthCheckSqlite>3.0.0</HealthCheckSqlite>
     <HealthCheckUri>3.0.0</HealthCheckUri>
     <HealthCheckRedis>3.0.0</HealthCheckRedis>
-    <HealthCheckRabbitMQ>3.0.2</HealthCheckRabbitMQ>
+    <HealthCheckRabbitMQ>3.0.3</HealthCheckRabbitMQ>
     <HealthCheckEventStore>3.0.0</HealthCheckEventStore>
     <HealthCheckElasticsearch>3.0.0</HealthCheckElasticsearch>
     <HealthCheckOracle>3.0.0</HealthCheckOracle>

diff --git a/src/HealthChecks.RabbitMQ/RabbitMQHealthCheck.cs b/src/HealthChecks.RabbitMQ/RabbitMQHealthCheck.cs
@@ -19,7 +19,7 @@ public RabbitMQHealthCheck(string rabbitMqConnectionString, SslOption sslOption
             _lazyConnectionFactory = new Lazy<IConnectionFactory>(() => new ConnectionFactory()
             {
                 Uri = new Uri(rabbitMqConnectionString),
-                Ssl = sslOption
+                Ssl = sslOption ?? new SslOption()
             });
         }
 

diff --git a/src/HealthChecks.UI/package-lock.json b/src/HealthChecks.UI/package-lock.json
diff --git a/test/FunctionalTests/HealthChecks.RabbitMQ/RabbitMQHealthCheckTests.cs b/test/FunctionalTests/HealthChecks.RabbitMQ/RabbitMQHealthCheckTests.cs
@@ -33,7 +33,9 @@ public async Task be_healthy_if_rabbitmq_is_available()
             .ConfigureServices(services =>
             {
                 services.AddHealthChecks()
-                 .AddRabbitMQ(connectionString, sslOption: new SslOption(serverName: "localhost", enabled: false), tags: new string[] { "rabbitmq" });
+                 .AddRabbitMQ(rabbitMQConnectionString: connectionString, tags: new string[] { "rabbitmq" });
+                //services.AddHealthChecks()
+                // .AddRabbitMQ(connectionString, sslOption: new SslOption(serverName: "localhost", enabled: false), tags: new string[] { "rabbitmq" });
             })
             .Configure(app =>
             {
@@ -89,7 +91,7 @@ public async Task be_healthy_if_rabbitmq_is_available_using_iconnectionfactory()
             {
                 Uri = new Uri(connectionString),
                 AutomaticRecoveryEnabled = true,
-                Ssl= new SslOption(serverName: "localhost", enabled: false)
+                Ssl = new SslOption(serverName: "localhost", enabled: false)
             };
 
             var webHostBuilder = new WebHostBuilder()
@@ -98,7 +100,7 @@ public async Task be_healthy_if_rabbitmq_is_available_using_iconnectionfactory()
             {
                 services
                     .AddHealthChecks()
-                    .AddRabbitMQ(sp=>factory,  tags: new string[] { "rabbitmq" });
+                    .AddRabbitMQ(sp => factory, tags: new string[] { "rabbitmq" });
             })
             .Configure(app =>
             {
@@ -156,5 +158,34 @@ public async Task be_healthy_if_rabbitmq_is_available_using_iconnection()
             response.StatusCode
                 .Should().Be(HttpStatusCode.OK);
         }
+
+        [SkipOnAppVeyor]
+        public async Task be_healthy_if_rabbitmq_is_available_and_specify_default_ssloption()
+        {
+            var connectionString = @"amqp://localhost:5672";
+
+            var webHostBuilder = new WebHostBuilder()
+            .UseStartup<DefaultStartup>()
+            .ConfigureServices(services =>
+            {
+                services.AddHealthChecks()
+                 .AddRabbitMQ(connectionString, sslOption: new SslOption(serverName: "localhost", enabled: false), tags: new string[] { "rabbitmq" });
+            })
+            .Configure(app =>
+            {
+                app.UseHealthChecks("/health", new HealthCheckOptions()
+                {
+                    Predicate = r => r.Tags.Contains("rabbitmq")
+                });
+            });
+
+            var server = new TestServer(webHostBuilder);
+
+            var response = await server.CreateRequest($"/health")
+                .GetAsync();
+
+            response.StatusCode
+                .Should().Be(HttpStatusCode.OK);
+        }
     }
 }