Revert "[pack] Reacting to ScriptHost configuration changes for AzureStorageProvider (#7424)" (#7467)

karshinlin · web-flow · commit 05bed12574c7 · 2021-06-16T11:51:57.000-07:00
This reverts commit 80061a7.
diff --git a/src/WebJobs.Script/ScriptHostBuilderExtensions.cs b/src/WebJobs.Script/ScriptHostBuilderExtensions.cs
@@ -454,15 +454,10 @@ private static void AddProcessRegistry(IServiceCollection services)
         private static IDistributedLockManager GetBlobLockManager(IServiceProvider provider)
         {
             var azureStorageProvider = provider.GetRequiredService<IAzureStorageProvider>();
-            var configuration = provider.GetRequiredService<IConfiguration>();
             var loggerFactory = provider.GetRequiredService<ILoggerFactory>();
             try
             {
-                // BlobLeaseDistributedLockManager is created during ScriptHost service registration since it is
-                // conditioned on having a valid storage connection. The configuration should be from the IServiceProvider
-                // that registers the IDistributedLockManager.
-                // The configuration used by AzureStorageProvider will be updated through the IScriptHostManager.HostInitializing event handler
-                var container = azureStorageProvider.GetBlobContainerClient(configuration);
+                var container = azureStorageProvider.GetBlobContainerClient();
                 return new BlobLeaseDistributedLockManager(loggerFactory, azureStorageProvider);
             }
             catch (InvalidOperationException)
diff --git a/src/WebJobs.Script/StorageProvider/AzureStorageProvider.cs b/src/WebJobs.Script/StorageProvider/AzureStorageProvider.cs
@@ -5,7 +5,6 @@
 using Azure.Storage.Blobs;
 using Microsoft.Azure.WebJobs.Script.StorageProvider;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -19,23 +18,16 @@ namespace Microsoft.Azure.WebJobs.Script
     internal class AzureStorageProvider : IAzureStorageProvider
     {
         private readonly BlobServiceClientProvider _blobServiceClientProvider;
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IConfiguration _configuration;
+        private readonly ILogger _logger;
         private IOptionsMonitor<JobHostInternalStorageOptions> _storageOptions;
-        private IConfiguration _configuration;
 
-        public AzureStorageProvider(IScriptHostManager scriptHostManager, IConfiguration configuration, BlobServiceClientProvider blobServiceClientProvider, IOptionsMonitor<JobHostInternalStorageOptions> options)
+        public AzureStorageProvider(IConfiguration configuration, BlobServiceClientProvider blobServiceClientProvider, IOptionsMonitor<JobHostInternalStorageOptions> options, ILogger<AzureStorageProvider> logger)
         {
             _blobServiceClientProvider = blobServiceClientProvider;
             _configuration = configuration;
-            _serviceProvider = scriptHostManager as IServiceProvider;
             _storageOptions = options;
-
-            // Every time script host is re-intializing, we also need to re-initialize
-            // services that change with the scope of the script host.
-            scriptHostManager.HostInitializing += (s, e) =>
-            {
-                InitializeServices();
-            };
+            _logger = logger;
         }
 
         /// <summary>
@@ -57,30 +49,25 @@ public virtual bool TryGetBlobServiceClientFromConnectionString(out BlobServiceC
         /// <param name="client">client to instantiate</param>
         /// <param name="connection">Name of the connection to use</param>
         /// <returns>successful client creation</returns>
-        public virtual bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection = null, IConfiguration configurationOverride = null)
+        public virtual bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection = null)
         {
             var connectionToUse = connection ?? ConnectionStringNames.Storage;
-            return _blobServiceClientProvider.TryGet(connectionToUse, configurationOverride ?? _configuration, out client);
+            return _blobServiceClientProvider.TryGet(connectionToUse, out client);
         }
 
-        public virtual BlobContainerClient GetBlobContainerClient(IConfiguration configurationOverride = null)
+        public virtual BlobContainerClient GetBlobContainerClient()
         {
             if (_storageOptions?.CurrentValue.InternalSasBlobContainer != null)
             {
                 return new BlobContainerClient(new Uri(_storageOptions.CurrentValue.InternalSasBlobContainer));
             }
 
-            if (!TryGetBlobServiceClientFromConnection(out BlobServiceClient blobServiceClient, ConnectionStringNames.Storage, configurationOverride))
+            if (!TryGetBlobServiceClientFromConnection(out BlobServiceClient blobServiceClient, ConnectionStringNames.Storage))
             {
                 throw new InvalidOperationException($"Could not create BlobServiceClient to obtain the BlobContainerClient using Connection: {ConnectionStringNames.Storage}");
             }
 
             return blobServiceClient.GetBlobContainerClient(ScriptConstants.AzureWebJobsHostsContainerName);
         }
-
-        private void InitializeServices()
-        {
-            _configuration = _serviceProvider.GetService<IConfiguration>();
-        }
     }
 }
