Create DefaultCosmosDBServiceFactory with AzureComponentFactory (#859)

Azure · Aug 29, 2023 · 5b7367e · 5b7367e
1 parent 75919fd
commit 5b7367e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/src/WebJobs.Extensions.CosmosDB/Trigger/CosmosDbScalerProvider.cs b/src/WebJobs.Extensions.CosmosDB/Trigger/CosmosDbScalerProvider.cs
@@ -6,6 +6,7 @@
 using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Host.Scale;
 using Microsoft.Extensions.Azure;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -31,11 +32,12 @@ public CosmosDbScalerProvider(IServiceProvider serviceProvider, TriggerMetadata
                 azureComponentFactory = serviceProvider.GetService<AzureComponentFactory>();
             }
 
+            IConfiguration config = serviceProvider.GetService<IConfiguration>();
             ILoggerFactory loggerFactory = serviceProvider.GetService<ILoggerFactory>();
             CosmosDbMetadata cosmosDbMetadata = JsonConvert.DeserializeObject<CosmosDbMetadata>(triggerMetadata.Metadata.ToString());
             cosmosDbMetadata.ResolveProperties(serviceProvider.GetService<INameResolver>());
             IOptions<CosmosClientOptions> options = serviceProvider.GetService<IOptions<CosmosClientOptions>>();
-            ICosmosDBServiceFactory serviceFactory = serviceProvider.GetService<ICosmosDBServiceFactory>();
+            ICosmosDBServiceFactory serviceFactory = new DefaultCosmosDBServiceFactory(config, azureComponentFactory);
             CosmosClient cosmosClient = serviceFactory.CreateService(cosmosDbMetadata.Connection, options.Value);
             var monitoredContainer = cosmosClient.GetContainer(cosmosDbMetadata.DatabaseName, cosmosDbMetadata.ContainerName);
             var leaseContainer = cosmosClient.GetContainer(string.IsNullOrEmpty(cosmosDbMetadata.LeaseDatabaseName) ? cosmosDbMetadata.DatabaseName : cosmosDbMetadata.LeaseDatabaseName, string.IsNullOrEmpty(cosmosDbMetadata.LeaseContainerName) ? CosmosDBTriggerConstants.DefaultLeaseCollectionName : cosmosDbMetadata.LeaseContainerName);

diff --git a/test/WebJobs.Extensions.CosmosDB.Tests/CosmosDBEndToEndTests.cs b/test/WebJobs.Extensions.CosmosDB.Tests/CosmosDBEndToEndTests.cs
@@ -117,7 +117,7 @@ public static async Task<CosmosClient> InitializeDocumentClientAsync(IConfigurat
             }
             catch (CosmosException cosmosException) when (cosmosException.StatusCode == System.Net.HttpStatusCode.NotFound)
             {
-                await database.CreateContainerAsync(CollectionName, "/id");
+                await database.CreateContainerAsync(collectionName, "/id");
             }
 
             return client;

diff --git a/test/WebJobs.Extensions.CosmosDB.Tests/ScaleHostEndToEndTests.cs b/test/WebJobs.Extensions.CosmosDB.Tests/ScaleHostEndToEndTests.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
 using Castle.Core.Configuration;
@@ -34,7 +35,7 @@ public class ScaleHostEndToEndTests
     {
         private const string FunctionName = "Function1";
         private const string DatabaseName = "E2EDb";
-        private const string CollectionName = "E2ECollection";
+        private const string CollectionName = "E2EScaleCollection";
         private const string Connection = "CosmosDbConnection";
         private readonly TestLoggerProvider _loggerProvider = new TestLoggerProvider();
 
@@ -132,6 +133,8 @@ public async Task ScaleHostEndToEndTest(bool tbsEnabled)
                     PartitionKey pk = new PartitionKey(item.Id);
                     await container.UpsertItemAsync<Item>(item, pk);
                 }
+
+                await StartProcessor(client);
             }
 
             IHost scaleHost = hostBuilder.Build();
@@ -180,5 +183,27 @@ await Host.TestCommon.TestHelpers.Await(async () =>
                 return scaledOut;
             }, pollingInterval: 2000, timeout: 180000, throwWhenDebugging: true);
         }
+
+        private async Task StartProcessor(CosmosClient cosmosClient)
+        {
+            var leaseContainer = cosmosClient.GetContainer(DatabaseName, "leases");
+            var monitoredContainer = cosmosClient.GetContainer(DatabaseName, CollectionName);
+
+            var builder = monitoredContainer.GetChangeFeedProcessorBuilder<Item>(string.Empty, HandleChangesAsync)
+                .WithInstanceName("MyInstance")
+                .WithLeaseContainer(leaseContainer)
+                .WithStartTime(DateTime.UtcNow)
+                .WithPollInterval(TimeSpan.FromSeconds(10));
+
+            var processor = builder.Build();
+            await processor.StartAsync();
+        }
+
+        private static async Task HandleChangesAsync(
+            ChangeFeedProcessorContext context,
+            IReadOnlyCollection<Item> changes,
+            CancellationToken cancellationToken)
+        {
+        }
     }
 }