Set up options and track changes in management SDK.

build/dependencies.props

@@ -46,6 +46,7 @@
     <MicrosoftConfigurationUserSecretVersion>2.2.0</MicrosoftConfigurationUserSecretVersion>
     <MicrosoftConfigurationEnvironmentVariablesVersion>2.2.0</MicrosoftConfigurationEnvironmentVariablesVersion>
     <MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>1.0.11</MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>2.1.0</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
 
     <!-- Signing -->
     <MicroBuildCorePackageVersion>0.3.0</MicroBuildCorePackageVersion>

src/Microsoft.Azure.SignalR.Common/Constants.cs

@@ -9,6 +9,7 @@ internal static class Constants
     {
         public static class Keys
         {
+            public const string ServiceManagerOptionsSectionKey = "Azure:SignalR";
             public const string ServerStickyModeDefaultKey = "Azure:SignalR:ServerStickyMode";
             public const string ConnectionStringDefaultKey = "Azure:SignalR:ConnectionString";
             public const string ApplicationNameDefaultKey = "Azure:SignalR:ApplicationName";

src/Microsoft.Azure.SignalR.Management/Configuration/CascadeOptionsSetup.cs

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.Azure.SignalR.Management.Configuration
+{
+    /// <summary>
+    /// Sets up TargetOptions from SourceOptions and tracks changes .
+    /// </summary>
+    internal abstract class CascadeOptionsSetup<SourceOptions, TargetOptions> : IConfigureOptions<TargetOptions>, IOptionsChangeTokenSource<TargetOptions>
+        where SourceOptions : class
+        where TargetOptions : class
+    {
+        private protected readonly IOptionsMonitor<SourceOptions> _monitor;
+        private readonly IOptionsChangeTokenSource<SourceOptions> _changeTokenSource;
+
+        //Making 'tokenSource' optional avoids error when 'tokenSource' is unavailable.
+        public CascadeOptionsSetup(IOptionsMonitor<SourceOptions> monitor, IOptionsChangeTokenSource<SourceOptions> changeTokenSource = null)
+        {
+            _monitor = monitor;
+            _changeTokenSource = changeTokenSource;
+        }
+
+        public string Name => Options.DefaultName;
+
+        public abstract void Configure(TargetOptions options);
+
+        public IChangeToken GetChangeToken()
+        {
+            return _changeTokenSource?.GetChangeToken() ?? NullChangeToken.Singleton;
+
+            //We can't return a ChangeToken as null.
+            //fixes in https://github.com/dotnet/runtime/pull/43306
+        }
+    }
+}

src/Microsoft.Azure.SignalR.Management/ServiceManagerContext.cs → src/Microsoft.Azure.SignalR.Management/Configuration/ServiceManagerContext.cs

@@ -18,16 +18,5 @@ internal class ServiceManagerContext
         public IWebProxy Proxy { get; set; }
 
         public ServiceTransportType ServiceTransportType { get; set; } = ServiceTransportType.Transient;
-
-        public void SetValueFromOptions(ServiceManagerOptions options)
-        {
-            ServiceEndpoints = options.ServiceEndpoints ?? (options.ServiceEndpoint != null
-                    ? (new ServiceEndpoint[] { options.ServiceEndpoint })
-                    : (new ServiceEndpoint[] { new ServiceEndpoint(options.ConnectionString) }));
-            ApplicationName = options.ApplicationName;
-            ConnectionCount = options.ConnectionCount;
-            Proxy = options.Proxy;
-            ServiceTransportType = options.ServiceTransportType;
-        }
     }
-}
+}

src/Microsoft.Azure.SignalR.Management/Configuration/ServiceManagerContextSetup.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Azure.SignalR.Management.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Azure.SignalR.Management
+{
+    internal class ServiceManagerContextSetup : CascadeOptionsSetup<ServiceManagerOptions, ServiceManagerContext>
+    {
+        public ServiceManagerContextSetup(IOptionsMonitor<ServiceManagerOptions> monitor, IOptionsChangeTokenSource<ServiceManagerOptions> changeTokenSource = null) : base(monitor, changeTokenSource)
+        {
+        }
+
+        public override void Configure(ServiceManagerContext options)
+        {
+            var serviceManagerOptions = _monitor.CurrentValue;
+            options.ServiceEndpoints = serviceManagerOptions.ServiceEndpoints ?? (serviceManagerOptions.ServiceEndpoint != null
+                    ? (new ServiceEndpoint[] { serviceManagerOptions.ServiceEndpoint })
+                    : (new ServiceEndpoint[] { new ServiceEndpoint(serviceManagerOptions.ConnectionString) }));
+            options.ApplicationName = serviceManagerOptions.ApplicationName;
+            options.ConnectionCount = serviceManagerOptions.ConnectionCount;
+            options.Proxy = serviceManagerOptions.Proxy;
+            options.ServiceTransportType = serviceManagerOptions.ServiceTransportType;
+        }
+    }
+}