diff --git a/src/WebJobs.Script/StorageProvider/BlobServiceClientProvider.cs b/src/WebJobs.Script/StorageProvider/BlobServiceClientProvider.cs
@@ -16,8 +16,8 @@ namespace Microsoft.Azure.WebJobs.Script.StorageProvider
     /// </summary>
     internal class BlobServiceClientProvider : StorageClientProvider<BlobServiceClient, BlobClientOptions>
     {
-        public BlobServiceClientProvider(AzureComponentFactory componentFactory, AzureEventSourceLogForwarder logForwarder, ILogger<BlobServiceClient> logger)
-            : base(componentFactory, logForwarder, logger) { }
+        public BlobServiceClientProvider(IConfiguration configuration, AzureComponentFactory componentFactory, AzureEventSourceLogForwarder logForwarder, ILogger<BlobServiceClient> logger)
+            : base(configuration, componentFactory, logForwarder, logger) { }
 
         /// <inheritdoc/>
         protected override string ServiceUriSubDomain
diff --git a/src/WebJobs.Script/StorageProvider/IAzureStorageProvider.cs b/src/WebJobs.Script/StorageProvider/IAzureStorageProvider.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using Azure.Storage.Blobs;
-using Microsoft.Extensions.Configuration;
 
 namespace Microsoft.Azure.WebJobs.Script
 {
@@ -14,8 +13,8 @@ public interface IAzureStorageProvider
     {
         bool TryGetBlobServiceClientFromConnectionString(out BlobServiceClient client, string connectionString);
 
-        bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection, IConfiguration configurationOverride = null);
+        bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection);
 
-        BlobContainerClient GetBlobContainerClient(IConfiguration configurationOverride = null);
+        BlobContainerClient GetBlobContainerClient();
     }
 }
