allow versions of hg container and api to not match in develop enviro…

…nment
sillsdev · May 23, 2024 · 899e635 · 899e635
1 parent 6002304
commit 899e635
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.idea/.idea.LexBox/.idea/indexLayout.xml b/.idea/.idea.LexBox/.idea/indexLayout.xml
diff --git a/backend/LexBoxApi/Services/HgWebHealthCheck.cs b/backend/LexBoxApi/Services/HgWebHealthCheck.cs
@@ -1,9 +1,11 @@
-using LexCore.ServiceInterfaces;
+using LexCore.Config;
+using LexCore.ServiceInterfaces;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Microsoft.Extensions.Options;
 
 namespace LexBoxApi.Services;
 
-public class HgWebHealthCheck(IHgService hgService) : IHealthCheck
+public class HgWebHealthCheck(IHgService hgService, IOptions<HgConfig> hgOptions) : IHealthCheck
 {
     public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context,
         CancellationToken cancellationToken = new())
@@ -13,7 +15,7 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             return HealthCheckResult.Unhealthy();
         }
-        if (version != AppVersionService.Version)
+        if (hgOptions.Value.RequireContainerVersionMatch && version != AppVersionService.Version)
         {
             return HealthCheckResult.Degraded(
                 $"api version: '{AppVersionService.Version}' hg version: '{version}' mismatch");

diff --git a/backend/LexCore/Config/HgConfig.cs b/backend/LexCore/Config/HgConfig.cs
@@ -16,4 +16,5 @@ public class HgConfig
     [Required, Url]
     public required string HgResumableUrl { get; init; }
     public bool AutoUpdateLexEntryCountOnSendReceive { get; init; } = false;
+    public bool RequireContainerVersionMatch { get; init; } = true;
 }
diff --git a/deployment/develop/lexbox-deployment.patch.yaml b/deployment/develop/lexbox-deployment.patch.yaml
@@ -24,3 +24,5 @@ spec:
               value: "Language Depot (Develop) <[email protected]>"
             - name: Email__BaseUrl
               value: "https://develop.lexbox.org"
+            - name: HgConfig__RequireContainerVersionMatch
+              value: "false"