Merge branch 'master' into add-dockerfile-to-demoactor-example

dapr · Jun 25, 2024 · 8a01f03 · 8a01f03
2 parents d9d1c58 + 512c9ea
commit 8a01f03
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 12 deletions.
diff --git a/.github/workflows/itests.yml b/.github/workflows/itests.yml
@@ -43,8 +43,8 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       DAPR_CLI_VER: 1.13.0
-      DAPR_RUNTIME_VER: 1.13.0
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.13/install/install.sh
+      DAPR_RUNTIME_VER: 1.13.2
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.12/install/install.sh
       DAPR_CLI_REF: ''
     steps:
       - name: Set up Dapr CLI

diff --git a/src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs b/src/Dapr.AspNetCore/DaprServiceCollectionExtensions.cs
@@ -31,18 +31,32 @@ public static class DaprServiceCollectionExtensions
         /// <param name="configure"></param>
         public static void AddDaprClient(this IServiceCollection services, Action<DaprClientBuilder> configure = null)
         {
-            if (services is null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
+            ArgumentNullException.ThrowIfNull(services, nameof(services));
 
             services.TryAddSingleton(_ =>
             {
                 var builder = new DaprClientBuilder();
-                if (configure != null)
-                {
-                    configure.Invoke(builder);
-                }
+                configure?.Invoke(builder);
+
+                return builder.Build();
+            });
+        }
+
+        /// <summary>
+        /// Adds Dapr client services to the provided <see cref="IServiceCollection"/>. This does not include integration
+        /// with ASP.NET Core MVC. Use the <c>AddDapr()</c> extension method on <c>IMvcBuilder</c> to register MVC integration. 
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+        /// <param name="configure"></param>
+        public static void AddDaprClient(this IServiceCollection services,
+            Action<IServiceProvider, DaprClientBuilder> configure)
+        {
+            ArgumentNullException.ThrowIfNull(services, nameof(services));
+
+            services.TryAddSingleton(serviceProvider =>
+            {
+                var builder = new DaprClientBuilder();
+                configure?.Invoke(serviceProvider, builder);
 
                 return builder.Build();
             });

diff --git a/src/Dapr.Extensions.Configuration/DaprSecretStoreConfigurationProvider.cs b/src/Dapr.Extensions.Configuration/DaprSecretStoreConfigurationProvider.cs
@@ -227,8 +227,15 @@ private async Task LoadAsync()
                                 $"A duplicate key '{key}' was found in the secret store '{store}'. Please remove any duplicates from your secret store.");
                         }
 
-                        data.Add(normalizeKey ? NormalizeKey(secretDescriptor.SecretName) : secretDescriptor.SecretName,
-                            result[key]);
+                        // The name of the key "as desired" by the user based on the descriptor.
+                        //
+                        // NOTE: This should vary only if a single secret of the same name is returned.
+                        string desiredKey = StringComparer.Ordinal.Equals(key, secretDescriptor.SecretKey) ? secretDescriptor.SecretName : key;
+
+                        // The name of the key normalized based on the configured delimiters.
+                        string normalizedKey = normalizeKey ? NormalizeKey(desiredKey) : desiredKey;
+
+                        data.Add(normalizedKey, result[key]);
                     }
                 }
 

diff --git a/test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs b/test/Dapr.AspNetCore.Test/DaprServiceCollectionExtensionsTest.cs
@@ -48,6 +48,31 @@ public void AddDaprClient_RegistersDaprClientOnlyOnce()
             Assert.True(daprClient.JsonSerializerOptions.PropertyNameCaseInsensitive);
         }
 
+        [Fact]
+        public void AddDaprClient_RegistersUsingDependencyFromIServiceProvider()
+        {
+
+            var services = new ServiceCollection();
+            services.AddSingleton<TestConfigurationProvider>();
+            services.AddDaprClient((provider, builder) =>
+            {
+                var configProvider = provider.GetRequiredService<TestConfigurationProvider>();
+                var caseSensitivity = configProvider.GetCaseSensitivity();
+
+                builder.UseJsonSerializationOptions(new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = caseSensitivity
+                });
+            });
+
+            var serviceProvider = services.BuildServiceProvider();
+
+            DaprClientGrpc client = serviceProvider.GetRequiredService<DaprClient>() as DaprClientGrpc;
+
+            //Registers with case-insensitive as true by default, but we set as false above
+            Assert.False(client.JsonSerializerOptions.PropertyNameCaseInsensitive);
+        }
+
 #if NET8_0_OR_GREATER
         [Fact]
         public void AddDaprClient_WithKeyedServices()
@@ -65,5 +90,10 @@ public void AddDaprClient_WithKeyedServices()
             Assert.NotNull(daprClient);
         }
 #endif
+
+        private class TestConfigurationProvider
+        {
+            public bool GetCaseSensitivity() => false;
+        }
     }
 }
diff --git a/test/Dapr.Extensions.Configuration.Test/DaprSecretStoreConfigurationProviderTest.cs b/test/Dapr.Extensions.Configuration.Test/DaprSecretStoreConfigurationProviderTest.cs
@@ -198,6 +198,35 @@ public void LoadSecrets_FromSecretStoreThatCanReturnsMultipleValues()
             config[secondSecretKey].Should().Be(secondSecretValue);
         }
 
+        [Fact]
+        public void LoadSecrets_FromSecretStoreThatCanReturnsMultivaluedValues()
+        {
+            var storeName = "store";
+            var parentSecretKey = "connectionStrings";
+            var firstSecretKey = "first_secret";
+            var secondSecretKey = "second_secret";
+            var firstSecretValue = "secret1";
+            var secondSecretValue = "secret2";
+
+            var secretDescriptors = new[]
+            {
+                new DaprSecretDescriptor(parentSecretKey)
+            };
+
+            var daprClient = new Mock<DaprClient>();
+
+            daprClient.Setup(c => c.GetSecretAsync(storeName, parentSecretKey,
+                    It.IsAny<Dictionary<string, string>>(), default))
+                .ReturnsAsync(new Dictionary<string, string> { { firstSecretKey, firstSecretValue }, { secondSecretKey, secondSecretValue } });
+
+            var config = CreateBuilder()
+                .AddDaprSecretStore(storeName, secretDescriptors, daprClient.Object)
+                .Build();
+
+            config[firstSecretKey].Should().Be(firstSecretValue);
+            config[secondSecretKey].Should().Be(secondSecretValue);
+        }
+
         [Fact]
         public void LoadSecrets_FromSecretStoreWithADifferentSecretKeyAndName()
         {