src/Microsoft.Azure.SignalR.Management/Configuration/ServiceManagerOptionsSetup.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.Azure.SignalR.Management.Configuration
+{
+    internal class ServiceManagerOptionsSetup : IConfigureOptions<ServiceManagerOptions>, IOptionsChangeTokenSource<ServiceManagerOptions>
+    {
+        private readonly IConfiguration _configuration;
+
+        public ServiceManagerOptionsSetup(IConfiguration configuration = null)
+        {
+            _configuration = configuration;
+        }
+
+        public string Name => Options.DefaultName;
+
+        public void Configure(ServiceManagerOptions options)
+        {
+            if (_configuration != null)
+            {
+                _configuration.GetSection(Constants.Keys.ServiceManagerOptionsSectionKey).Bind(options);
+            }
+        }
+
+        public IChangeToken GetChangeToken()
+        {
+            return _configuration?.GetReloadToken() ?? NullChangeToken.Singleton;
+        }
+    }
+}

src/Microsoft.Azure.SignalR.Management/Configuration/ServiceOptionsSetup.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Azure.SignalR.Management.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Azure.SignalR.Management
+{
+    internal class ServiceOptionsSetup : CascadeOptionsSetup<ServiceManagerContext, ServiceOptions>
+    {
+        public ServiceOptionsSetup(IOptionsMonitor<ServiceManagerContext> monitor, IOptionsChangeTokenSource<ServiceManagerContext> changeTokenSource = null) : base(monitor, changeTokenSource)
+        {
+        }
+
+        public override void Configure(ServiceOptions options)
+        {
+            var context = _monitor.CurrentValue;
+            options.ApplicationName = context.ApplicationName;
+            options.Endpoints = context.ServiceEndpoints;
+            options.Proxy = context.Proxy;
+            options.ConnectionCount = context.ConnectionCount;
+        }
+    }
+}

src/Microsoft.Azure.SignalR.Management/DependencyInjectionExtensions.cs

@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+using System;
+using System.ComponentModel;
+using System.Reflection;
+using Microsoft.Azure.SignalR.Management.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Azure.SignalR.Management
+{
+    internal static class DependencyInjectionExtensions //TODO: not ready for public use
+    {
+        /// <summary>
+        /// Adds the essential SignalR Service Manager services to the specified services collection and configures <see cref="ServiceManagerOptions"/> with configuration instance registered in service collection.
+        /// </summary>
+        public static IServiceCollection AddSignalRServiceManager(this IServiceCollection services)
+        {
+            services.AddSingleton<ServiceManagerOptionsSetup>()
+                    .AddSingleton<IConfigureOptions<ServiceManagerOptions>>(sp => sp.GetService<ServiceManagerOptionsSetup>())
+                    .AddSingleton<IOptionsChangeTokenSource<ServiceManagerOptions>>(sp => sp.GetService<ServiceManagerOptionsSetup>());
+            return services.AddSignalRServiceManagerCore();
+        }
+
+        /// <summary>
+        /// Adds the essential SignalR Service Manager services to the specified services collection and registers an action used to configure <see cref="ServiceManagerOptions"/>
+        /// </summary>
+        public static IServiceCollection AddSignalRServiceManager(this IServiceCollection services, Action<ServiceManagerOptions> configure)
+        {
+            services.Configure(configure);
+            return services.AddSignalRServiceManager();
+        }
+
+        /// <summary>
+        /// Adds the minimum essential SignalR Service Manager services to the specified services collection.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        internal static IServiceCollection AddSignalRServiceManagerCore(this IServiceCollection services)
+        {
+            services.PostConfigure<ServiceManagerOptions>(o => o.ValidateOptions());
+            services.AddSingleton<ServiceManagerContextSetup>()
+                    .AddSingleton<IConfigureOptions<ServiceManagerContext>>(sp => sp.GetService<ServiceManagerContextSetup>())
+                    .AddSingleton<IOptionsChangeTokenSource<ServiceManagerContext>>(sp => sp.GetService<ServiceManagerContextSetup>());
+            services.AddSingleton<ServiceOptionsSetup>()
+                    .AddSingleton<IConfigureOptions<ServiceOptions>>(sp => sp.GetService<ServiceOptionsSetup>())
+                    .AddSingleton<IOptionsChangeTokenSource<ServiceOptions>>(sp => sp.GetService<ServiceOptionsSetup>());
+            return services.TrySetProductInfo();
+        }
+
+        /// <summary>
+        /// Adds product info to <see cref="ServiceManagerContext"/>
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IServiceCollection WithAssembly(this IServiceCollection services, Assembly assembly)
+        {
+            var productInfo = ProductInfo.GetProductInfo(assembly);
+            return services.Configure<ServiceManagerContext>(o => o.ProductInfo = productInfo);
+        }
+
+        private static IServiceCollection TrySetProductInfo(this IServiceCollection services)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var productInfo = ProductInfo.GetProductInfo(assembly);
+            return services.Configure<ServiceManagerContext>(o => o.ProductInfo = o.ProductInfo ?? productInfo);
+        }
+    }
+}

