Merge pull request #154 from TomaszKandula/stage

merge: stage to master
TomaszKandula · Feb 10, 2024 · 49ad77a · 49ad77a
2 parents 8ea5256 + eb407ab
commit 49ad77a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/.github/workflows/dev_build_test.yml b/.github/workflows/dev_build_test.yml
@@ -3,7 +3,7 @@ name: Build & run tests (dev)
 on:
   pull_request:
     branches: [ dev ]
-    
+
 jobs:
 
   dev-branch-check:
@@ -23,7 +23,7 @@ jobs:
         fetch-depth: 0
 
     - name: Variable substitution appsettings file for Development (NET Core)
-      uses: TomaszKandula/variable-substitution@v1.0.1
+      uses: TomaszKandula/variable-substitution@v1.0.2
       with:
         files: ${{ github.workspace }}/InvoiceGenerator.Configuration/appsettings.Development.json
       env:

diff --git a/.github/workflows/master_build_test_publish.yml b/.github/workflows/master_build_test_publish.yml
@@ -38,8 +38,8 @@ jobs:
     - name: Move results to outputs
       id: versioning
       run: |
-        echo "::set-output name=version::${{ steps.semantic.outputs.new_release_version }}"
-        echo "::set-output name=published::${{ steps.semantic.outputs.new_release_published }}"
+        echo "version=${{ steps.semantic.outputs.new_release_version }}" >> $GITHUB_OUTPUT
+        echo "published=${{ steps.semantic.outputs.new_release_published }}" >> $GITHUB_OUTPUT
 
   backend-production:
 
@@ -53,7 +53,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Variable substitution appsettings file for Production (NET Core)
-      uses: TomaszKandula/variable-substitution@v1.0.1
+      uses: TomaszKandula/variable-substitution@v1.0.2
       with:
         files: ${{ github.workspace }}/InvoiceGenerator.Configuration/appsettings.Production.json
       env:

diff --git a/.github/workflows/stage_build_test_publish.yml b/.github/workflows/stage_build_test_publish.yml
@@ -16,7 +16,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Variable substitution appsettings file for Staging (NET Core)
-      uses: TomaszKandula/variable-substitution@v1.0.1
+      uses: TomaszKandula/variable-substitution@v1.0.2
       with:
         files: ${{ github.workspace }}/InvoiceGenerator.Configuration/appsettings.Staging.json
       env:

diff --git a/InvoiceGenerator.WebApi/InvoiceGenerator.WebApi.csproj b/InvoiceGenerator.WebApi/InvoiceGenerator.WebApi.csproj
@@ -17,6 +17,8 @@
         <PackageReference Include="Serilog.Sinks.AzureBlobStorage" Version="3.2.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
         <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.2.3" />
+        <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.AzureStorage" Version="7.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/InvoiceGenerator.WebApi/Startup.cs b/InvoiceGenerator.WebApi/Startup.cs
@@ -1,14 +1,19 @@
+using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using InvoiceGenerator.Backend.Core.Exceptions;
 using InvoiceGenerator.WebApi.Configuration;
 using InvoiceGenerator.WebApi.Middleware;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.ResponseCompression;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Newtonsoft.Json;
 using Serilog;
 using Newtonsoft.Json.Converters;
 
@@ -42,6 +47,10 @@ public void ConfigureServices(IServiceCollection services)
         services.RegisterDependencies(_configuration);
         services.SetupSwaggerOptions(_environment);
         services.SetupDockerInternalNetwork();
+        services
+            .AddHealthChecks()
+            .AddSqlServer(_configuration.GetValue<string>("DbConnect"), name: "SQLServer")
+            .AddAzureBlobStorage(_configuration.GetValue<string>("AZ_Storage_ConnectionString"), name: "AzureStorage");
     }
 
     public void Configure(IApplicationBuilder builder)
@@ -54,13 +63,30 @@ public void Configure(IApplicationBuilder builder)
         builder.UseMiddleware<CacheControl>();
         builder.UseResponseCompression();
         builder.UseRouting();
+        builder.SetupSwaggerUi(_environment);
         builder.UseEndpoints(endpoints =>
         {
             endpoints.MapControllers();
             endpoints.MapGet("/", context 
                 => context.Response.WriteAsync("Invoice Generator API"));
         });
-
-        builder.SetupSwaggerUi(_environment);
+        builder.UseHealthChecks("/hc", new HealthCheckOptions
+        {
+            ResponseWriter = async (context, report) =>
+            {
+                var result = new
+                {
+                    status = report.Status.ToString(),
+                    errors = report.Entries.Select(pair 
+                        => new
+                        {
+                            key = pair.Key, 
+                            value = Enum.GetName(typeof(HealthStatus), pair.Value.Status)
+                        })
+                };
+                context.Response.ContentType = "application/json";
+                await context.Response.WriteAsync(JsonConvert.SerializeObject(result));
+            }
+        });
     }
 }