Merge release-1.13 back into master

.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

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]);
                     }
                 }
 

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()
         {