fix: Refactor probes and add more health checks

.azure/applications/web-api-eu/main.bicep

@@ -83,6 +83,38 @@ resource environmentKeyVaultResource 'Microsoft.KeyVault/vaults@2023-07-01' exis
 
 var containerAppName = '${namePrefix}-webapi-eu-ca'
 
+var port = 8080
+
+var probes = [
+  {
+    periodSeconds: 5
+    initialDelaySeconds: 2
+    type: 'Liveness'
+    httpGet: {
+      path: '/liveness'
+      port: port
+    }
+  }
+  {
+    periodSeconds: 5
+    initialDelaySeconds: 2
+    type: 'Readiness'
+    httpGet: {
+      path: '/readiness'
+      port: port
+    }
+  }
+  {
+    periodSeconds: 5
+    initialDelaySeconds: 2
+    type: 'Startup'
+    httpGet: {
+      path: '/startup'
+      port: port
+    }
+  }
+]
+
 module containerApp '../../modules/containerApp/main.bicep' = {
   name: containerAppName
   params: {
@@ -94,6 +126,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     apimIp: apimIp
     tags: tags
     resources: resources
+    probes: probes
     revisionSuffix: revisionSuffix
   }
 }

.azure/applications/web-api-so/main.bicep

@@ -87,6 +87,38 @@ resource environmentKeyVaultResource 'Microsoft.KeyVault/vaults@2023-07-01' exis
 
 var containerAppName = '${namePrefix}-webapi-so-ca'
 
+var port = 8080
+
+var probes = [
+  {
+    periodSeconds: 5
+    initialDelaySeconds: 2
+    type: 'Liveness'
+    httpGet: {
+      path: '/liveness'
+      port: port
+    }
+  }
+  {
+    periodSeconds: 5
+    initialDelaySeconds: 2
+    type: 'Readiness'
+    httpGet: {
+      path: '/readiness'
+      port: port
+    }
+  }
+  {
+    periodSeconds: 5
+    initialDelaySeconds: 2
+    type: 'Startup'
+    httpGet: {
+      path: '/startup'
+      port: port
+    }
+  }
+]
+
 module containerApp '../../modules/containerApp/main.bicep' = {
   name: containerAppName
   params: {
@@ -98,6 +130,8 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     apimIp: apimIp
     tags: tags
     resources: resources
+    probes: probes
+    port: port
     revisionSuffix: revisionSuffix
   }
 }

.azure/modules/containerApp/main.bicep

@@ -28,30 +28,12 @@ param resources object?
 @description('The suffix for the revision of the container app')
 param revisionSuffix string
 
+@description('The probes for the container app')
+param probes array = []
+
 // Container app revision name does not allow '.' character
 var cleanedRevisionSuffix = replace(revisionSuffix, '.', '-')
 
-var probes = [
-  {
-    periodSeconds: 5
-    initialDelaySeconds: 2
-    type: 'Liveness'
-    httpGet: {
-      path: '/healthz'
-      port: port
-    }
-  }
-  {
-    periodSeconds: 5
-    initialDelaySeconds: 2
-    type: 'Readiness'
-    httpGet: {
-      path: '/healthz'
-      port: port
-    }
-  }
-]
-
 var ipSecurityRestrictions = empty(apimIp)
   ? []
   : [
@@ -74,7 +56,6 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
   identity: {
     type: 'SystemAssigned'
   }
-
   properties: {
     configuration: {
       ingress: ingress

Digdir.Domain.Dialogporten.sln

@@ -63,6 +63,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digdir.Domain.Dialogporten.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digdir.Domain.Dialogporten.Architecture.Tests", "tests\Digdir.Domain.Dialogporten.Architecture.Tests\Digdir.Domain.Dialogporten.Architecture.Tests.csproj", "{E389C7C8-9610-40AC-86DC-769B1B7DC78E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digdir.Library.Utils.AspNet", "src\Digdir.Library.Utils.AspNet\Digdir.Library.Utils.AspNet.csproj", "{6A485C65-3613-4A49-A16F-2789119F6F38}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -153,6 +155,10 @@ Global
 		{E389C7C8-9610-40AC-86DC-769B1B7DC78E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E389C7C8-9610-40AC-86DC-769B1B7DC78E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E389C7C8-9610-40AC-86DC-769B1B7DC78E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A485C65-3613-4A49-A16F-2789119F6F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A485C65-3613-4A49-A16F-2789119F6F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A485C65-3613-4A49-A16F-2789119F6F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A485C65-3613-4A49-A16F-2789119F6F38}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -182,6 +188,7 @@ Global
 		{AF35FFCA-1206-4C08-A003-DA4A1344CCD5} = {CADB8189-4AA1-4732-844A-C41DBF3EC8B7}
 		{0900E3CF-F9D8-4B29-957F-484B3B028D6D} = {320B47A0-5EB8-4B6E-8C84-90633A1849CA}
 		{E389C7C8-9610-40AC-86DC-769B1B7DC78E} = {CADB8189-4AA1-4732-844A-C41DBF3EC8B7}
+		{6A485C65-3613-4A49-A16F-2789119F6F38} = {320B47A0-5EB8-4B6E-8C84-90633A1849CA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B2FE67FF-7622-4AFB-AD8E-961B6A39D888}

docs/schema/V1/swagger.verified.json

@@ -6460,4 +6460,4 @@
       "url": "https://altinn-dev-api.azure-api.net/dialogporten"
     }
   ]
-}
+}

