Configuration changes for the CosmosStoreTrigger attribute

Elfocrash · Nov 30, 2018 · d72b89a · d72b89a
1 parent 8ae4879
commit d72b89a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 25 deletions.
diff --git a/samples/Cosmonaut.AzureFunction/CosmosStoreTriggerFunction.cs b/samples/Cosmonaut.AzureFunction/CosmosStoreTriggerFunction.cs
@@ -12,8 +12,7 @@ public static class CosmosStoreTriggerFunction
         public static void Run(
             [CosmosStoreTrigger(
                 "localtest",
-                ServiceEndpoint = "CosmosEndpoint",
-                AuthKey = "CosmosAuthKey",
+                ConnectionStringSetting = "CosmosConnectionString",
                 LeaseConnectionStringSetting = "LeaseSettings",
                 LeaseCollectionName = "leases",
                 CreateLeaseCollectionIfNotExists = true)]IReadOnlyList<Llama> llamaInput,

diff --git a/samples/Cosmonaut.AzureFunction/local.settings.json b/samples/Cosmonaut.AzureFunction/local.settings.json
@@ -1,10 +1,9 @@
 {
-    "IsEncrypted": false,
+  "IsEncrypted": false,
   "Values": {
     "AzureWebJobsStorage": "UseDevelopmentStorage=true",
     "FUNCTIONS_WORKER_RUNTIME": "dotnet",
-    "CosmosEndpoint": "https://localhost:8081",
-    "CosmosAuthKey": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+    "CosmosConnectionString": "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
     "LeaseSettings": "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
   }
 }
diff --git a/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttribute.cs b/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttribute.cs
@@ -37,11 +37,8 @@ public CosmosStoreTriggerAttribute(string databaseName, string overridenCollecti
         /// Connection string for the service containing the collection to monitor
         /// </summary>
         [AppSetting]
-        public string ServiceEndpoint { get; set; }
-
-        [AppSetting]
-        public string AuthKey { get; set; }
-
+        public string ConnectionStringSetting { get; set; }
+
         /// <summary>
         /// Name of the collection to monitor for changes
         /// </summary>

diff --git a/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttributeBindingProvider.cs b/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttributeBindingProvider.cs
@@ -28,7 +28,7 @@ internal class CosmosStoreTriggerAttributeBindingProvider<T> : ITriggerBindingPr
             _configuration = configuration;
             _nameResolver = nameResolver;
             _bindingOptions = bindingOptions;
-            _logger = loggerFactory.CreateLogger(LogCategories.CreateTriggerCategory("CosmosDB"));
+            _logger = loggerFactory.CreateLogger(LogCategories.CreateTriggerCategory("CosmosStore"));
         }
 
         public async Task<ITriggerBinding> TryCreateAsync(TriggerBindingProviderContext context)
@@ -61,11 +61,14 @@ public async Task<ITriggerBinding> TryCreateAsync(TriggerBindingProviderContext
 
             try
             {
-                if (attribute.ServiceEndpoint == null)
+                var monitoredConnectionString = ResolveConnectionString(attribute.ConnectionStringSetting, nameof(CosmosStoreTriggerAttribute.ConnectionStringSetting));
+                if (string.IsNullOrEmpty(monitoredConnectionString))
                 {
                     throw new InvalidOperationException("The connection string for the monitored collection is in an invalid format, please use AccountEndpoint=XXXXXX;AccountKey=XXXXXX;.");
                 }
 
+                var monitoredCosmosDbConnectionString = new CosmosDBConnectionString(monitoredConnectionString);
+
                 var leasesConnectionString = ResolveAttributeLeasesConnectionString(attribute);
                 var leasesConnection = new CosmosDBConnectionString(leasesConnectionString);
                 if (leasesConnection.ServiceEndpoint == null)
@@ -77,14 +80,13 @@ public async Task<ITriggerBinding> TryCreateAsync(TriggerBindingProviderContext
 
                 documentCollectionLocation = new DocumentCollectionInfo
                 {
-                    Uri = new Uri(_configuration.GetConnectionStringOrSetting(attribute.ServiceEndpoint)),
-                    MasterKey = _configuration.GetConnectionStringOrSetting(attribute.AuthKey),
+                    Uri = monitoredCosmosDbConnectionString.ServiceEndpoint,
+                    MasterKey = monitoredCosmosDbConnectionString.AuthKey,
                     DatabaseName = ResolveAttributeValue(attribute.DatabaseName),
-                    CollectionName = monitoredCollectionName
+                    CollectionName = monitoredCollectionName,
+                    ConnectionPolicy = {UserAgentSuffix = CosmosStoreTriggerUserAgentSuffix}
                 };
 
-                documentCollectionLocation.ConnectionPolicy.UserAgentSuffix = CosmosStoreTriggerUserAgentSuffix;
-
                 if (desiredConnectionMode.HasValue)
                 {
                     documentCollectionLocation.ConnectionPolicy.ConnectionMode = desiredConnectionMode.Value;
@@ -185,13 +187,10 @@ internal static TimeSpan ResolveTimeSpanFromMilliseconds(string nameOfProperty,
         private string ResolveAttributeLeasesConnectionString(CosmosStoreTriggerAttribute attribute)
         {
             // If the lease connection string is not set, use the trigger's
-            var keyToResolve = attribute.LeaseConnectionStringSetting;
-            if (string.IsNullOrEmpty(keyToResolve))
-            {
-                keyToResolve = $"AccountEndpoint={attribute.ServiceEndpoint};AccountKey={attribute.AuthKey}";
-            }
 
-            var connectionString = ResolveConnectionString(keyToResolve, nameof(CosmosStoreTriggerAttribute.LeaseConnectionStringSetting));
+            var connectionString = !string.IsNullOrEmpty(attribute.LeaseConnectionStringSetting) ? 
+                ResolveConnectionString(attribute.LeaseConnectionStringSetting, nameof(CosmosStoreTriggerAttribute.LeaseConnectionStringSetting)) :
+                ResolveConnectionString(attribute.ConnectionStringSetting, nameof(CosmosStoreTriggerAttribute.ConnectionStringSetting));
 
             if (string.IsNullOrEmpty(connectionString))
             {
@@ -211,7 +210,7 @@ private void ThrowMissingConnectionStringExceptionForLease()
             var leaseString = "lease ";
 
             throw new InvalidOperationException(
-                $"The CosmosDBTrigger {leaseString}connection string must be set either via a '{Constants.DefaultConnectionStringName}' configuration connection string, via the {attributeProperty} property or via {optionsProperty}.");
+                $"The CosmosStoreTrigger {leaseString}connection string must be set either via a '{Constants.DefaultConnectionStringName}' configuration connection string, via the {attributeProperty} property or via {optionsProperty}.");
         }
 
         internal string ResolveConnectionString(string unresolvedConnectionString, string propertyName)

diff --git a/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerConstants.cs b/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerConstants.cs
@@ -4,7 +4,7 @@ internal static class CosmosStoreTriggerConstants
     {
         public const string DefaultLeaseCollectionName = "leases";
 
-        public const string TriggerName = "CosmosDBTrigger";
+        public const string TriggerName = "CosmosStoreTrigger";
 
         public const string TriggerDescription = "New changes on collection {0} at {1}";