add new error as customer error; add option to disable health check

microsoft · Feb 6, 2024 · 329b200 · 329b200
1 parent 245e308
commit 329b200
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/Microsoft.Health.Dicom.Blob/Extensions/BlobStorageErrorExtensions.cs b/src/Microsoft.Health.Dicom.Blob/Extensions/BlobStorageErrorExtensions.cs
@@ -13,6 +13,11 @@ namespace Microsoft.Health.Dicom.Blob.Extensions;
 
 internal static class BlobStorageErrorExtensions
 {
+    private static readonly List<BlobErrorCode> Customer400ErrorCodes = new List<BlobErrorCode>
+    {
+        BlobErrorCode.UnsupportedHeader
+    };
+
     private static readonly List<BlobErrorCode> Customer401ErrorCodes = new List<BlobErrorCode>
     {
         BlobErrorCode.InvalidAuthenticationInfo,
@@ -44,7 +49,8 @@ internal static class BlobStorageErrorExtensions
 
     public static bool IsConnectedStoreCustomerError(this RequestFailedException rfe)
     {
-        return (rfe.Status == 401 && Customer401ErrorCodes.Any(e => e.ToString().Equals(rfe.ErrorCode, StringComparison.OrdinalIgnoreCase))) ||
+        return (rfe.Status == 400 && Customer400ErrorCodes.Any(e => e.ToString().Equals(rfe.ErrorCode, StringComparison.OrdinalIgnoreCase))) ||
+            (rfe.Status == 401 && Customer401ErrorCodes.Any(e => e.ToString().Equals(rfe.ErrorCode, StringComparison.OrdinalIgnoreCase))) ||
             (rfe.Status == 403 && Customer403ErrorCodes.Any(e => e.ToString().Equals(rfe.ErrorCode, StringComparison.OrdinalIgnoreCase))) ||
             (rfe.Status == 404 && Customer404ErrorCodes.Any(e => e.ToString().Equals(rfe.ErrorCode, StringComparison.OrdinalIgnoreCase))) ||
             (rfe.Status == 409 && Customer409ErrorCodes.Any(e => e.ToString().Equals(rfe.ErrorCode, StringComparison.OrdinalIgnoreCase)));

diff --git a/src/Microsoft.Health.Dicom.Blob/Registration/DicomServerBuilderBlobRegistrationExtensions.cs b/src/Microsoft.Health.Dicom.Blob/Registration/DicomServerBuilderBlobRegistrationExtensions.cs
@@ -56,9 +56,12 @@ public static IDicomServerBuilder AddBlobDataStores(this IDicomServerBuilder ser
             serverBuilder.Services
                 .AddPersistence<IFileStore, BlobFileStore>();
 
-            serverBuilder.Services
-                .AddHealthChecks()
-                .AddCheck<DicomConnectedStoreHealthCheck>("DcmHealthCheck");
+            if (featureConfiguration.EnableExternalStoreHealthCheck)
+            {
+                serverBuilder.Services
+                    .AddHealthChecks()
+                    .AddCheck<DicomConnectedStoreHealthCheck>("DcmHealthCheck");
+            }
         }
         else
         {

diff --git a/src/Microsoft.Health.Dicom.Core/Configs/FeatureConfiguration.cs b/src/Microsoft.Health.Dicom.Core/Configs/FeatureConfiguration.cs
@@ -39,4 +39,9 @@ public class FeatureConfiguration
     /// Disables all async operations
     /// </summary>
     public bool DisableOperations { get; set; }
+
+    /// <summary>
+    /// Enabled the health check for external store
+    /// </summary>
+    public bool EnableExternalStoreHealthCheck { get; set; }
 }
diff --git a/src/Microsoft.Health.Dicom.Web/appsettings.json b/src/Microsoft.Health.Dicom.Web/appsettings.json
@@ -84,7 +84,8 @@
       "EnableFullDicomItemValidation": false,
       "EnableOhifViewer": true,
       "EnableExternalStore": false,
-      "DisableOperations": false
+      "DisableOperations": false,
+      "EnableExternalStoreHealthCheck": true
     },
     "Services": {
       "DeletedInstanceCleanup": {