Addressed review comments

Signed-off-by: Pravin Pushkar <ppushkar@microsoft.com>

Author: pravinpushkar

samples/LocalEnvSecretStoreSample/LocalEnvSecretStoreSample.csproj

@@ -6,10 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Dapr.PluggableComponents.AspNetCore" Version="0.2.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Dapr.PluggableComponents.AspNetCore\Dapr.PluggableComponents.AspNetCore.csproj">
       <GlobalPropertiesToRemove></GlobalPropertiesToRemove>

samples/LocalEnvSecretStoreSample/Services/LocalEnvSecretStore.cs

@@ -1,4 +1,5 @@
-using Dapr.PluggableComponents.Components;
+using System;
+using Dapr.PluggableComponents.Components;
 using Dapr.PluggableComponents.Components.SecretStores;
 
 namespace LocalEnvSecretStoreSample.Services;
@@ -39,14 +40,24 @@ public Task<SecretStoreBulkGetResponse> BulkGetAsync(SecretStoreBulkGetRequest r
         this.logger.LogInformation("Get request for all secrets");
 
         SecretStoreBulkGetResponse? response = null;
-        Dictionary<string, string> resp = new Dictionary<string, string>();
+        SecretStoreResponse? secretStoreResponse = null;
+        Dictionary<string, string>? resp = null;
+        Dictionary<string, SecretStoreResponse> bulkResp = new Dictionary<string, SecretStoreResponse>();
         foreach (string key in Environment.GetEnvironmentVariables().Keys)
         {
-            resp.Add(key, Environment.GetEnvironmentVariable(key));
+            resp = new Dictionary<string, string>
+            {
+                {key, Environment.GetEnvironmentVariable(key) }
+            };
+            secretStoreResponse = new SecretStoreResponse
+            {
+                Data = resp
+            };
+            bulkResp.Add(key, secretStoreResponse);
         }
         response = new SecretStoreBulkGetResponse
         {
-            Data = resp
+            Data = bulkResp
         };
         return Task.FromResult(response);
     }

src/Dapr.PluggableComponents.Protos/Dapr.PluggableComponents.Protos.csproj

@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Protobuf Include="@(Protos-&gt;'$(ProtosComponentsDir)/%(Identity)')" ProtoRoot="$(ProtosRootDir)" GrpcServices="Client,Server" />
+    <Protobuf Include="@(Protos->'$(ProtosComponentsDir)/%(Identity)')" ProtoRoot="$(ProtosRootDir)" GrpcServices="Client,Server" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr.PluggableComponents/Components/SecretStores/SecretStoreBulkGetResponse.cs

@@ -19,18 +19,21 @@ namespace Dapr.PluggableComponents.Components.SecretStores;
 
 public sealed record SecretStoreBulkGetResponse
 {
-    public IReadOnlyDictionary<string, string> Data = new Dictionary<string, string>();
+    public IReadOnlyDictionary<string, SecretStoreResponse> Data { get; init; } = new Dictionary<string, SecretStoreResponse>();
 
-    internal static BulkGetSecretResponse ToBulkGetResponse(SecretStoreBulkGetResponse? response)
+    internal static BulkGetSecretResponse ToBulkGetResponse(SecretStoreBulkGetResponse response)
     {
         var grpcResponse = new BulkGetSecretResponse();
         if (response != null)
         {
             foreach (var item in response.Data)
             {
-                var secretItem = new SecretResponse();
-                secretItem.Secrets.Add(item.Key, item.Value);
-                grpcResponse.Data.Add(item.Key, secretItem);
+                var secretResp = new SecretResponse();
+                foreach (var sec in item.Value.Data)
+                {
+                    secretResp.Secrets.Add(sec.Key, sec.Value);
+                    grpcResponse.Data.Add(sec.Key, secretResp);
+                }
             }
         }
         return grpcResponse;

src/Dapr.PluggableComponents/Components/SecretStores/SecretStoreGetResponse.cs

@@ -28,10 +28,10 @@ public sealed record SecretStoreGetResponse
     /// <remarks>
     /// If omitted, defaults to an empty array.
     /// </remarks>
-    public IReadOnlyDictionary<string, string> Data = new Dictionary<string, string>();
+    public IReadOnlyDictionary<string, string> Data { get; init; } = new Dictionary<string, string>();
 
 
-    internal static GetSecretResponse ToGetResponse(SecretStoreGetResponse? response)
+    internal static GetSecretResponse ToGetResponse(SecretStoreGetResponse response)
     {
         var grpcResponse = new GetSecretResponse();
 

src/Dapr.PluggableComponents/Components/SecretStores/SecretStoreResponse.cs

@@ -0,0 +1,47 @@
+// ------------------------------------------------------------------------
+// Copyright 2023 The Dapr Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//     http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+using Dapr.PluggableComponents.Utilities;
+using Dapr.Proto.Components.V1;
+using Google.Protobuf;
+namespace Dapr.PluggableComponents.Components.SecretStores;
+
+/// <summary>
+/// Represents properties associated with a response to retrieving bulk secret from a secret store.
+/// </summary>
+public sealed record SecretStoreResponse
+{
+    /// <summary>
+    /// Gets or sets the key's value.
+    /// </summary>
+    /// <remarks>
+    /// If omitted, defaults to an empty array.
+    /// </remarks>
+    public IReadOnlyDictionary<string, string> Data { get; init; } = new Dictionary<string, string>();
+
+
+    internal static SecretResponse ToGetResponse(SecretStoreResponse response)
+    {
+        var grpcResponse = new SecretResponse();
+
+        // NOTE: in case of not found, you should not return any error.
+
+        if (response != null)
+        {
+            grpcResponse.Secrets.Add(response.Data);
+        }
+
+        return grpcResponse;
+    }
+}
+