src/Digdir.Domain.Dialogporten.Infrastructure/Digdir.Domain.Dialogporten.Infrastructure.csproj

@@ -15,6 +15,8 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <TreatAsUsed>true</TreatAsUsed>
         </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1"/>
         <PackageReference Include="ZiggyCreatures.FusionCache" Version="1.4.0" />

src/Digdir.Domain.Dialogporten.Infrastructure/HealthChecks/RedisHealthCheck.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using StackExchange.Redis;
+using Microsoft.Extensions.Options;
+
+namespace Digdir.Domain.Dialogporten.Infrastructure.HealthChecks;
+
+internal sealed class RedisHealthCheck : IHealthCheck
+{
+    private readonly InfrastructureSettings _settings;
+
+    public RedisHealthCheck(IOptions<InfrastructureSettings> options)
+    {
+        _settings = options?.Value ?? throw new ArgumentNullException(nameof(options));
+    }
+
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            using var redis = await ConnectionMultiplexer.ConnectAsync(_settings.Redis.ConnectionString);
+            var db = redis.GetDatabase();
+            await db.PingAsync();
+            return HealthCheckResult.Healthy("Redis connection is healthy.");
+        }
+        catch (RedisConnectionException ex)
+        {
+            return HealthCheckResult.Unhealthy("Unable to connect to Redis.", exception: ex);
+        }
+        catch (Exception ex)
+        {
+            return HealthCheckResult.Unhealthy("An unexpected error occurred while checking Redis health.", exception: ex);
+        }
+    }
+}

src/Digdir.Domain.Dialogporten.Infrastructure/InfrastructureExtensions.cs

@@ -33,6 +33,8 @@
 using StackExchange.Redis;
 using ZiggyCreatures.Caching.Fusion;
 using ZiggyCreatures.Caching.Fusion.NullObjects;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Digdir.Domain.Dialogporten.Infrastructure.HealthChecks;
 
 namespace Digdir.Domain.Dialogporten.Infrastructure;
 
@@ -199,6 +201,8 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
             })
             .AddPolicyHandlerFromRegistry(PollyPolicy.DefaultHttpRetryPolicy);
 
+        services.AddCustomHealthChecks();
+
         if (environment.IsDevelopment())
         {
             var localDeveloperSettings = configuration.GetLocalDevelopmentSettings();
@@ -212,6 +216,24 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
         return services;
     }
 
+    private static IServiceCollection AddCustomHealthChecks(this IServiceCollection services)
+    {
+        services.AddHttpClient("HealthCheckClient")
+            .ConfigureHttpClient(client =>
+            {
+                client.Timeout = TimeSpan.FromSeconds(5);
+            })
+            .AddPolicyHandlerFromRegistry(PollyPolicy.DefaultHttpRetryPolicy); ;
+
+        services.AddHealthChecks()
+            .AddCheck<RedisHealthCheck>("redis", tags: ["dependencies", "redis"])
+            .AddDbContextCheck<DialogDbContext>("postgres", tags: ["dependencies", "critical"]);
+
+        services.AddSingleton<RedisHealthCheck>();
+
+        return services;
+    }
+
     private static IServiceCollection AddGraphQlRedisSubscriptions(this IServiceCollection services,
         string redisConnectionString)
     {
@@ -295,4 +317,4 @@ private static IServiceCollection ConfigureFusionCache(this IServiceCollection s
 
         return services;
     }
-}
+}

src/Digdir.Domain.Dialogporten.WebApi/Digdir.Domain.Dialogporten.WebApi.csproj

@@ -21,7 +21,8 @@
     <ItemGroup>
         <ProjectReference Include="..\Digdir.Domain.Dialogporten.Application\Digdir.Domain.Dialogporten.Application.csproj"/>
         <ProjectReference Include="..\Digdir.Domain.Dialogporten.Infrastructure\Digdir.Domain.Dialogporten.Infrastructure.csproj"/>
