Add possibility to extend ready check (#15)

Co-authored-by: Artem Leshchev <[email protected]>
Luxoft · Jun 3, 2024 · 22b8635 · 22b8635
1 parent 806477a
commit 22b8635
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/Bss.Platform.Kubernetes/DependencyInjection.cs b/src/Bss.Platform.Kubernetes/DependencyInjection.cs
@@ -29,4 +29,17 @@ public static IApplicationBuilder UsePlatformKubernetesHealthChecks(this IApplic
         app
             .UseHealthChecks("/health/live", new HealthCheckOptions { Predicate = _ => false })
             .UseHealthChecks("/health/ready", new HealthCheckOptions { Predicate = x => x.Name == SqlHealthCheck });
+
+    public static IHealthChecksBuilder AddPlatformKubernetesHealthChecks(
+        this IServiceCollection services,
+        string connectionString,
+        string sqlCheckName) =>
+        services
+            .AddHealthChecks()
+            .AddSqlServer(connectionString, name: sqlCheckName);
+
+    public static IApplicationBuilder UsePlatformKubernetesHealthChecks(this IApplicationBuilder app, params string[] readyCheckNames) =>
+        app
+            .UseHealthChecks("/health/live", new HealthCheckOptions { Predicate = _ => false })
+            .UseHealthChecks("/health/ready", new HealthCheckOptions { Predicate = x => readyCheckNames.Contains(x.Name) });
 }
diff --git a/src/Bss.Platform.Logging/DependencyInjection.cs b/src/Bss.Platform.Logging/DependencyInjection.cs
@@ -10,7 +10,7 @@ namespace Bss.Platform.Logging;
 
 public static class DependencyInjection
 {
-    public static void AddPlatformLogging(this IHostBuilder builder) =>
+    public static IHostBuilder AddPlatformLogging(this IHostBuilder builder) =>
         builder
             .UseSerilog(
                 (context, services, configuration) =>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -16,7 +16,7 @@
     <PackageVersion Include="Microsoft.ApplicationInsights.Kubernetes" Version="6.1.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />

diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs
@@ -4,9 +4,9 @@
 [assembly: AssemblyCompany("Luxoft")]
 [assembly: AssemblyCopyright("Copyright © Luxoft 2024")]
 
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyInformationalVersion("1.5.1.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]