src/Microsoft.Azure.SignalR.Management/Microsoft.Azure.SignalR.Management.csproj

@@ -32,7 +32,8 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
-	<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionHttpVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionHttpVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="$(MicrosoftAspNetCoreSignalRPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsVersion)" />
   </ItemGroup>
 </Project>

src/Microsoft.Azure.SignalR.Management/ServiceManagerBuilder.cs

@@ -4,32 +4,47 @@
 using System;
 using System.ComponentModel;
 using System.Reflection;
-
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 namespace Microsoft.Azure.SignalR.Management
 {
     /// <summary>
     /// A builder for configuring <see cref="IServiceManager"/> instances.
     /// </summary>
-    public class ServiceManagerBuilder : IServiceManagerBuilder
+    public class ServiceManagerBuilder : IServiceManagerBuilder, IDisposable
     {
-        private readonly ServiceManagerOptions _options = new ServiceManagerOptions();
+        private readonly IServiceCollection _services = new ServiceCollection();
         private Assembly _assembly;
+        private ServiceProvider _serviceProvider;
 
         /// <summary>
-        /// Configures the <see cref="IServiceManager"/> instances.
+        /// Registers an action used to configure <see cref="IServiceManager"/>.
         /// </summary>
         /// <param name="configure">A callback to configure the <see cref="IServiceManager"/>.</param>
         /// <returns>The same instance of the <see cref="ServiceManagerBuilder"/> for chaining.</returns>
         public ServiceManagerBuilder WithOptions(Action<ServiceManagerOptions> configure)
         {
-            configure?.Invoke(_options);
+            _services.Configure(configure);
+            return this;
+        }
+
+        /// <summary>
+        /// Registers a configuration instance to configure <see cref="IServiceManager"/>
+        /// </summary>
+        /// <param name="config">The configuration instance.</param>
+        /// <returns>The same instance of the <see cref="ServiceManagerBuilder"/> for chaining.</returns>
+        internal ServiceManagerBuilder WithConfiguration(IConfiguration config)
+        {
+            _services.Configure<ServiceManagerOptions>(config.GetSection(Constants.Keys.ServiceManagerOptionsSectionKey));
             return this;
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
         public ServiceManagerBuilder WithCallingAssembly()
         {
             _assembly = Assembly.GetCallingAssembly();
+            _services.WithAssembly(_assembly);
             return this;
         }
 
@@ -39,16 +54,24 @@ public ServiceManagerBuilder WithCallingAssembly()
         /// <returns>The instance of the <see cref="IServiceManager"/>.</returns>
         public IServiceManager Build()
         {
-            _options.ValidateOptions();
-
+            _services.AddSignalRServiceManagerCore();
+            _serviceProvider = _services.BuildServiceProvider();
+            var context = _serviceProvider.GetRequiredService<IOptions<ServiceManagerContext>>().Value;
             var productInfo = ProductInfo.GetProductInfo(_assembly);
-            var context = new ServiceManagerContext()
-            {
-                ProductInfo = productInfo
-            };
-            context.SetValueFromOptions(_options);
             var restClientBuilder = new RestClientFactory(productInfo);
             return new ServiceManager(context, restClientBuilder);
         }
+
+        /// <summary>
+        /// Dispose unmanaged resources accociated with the builder and the instance built from it.
+        /// </summary>
+        public void Dispose()
+        {
+            _serviceProvider?.Dispose();
+            _serviceProvider = null;
+        }
+
+        //tests only
+        internal ServiceProvider GetServiceProvider() => _serviceProvider;
     }
 }