Register services in health check builder

Signed-off-by: Victor Chang <vicchang@nvidia.com>

Author: mocsharp

src/Monai.Deploy.Storage.sln

@@ -1,20 +1,4 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-<!--
-  ~ Copyright 2022 MONAI Consortium
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1

src/Plugins/MinIO/HealthCheckBuilder.cs

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Logging;
@@ -33,13 +32,12 @@ public override IHealthChecksBuilder Configure(
             IEnumerable<string>? tags = null,
             TimeSpan? timeout = null)
         {
-
             builder.Add(new HealthCheckRegistration(
                 ConfigurationKeys.StorageServiceName,
                 serviceProvider =>
                 {
-                    var minioClientFactory = serviceProvider.GetRequiredService<IMinIoClientFactory>();
                     var logger = serviceProvider.GetRequiredService<ILogger<MinIoHealthCheck>>();
+                    var minioClientFactory = serviceProvider.GetRequiredService<IMinIoClientFactory>();
                     return new MinIoHealthCheck(minioClientFactory, logger);
                 },
                 failureStatus,

src/Storage/IHealthChecksBuilderExtensions.cs

@@ -29,28 +29,32 @@ public static class IHealthChecksBuilderExtensions
         /// Configures health check for the MONAI Deploy Storage Service.
         /// </summary>
         /// <param name="builder">Instance of <see cref="IHealthChecksBuilder"/>.</param>
+        /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/>.</param>
         /// <param name="serviceProvider">Instance of <see cref="IServiceProvider"/>.</param>
         /// <param name="fullyQualifiedTypeName">Fully qualified type name of the service to use.</param>
         /// <returns>Instance of <see cref="IHealthChecksBuilder"/>.</returns>
         /// <exception cref="ConfigurationException"></exception>
         public static IHealthChecksBuilder AddMonaiDeployStorageHealthCheck(
             this IHealthChecksBuilder builder,
+            IServiceCollection serviceCollection,
             string fullyQualifiedTypeName,
             HealthStatus? failureStatus = null,
             IEnumerable<string>? tags = null,
             TimeSpan? timeout = null)
-            => AddMonaiDeployStorageHealthCheck(builder, fullyQualifiedTypeName, new FileSystem(), failureStatus, tags, timeout);
+            => AddMonaiDeployStorageHealthCheck(builder, serviceCollection, fullyQualifiedTypeName, new FileSystem(), failureStatus, tags, timeout);
 
         /// <summary>
         /// Configures health check for the MONAI Deploy Storage Service.
         /// </summary>
         /// <param name="builder">Instance of <see cref="IHealthChecksBuilder"/>.</param>
+        /// <param name="serviceCollection">Instance of <see cref="IServiceCollection"/>.</param>
         /// <param name="fullyQualifiedTypeName">Fully qualified type name of the service to use.</param>
         /// <param name="fileSystem">Instance of <see cref="IFileSystem"/>.</param>
         /// <returns>Instance of <see cref="IHealthChecksBuilder"/>.</returns>
         /// <exception cref="ConfigurationException"></exception>
         public static IHealthChecksBuilder AddMonaiDeployStorageHealthCheck(
             this IHealthChecksBuilder builder,
+            IServiceCollection serviceCollection,
             string fullyQualifiedTypeName,
             IFileSystem fileSystem,
             HealthStatus? failureStatus = null,
@@ -68,18 +72,25 @@ public static IHealthChecksBuilder AddMonaiDeployStorageHealthCheck(
             AppDomain.CurrentDomain.AssemblyResolve += resolveEventHandler;
 
             var storageServiceAssembly = IServiceCollectionExtensions.LoadAssemblyFromDisk(IServiceCollectionExtensions.GetAssemblyName(fullyQualifiedTypeName), fileSystem);
-            var serviceRegistrationType = storageServiceAssembly.GetTypes().FirstOrDefault(p => p.IsSubclassOf(typeof(HealthCheckRegistrationBase)));
+            var healthCheckBase = storageServiceAssembly.GetTypes().FirstOrDefault(p => p.IsSubclassOf(typeof(HealthCheckRegistrationBase)));
 
-            if (serviceRegistrationType is null || Activator.CreateInstance(serviceRegistrationType, fullyQualifiedTypeName) is not HealthCheckRegistrationBase healthCheckBuilder)
+            if (healthCheckBase is null || Activator.CreateInstance(healthCheckBase, fullyQualifiedTypeName) is not HealthCheckRegistrationBase healthCheckBuilder)
             {
                 throw new ConfigurationException($"Service registrar cannot be found for the configured plug-in '{fullyQualifiedTypeName}'.");
             }
+            var serviceRegistrationType = storageServiceAssembly.GetTypes().FirstOrDefault(p => p.IsSubclassOf(typeof(ServiceRegistrationBase)));
 
+            if (serviceRegistrationType is null || Activator.CreateInstance(serviceRegistrationType, fullyQualifiedTypeName) is not ServiceRegistrationBase serviceRegistrar)
+            {
+                throw new ConfigurationException($"Service registrar cannot be found for the configured plug-in '{fullyQualifiedTypeName}'.");
+            }
             if (!IServiceCollectionExtensions.IsSupportedType(fullyQualifiedTypeName, storageServiceAssembly))
             {
                 throw new ConfigurationException($"The configured type '{fullyQualifiedTypeName}' does not implement the {typeof(IStorageService).Name} interface.");
             }
 
+            serviceRegistrar.Configure(serviceCollection);
+
             healthCheckBuilder.Configure(builder, failureStatus, tags, timeout);
 
             AppDomain.CurrentDomain.AssemblyResolve -= resolveEventHandler;