+        <ProjectReference Include="..\Digdir.Library.Utils.AspNet\Digdir.Library.Utils.AspNet.csproj"/>
         <ProjectReference Include="..\Digdir.Tool.Dialogporten.GenerateFakeData\Digdir.Tool.Dialogporten.GenerateFakeData.csproj"/>
     </ItemGroup>
 
-</Project>
+</Project>

src/Digdir.Domain.Dialogporten.WebApi/Program.cs

@@ -23,6 +23,8 @@
 using Microsoft.AspNetCore.Authorization;
 using NSwag;
 using Serilog;
+using Digdir.Library.Utils.AspNet;
+using static Digdir.Library.Utils.AspNet.HealthCheckExtensions;
 
 // Using two-stage initialization to catch startup errors.
 Log.Logger = new LoggerConfiguration()
@@ -126,11 +128,27 @@ static void BuildAndRun(string[] args)
             .AddNewtonsoftJson()
             .Services
 
-
         // Auth
         .AddDialogportenAuthentication(builder.Configuration)
-        .AddAuthorization()
-        .AddHealthChecks();
+        .AddAuthorization();
+
+    // Retrieve JWT bearer token schema URLs from configuration
+    var authSettings = builder.Configuration
+        .GetSection("WebApi")
+        .Get<WebApiSettings>();
+
+    var wellKnownUrls = authSettings?
+        .Authentication
+        .JwtBearerTokenSchemas
+        .Select(schema => schema.WellKnown)
+        .Where(url => !string.IsNullOrEmpty(url))
+        .ToList() ?? new List<string>();
+
+    // Add health checks with the retrieved URLs
+    builder.Services.AddAspNetHealthChecks(new AspNetHealthChecksSettings
+    {
+        HttpGetEndpointsToCheck = wellKnownUrls
+    });
 
     if (builder.Environment.IsDevelopment())
     {
@@ -155,25 +173,11 @@ static void BuildAndRun(string[] args)
         .UseAuthorization()
         .UseServiceOwnerOnBehalfOfPerson()
         .UseUserTypeValidation()
-        .UseAzureConfiguration()
-        .UseFastEndpoints(x =>
-        {
-            x.Endpoints.RoutePrefix = "api";
-            x.Versioning.Prefix = "v";
-            x.Versioning.PrependToRoute = true;
-            x.Versioning.DefaultVersion = 1;
-            x.Serializer.Options.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
-            // Do not serialize empty collections
-            x.Serializer.Options.TypeInfoResolver = new DefaultJsonTypeInfoResolver
-            {
-                Modifiers = { IgnoreEmptyCollections }
-            };
-            x.Serializer.Options.Converters.Add(new JsonStringEnumConverter());
-            x.Serializer.Options.Converters.Add(new UtcDateTimeOffsetConverter());
-            x.Serializer.Options.Converters.Add(new DateTimeNotSupportedConverter());
-            x.Errors.ResponseBuilder = ErrorResponseBuilderExtensions.ResponseBuilder;
-        })
-        .UseAddSwaggerCorsHeader()
+        .UseAzureConfiguration();
+
+    app.MapAspNetHealthChecks();
+
+    app.UseAddSwaggerCorsHeader()
         .UseSwaggerGen(config =>
         {
             config.PostProcess = (document, _) =>
@@ -198,9 +202,27 @@ static void BuildAndRun(string[] args)
             // We have to add dialogporten here to get the correct base url for swagger.json in the APIM. Should not be done for development
             var dialogPrefix = builder.Environment.IsDevelopment() ? "" : "/dialogporten";
             uiConfig.DocumentPath = dialogPrefix + "/swagger/{documentName}/swagger.json";
+        })
+        .UseFastEndpoints(x =>
+        {
+            x.Endpoints.RoutePrefix = "api";
+            x.Versioning.Prefix = "v";
+            x.Versioning.PrependToRoute = true;
+            x.Versioning.DefaultVersion = 1;
+            x.Serializer.Options.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+            // Do not serialize empty collections
+            x.Serializer.Options.TypeInfoResolver = new DefaultJsonTypeInfoResolver
+            {
+                Modifiers = { IgnoreEmptyCollections }
+            };
+            x.Serializer.Options.Converters.Add(new JsonStringEnumConverter());
+            x.Serializer.Options.Converters.Add(new UtcDateTimeOffsetConverter());
+            x.Serializer.Options.Converters.Add(new DateTimeNotSupportedConverter());
+            x.Errors.ResponseBuilder = ErrorResponseBuilderExtensions.ResponseBuilder;
         });
+
     app.MapControllers();
-    app.MapHealthChecks("/healthz");
+
     app.Run();
 }
 
@@ -216,4 +238,4 @@ static void IgnoreEmptyCollections(JsonTypeInfo typeInfo)
 }
 
 // ReSharper disable once ClassNeverInstantiated.Global
-public sealed partial class Program;
+public sealed partial class Program;