diff --git a/src/WebJobs.Script/StorageProvider/StorageClientProvider.cs b/src/WebJobs.Script/StorageProvider/StorageClientProvider.cs
@@ -21,6 +21,7 @@ namespace Microsoft.Azure.WebJobs.Script.StorageProvider
     /// </summary>
     internal abstract class StorageClientProvider<TClient, TClientOptions> where TClientOptions : ClientOptions
     {
+        private readonly IConfiguration _configuration;
         private readonly AzureComponentFactory _componentFactory;
         private readonly AzureEventSourceLogForwarder _logForwarder;
         private readonly ILogger _logger;
@@ -31,8 +32,9 @@ internal abstract class StorageClientProvider<TClient, TClientOptions> where TCl
         /// <param name="configuration">The configuration to use when creating Client-specific objects. <see cref="IConfiguration"/></param>
         /// <param name="componentFactory">The Azure factory responsible for creating clients. <see cref="AzureComponentFactory"/></param>
         /// <param name="logForwarder">Log forwarder that forwards events to ILogger. <see cref="AzureEventSourceLogForwarder"/></param>
-        public StorageClientProvider(AzureComponentFactory componentFactory, AzureEventSourceLogForwarder logForwarder, ILogger<TClient> logger)
+        public StorageClientProvider(IConfiguration configuration, AzureComponentFactory componentFactory, AzureEventSourceLogForwarder logForwarder, ILogger<TClient> logger)
         {
+            _configuration = configuration;
             _componentFactory = componentFactory;
             _logForwarder = logForwarder;
             _logger = logger;
@@ -51,14 +53,13 @@ public StorageClientProvider(AzureComponentFactory componentFactory, AzureEventS
         /// Gets the storage client specified by <paramref name="name"/>
         /// </summary>
         /// <param name="name">Name of the connection to use</param>
-        /// <param name="configuration">Configuration to use</param>
         /// <param name="client">Client that was created if the connection was valid; otherwise, the default value for the type of <paramref name="client"/>.</param>
         /// <returns>true if the client could be created; false otherwise</returns>
-        public virtual bool TryGet(string name, IConfiguration configuration, out TClient client)
+        public virtual bool TryGet(string name, out TClient client)
         {
             try
             {
-                client = Get(name, configuration);
+                client = Get(name);
                 return true;
             }
             catch (Exception ex)
@@ -95,29 +96,27 @@ public virtual bool TryGetFromConnectionString(string connectionString, out TCli
         /// </summary>
         /// <param name="name">Name of the connection to use</param>
         /// <param name="resolver">A resolver to interpret the provided connection <paramref name="name"/>.</param>
-        /// <param name="configuration">Configuration to use</param>
         /// <returns>Client that was created.</returns>
-        public virtual TClient Get(string name, INameResolver resolver, IConfiguration configuration)
+        public virtual TClient Get(string name, INameResolver resolver)
         {
             var resolvedName = resolver.ResolveWholeString(name);
-            return this.Get(resolvedName, configuration);
+            return this.Get(resolvedName);
         }
 
         /// <summary>
         /// Gets the storage client specified by <paramref name="name"/>
         /// </summary>
         /// <param name="name">Name of the connection to use</param>
-        /// <param name="configuration">Configuration to use</param>
         /// <returns>Client that was created.</returns>
-        public virtual TClient Get(string name, IConfiguration configuration)
+        public virtual TClient Get(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
             {
                 name = ConnectionStringNames.Storage; // default
             }
 
             // $$$ Where does validation happen?
-            IConfigurationSection connectionSection = configuration.GetWebJobsConnectionStringSection(name);
+            IConfigurationSection connectionSection = _configuration.GetWebJobsConnectionStringSection(name);
             if (!connectionSection.Exists())
             {
                 // Not found
@@ -149,7 +148,7 @@ protected virtual TClient CreateClient(IConfiguration configuration, TokenCreden
         /// <returns>Storage client</returns>
         public virtual TClient GetHost()
         {
-            return this.Get(null, null);
+            return this.Get(null);
         }
 
         /// <summary>
diff --git a/test/WebJobs.Script.Tests.Integration/Host/SingletonTests/SingletonEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/Host/SingletonTests/SingletonEndToEndTests.cs
@@ -25,7 +25,6 @@
 using Newtonsoft.Json.Linq;
 using Xunit;
 using Microsoft.Azure.WebJobs.Host;
-using Microsoft.WebJobs.Script.Tests;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.Host.SingletonTests
 {
@@ -656,7 +655,6 @@ private IHost CreateTestJobHost<TProg>(int hostId, Action<IHostBuilder> extraCon
                     });
 
                     services.AddSingleton<IDistributedLockManager, BlobLeaseDistributedLockManager>();
-                    TestHostBuilderExtensions.AddMockedSingleton<IScriptHostManager>(services);
                     services.AddAzureStorageProvider();
                 });
 
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/FunctionGeneratorEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/FunctionGeneratorEndToEndTests.cs
@@ -11,7 +11,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.WebJobs.Script.Tests;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
@@ -70,7 +69,7 @@ public async Task Generate_EndToEnd()
                 {
                     s.AddSingleton<ITypeLocator>(new TestTypeLocator(functionType));
                     s.AddSingleton<ILoggerFactory>(new LoggerFactory());
-                    TestHostBuilderExtensions.AddMockedSingleton<IScriptHostManager>(s);
+
                     s.AddAzureStorageProvider();
                 });
 
diff --git a/test/WebJobs.Script.Tests.Integration/Storage/BlobStorageProviderTests.cs b/test/WebJobs.Script.Tests.Integration/Storage/BlobStorageProviderTests.cs
@@ -36,14 +36,14 @@ public BlobStorageProviderTests()
         [Fact]
         public async Task TestBlobStorageProvider_TryConnectionName()
         {
-            Assert.True(_blobServiceClientProvider.TryGet(StorageConnection, _configuration, out BlobServiceClient client));
+            Assert.True(_blobServiceClientProvider.TryGet(StorageConnection, out BlobServiceClient client));
             await VerifyServiceAvailable(client);
         }
 
         [Fact]
         public async Task TestBlobStorageProvider_ConnectionName()
         {
-            BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection, _configuration);
+            BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection);
             await VerifyServiceAvailable(client);
         }
 
@@ -52,7 +52,7 @@ public async Task TestBlobStorageProvider_ConnectionNameWithResolver()
         {
             var resolver = new DefaultNameResolver(_configuration);
 
-            BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection, resolver, _configuration);
+            BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection, resolver);
             await VerifyServiceAvailable(client);
         }
 
diff --git a/test/WebJobs.Script.Tests.Shared/TestHelpers.cs b/test/WebJobs.Script.Tests.Shared/TestHelpers.cs
@@ -20,7 +20,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using Microsoft.WebJobs.Script.Tests;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
 {
@@ -408,7 +407,6 @@ public static IAzureStorageProvider GetAzureStorageProvider(IConfiguration confi
                 {
                     // Override configuration
                     services.AddSingleton(configuration);
-                    TestHostBuilderExtensions.AddMockedSingleton<IScriptHostManager>(services);
                     services.AddAzureStorageProvider();
                     if (storageOptions != null)
                     {

Original file line number	Diff line number	Diff line change
`@@ -454,15 +454,10 @@ private static void AddProcessRegistry(IServiceCollection services)`
`454`	`454`	`private static IDistributedLockManager GetBlobLockManager(IServiceProvider provider)`
`455`	`455`	`{`
`456`	`456`	`var azureStorageProvider = provider.GetRequiredService<IAzureStorageProvider>();`
`457`		`- var configuration = provider.GetRequiredService<IConfiguration>();`
`458`	`457`	`var loggerFactory = provider.GetRequiredService<ILoggerFactory>();`
`459`	`458`	`try`
`460`	`459`	`{`
`461`		`- // BlobLeaseDistributedLockManager is created during ScriptHost service registration since it is`
`462`		`- // conditioned on having a valid storage connection. The configuration should be from the IServiceProvider`
`463`		`- // that registers the IDistributedLockManager.`
`464`		`- // The configuration used by AzureStorageProvider will be updated through the IScriptHostManager.HostInitializing event handler`
`465`		`- var container = azureStorageProvider.GetBlobContainerClient(configuration);`
	`460`	`+ var container = azureStorageProvider.GetBlobContainerClient();`
`466`	`461`	`return new BlobLeaseDistributedLockManager(loggerFactory, azureStorageProvider);`
`467`	`462`	`}`
`468`	`463`	`catch (InvalidOperationException)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using Azure.Storage.Blobs;`
`6`	`6`	`using Microsoft.Azure.WebJobs.Script.StorageProvider;`
`7`	`7`	`using Microsoft.Extensions.Configuration;`
`8`		`-using Microsoft.Extensions.DependencyInjection;`
`9`	`8`	`using Microsoft.Extensions.Logging;`
`10`	`9`	`using Microsoft.Extensions.Options;`
`11`	`10`
`@@ -19,23 +18,16 @@ namespace Microsoft.Azure.WebJobs.Script`
`19`	`18`	`internal class AzureStorageProvider : IAzureStorageProvider`
`20`	`19`	`{`
`21`	`20`	`private readonly BlobServiceClientProvider _blobServiceClientProvider;`
`22`		`- private readonly IServiceProvider _serviceProvider;`
	`21`	`+ private readonly IConfiguration _configuration;`
	`22`	`+ private readonly ILogger _logger;`
`23`	`23`	`private IOptionsMonitor<JobHostInternalStorageOptions> _storageOptions;`
`24`		`- private IConfiguration _configuration;`
`25`	`24`
`26`		`- public AzureStorageProvider(IScriptHostManager scriptHostManager, IConfiguration configuration, BlobServiceClientProvider blobServiceClientProvider, IOptionsMonitor<JobHostInternalStorageOptions> options)`
	`25`	`+ public AzureStorageProvider(IConfiguration configuration, BlobServiceClientProvider blobServiceClientProvider, IOptionsMonitor<JobHostInternalStorageOptions> options, ILogger<AzureStorageProvider> logger)`
`27`	`26`	`{`
`28`	`27`	`_blobServiceClientProvider = blobServiceClientProvider;`
`29`	`28`	`_configuration = configuration;`
`30`		`- _serviceProvider = scriptHostManager as IServiceProvider;`
`31`	`29`	`_storageOptions = options;`
`32`		`-`
`33`		`- // Every time script host is re-intializing, we also need to re-initialize`
`34`		`- // services that change with the scope of the script host.`
`35`		`- scriptHostManager.HostInitializing += (s, e) =>`
`36`		`- {`
`37`		`- InitializeServices();`
`38`		`- };`
	`30`	`+ _logger = logger;`
`39`	`31`	`}`
`40`	`32`
`41`	`33`	`/// <summary>`
`@@ -57,30 +49,25 @@ public virtual bool TryGetBlobServiceClientFromConnectionString(out BlobServiceC`
`57`	`49`	`/// <param name="client">client to instantiate</param>`
`58`	`50`	`/// <param name="connection">Name of the connection to use</param>`
`59`	`51`	`/// <returns>successful client creation</returns>`
`60`		`- public virtual bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection = null, IConfiguration configurationOverride = null)`
	`52`	`+ public virtual bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection = null)`
`61`	`53`	`{`
`62`	`54`	`var connectionToUse = connection ?? ConnectionStringNames.Storage;`
`63`		`- return _blobServiceClientProvider.TryGet(connectionToUse, configurationOverride ?? _configuration, out client);`
	`55`	`+ return _blobServiceClientProvider.TryGet(connectionToUse, out client);`
`64`	`56`	`}`
`65`	`57`
`66`		`- public virtual BlobContainerClient GetBlobContainerClient(IConfiguration configurationOverride = null)`
	`58`	`+ public virtual BlobContainerClient GetBlobContainerClient()`
`67`	`59`	`{`
`68`	`60`	`if (_storageOptions?.CurrentValue.InternalSasBlobContainer != null)`
`69`	`61`	`{`
`70`	`62`	`return new BlobContainerClient(new Uri(_storageOptions.CurrentValue.InternalSasBlobContainer));`
`71`	`63`	`}`
`72`	`64`
`73`		`- if (!TryGetBlobServiceClientFromConnection(out BlobServiceClient blobServiceClient, ConnectionStringNames.Storage, configurationOverride))`
	`65`	`+ if (!TryGetBlobServiceClientFromConnection(out BlobServiceClient blobServiceClient, ConnectionStringNames.Storage))`
`74`	`66`	`{`
`75`	`67`	`throw new InvalidOperationException($"Could not create BlobServiceClient to obtain the BlobContainerClient using Connection: {ConnectionStringNames.Storage}");`
`76`	`68`	`}`
`77`	`69`
`78`	`70`	`return blobServiceClient.GetBlobContainerClient(ScriptConstants.AzureWebJobsHostsContainerName);`
`79`	`71`	`}`
`80`		`-`
`81`		`- private void InitializeServices()`
`82`		`- {`
`83`		`- _configuration = _serviceProvider.GetService<IConfiguration>();`
`84`		`- }`
`85`	`72`	`}`
`86`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using Azure.Storage.Blobs;`
`5`		`-using Microsoft.Extensions.Configuration;`
`6`	`5`
`7`	`6`	`namespace Microsoft.Azure.WebJobs.Script`
`8`	`7`	`{`
`@@ -14,8 +13,8 @@ public interface IAzureStorageProvider`
`14`	`13`	`{`
`15`	`14`	`bool TryGetBlobServiceClientFromConnectionString(out BlobServiceClient client, string connectionString);`
`16`	`15`
`17`		`- bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection, IConfiguration configurationOverride = null);`
	`16`	`+ bool TryGetBlobServiceClientFromConnection(out BlobServiceClient client, string connection);`
`18`	`17`
`19`		`- BlobContainerClient GetBlobContainerClient(IConfiguration configurationOverride = null);`
	`18`	`+ BlobContainerClient GetBlobContainerClient();`
`20`	`19`	`}`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,14 @@ public BlobStorageProviderTests()`
`36`	`36`	`[Fact]`
`37`	`37`	`public async Task TestBlobStorageProvider_TryConnectionName()`
`38`	`38`	`{`
`39`		`- Assert.True(_blobServiceClientProvider.TryGet(StorageConnection, _configuration, out BlobServiceClient client));`
	`39`	`+ Assert.True(_blobServiceClientProvider.TryGet(StorageConnection, out BlobServiceClient client));`
`40`	`40`	`await VerifyServiceAvailable(client);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`[Fact]`
`44`	`44`	`public async Task TestBlobStorageProvider_ConnectionName()`
`45`	`45`	`{`
`46`		`- BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection, _configuration);`
	`46`	`+ BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection);`
`47`	`47`	`await VerifyServiceAvailable(client);`
`48`	`48`	`}`
`49`	`49`
`@@ -52,7 +52,7 @@ public async Task TestBlobStorageProvider_ConnectionNameWithResolver()`
`52`	`52`	`{`
`53`	`53`	`var resolver = new DefaultNameResolver(_configuration);`
`54`	`54`
`55`		`- BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection, resolver, _configuration);`
	`55`	`+ BlobServiceClient client = _blobServiceClientProvider.Get(StorageConnection, resolver);`
`56`	`56`	`await VerifyServiceAvailable(client);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`using Microsoft.Extensions.DependencyInjection;`
`21`	`21`	`using Microsoft.Extensions.Hosting;`
`22`	`22`	`using Microsoft.Extensions.Options;`
`23`		`-using Microsoft.WebJobs.Script.Tests;`
`24`	`23`
`25`	`24`	`namespace Microsoft.Azure.WebJobs.Script.Tests`
`26`	`25`	`{`
`@@ -408,7 +407,6 @@ public static IAzureStorageProvider GetAzureStorageProvider(IConfiguration confi`
`408`	`407`	`{`
`409`	`408`	`// Override configuration`
`410`	`409`	`services.AddSingleton(configuration);`
`411`		`- TestHostBuilderExtensions.AddMockedSingleton<IScriptHostManager>(services);`
`412`	`410`	`services.AddAzureStorageProvider();`
`413`	`411`	`if (storageOptions != null)`
`414`	`412`	`{`