PUT remote parameter fix

Author: gencebay

src/NetCoreStack.Proxy/DefaultProxyContentStreamProvider.cs

@@ -47,6 +47,26 @@ protected virtual HttpContent CreateHttpContent(object value)
             return content;
         }
 
+        protected virtual void EnsureTemplate(ProxyMethodDescriptor descriptor, 
+            ProxyUriDefinition proxyUriDefinition,
+            RequestContext requestContext,
+            IDictionary<string, object> argsDic,
+            List<string> keys)
+        {
+            if (descriptor.Template.HasValue())
+            {
+                if (proxyUriDefinition.HasParameter)
+                {
+                    for (int i = 0; i < proxyUriDefinition.ParameterParts.Count; i++)
+                    {
+                        var key = keys[i];
+                        proxyUriDefinition.UriBuilder.Path += ($"/{WebUtility.UrlEncode(requestContext.Args[i]?.ToString())}");
+                        argsDic.Remove(key);
+                    }
+                }
+            }
+        }
+
         public async Task CreateRequestContentAsync(RequestContext requestContext, 
             HttpRequestMessage request, 
             ProxyMethodDescriptor descriptor,
@@ -69,6 +89,9 @@ public async Task CreateRequestContentAsync(RequestContext requestContext,
             }
             else if(descriptor.HttpMethod == HttpMethod.Put)
             {
+                EnsureTemplate(descriptor, proxyUriDefinition, requestContext, argsDic, keys);
+                argsCount = argsDic.Count;
+                request.RequestUri = uriBuilder.Uri;
                 if (argsCount == 1)
                 {
                     request.Content = SerializeToString(argsDic.First().Value);
@@ -90,19 +113,7 @@ public async Task CreateRequestContentAsync(RequestContext requestContext,
             }
             if (descriptor.HttpMethod == HttpMethod.Get || descriptor.HttpMethod == HttpMethod.Delete)
             {
-                if (descriptor.Template.HasValue())
-                {
-                    if (proxyUriDefinition.HasParameter)
-                    {
-                        for (int i = 0; i < proxyUriDefinition.ParameterParts.Count; i++)
-                        {
-                            var key = keys[i];
-                            uriBuilder.Path += ($"/{WebUtility.UrlEncode(requestContext.Args[i]?.ToString())}");
-                            argsDic.Remove(key);
-                        }
-                    }
-                }
-
+                EnsureTemplate(descriptor, proxyUriDefinition, requestContext, argsDic, keys);
                 request.RequestUri = QueryStringResolver.Parse(uriBuilder, argsDic);
             }
         }

test/NetCoreStack.Proxy.Test.Contracts/IConsulApi.cs

@@ -19,5 +19,8 @@ public interface IConsulApi : IApiContract
 
         [HttpGetMarker(Template = "health/node/{id}")]
         Task<IEnumerable<AgentCheck>> CheckNode(string node);
+
+        [HttpPutMarker(Template = "kv/{key}")]
+        Task<bool> CreateOrUpdateKey(string key, string body);
     }
 }

test/NetCoreStack.Proxy.WebClient/Controllers/TestController.cs

@@ -85,5 +85,11 @@ public async Task<IActionResult> CheckAgent()
 
             return Json(agentMembers);
         }
+
+        public async Task<IActionResult> CreateOrUpdateKey()
+        {
+            var flag = await _consuleApi.CreateOrUpdateKey("foo", "{foo: 'bar'}");
+            return Json(new { someFlag = flag });
+        }
     }
 }