Fix up client configuration handling of waittime

Fixes hashicorp#50
KrolikROJER · Mar 23, 2016 · 2486298 · 2486298
1 parent 38333c4
commit 2486298
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,12 @@
 * `ConsulClient` is now `IDisposable` and should have `Dispose()` called to
   clean it up. It is still supposed to be used in a long-lived fashion, though.
 
+## 2016-03-23
+* Fix a bug where setting `ConsulClientConfiguration.WaitTime` would cause 400
+  Bad Request responses. Also converted `QueryOptions.WaitTime` to a nullable
+  timespan to match the `ConsulClientConfiguration` property of the same
+  name/purpose.
+
 ## 2016-03-19
 * Fix a bug where the StatusCode was not being set correctly on some result
   types.

diff --git a/Consul.Test/ClientTest.cs b/Consul.Test/ClientTest.cs
@@ -68,6 +68,24 @@ public async Task Client_SetQueryOptions()
             Assert.Equal("12345", request.Params["token"]);
         }
 
+        [Fact]
+        public async Task Client_SetClientOptions()
+        {
+            var config = new ConsulClientConfiguration()
+            {
+                Datacenter = "foo",
+                WaitTime = new TimeSpan(0, 0, 100),
+                Token = "12345"
+            };
+            var client = new ConsulClient(config);
+            var request = client.Get<KVPair>("/v1/kv/foo");
+
+            await Assert.ThrowsAsync<ConsulRequestException>(async () => await request.Execute());
+
+            Assert.Equal("foo", request.Params["dc"]);
+            Assert.Equal("1m40s", request.Params["wait"]);
+            Assert.Equal("12345", request.Params["token"]);
+        }
         [Fact]
         public async Task Client_SetWriteOptions()
         {

diff --git a/Consul/Client.cs b/Consul/Client.cs
@@ -244,8 +244,7 @@ public class QueryOptions
             Consistency = ConsistencyMode.Default,
             Datacenter = string.Empty,
             Token = string.Empty,
-            WaitIndex = 0,
-            WaitTime = TimeSpan.Zero
+            WaitIndex = 0
         };
 
         /// <summary>
@@ -266,7 +265,7 @@ public class QueryOptions
         /// <summary>
         /// WaitTime is used to bound the duration of a wait. Defaults to that of the Config, but can be overridden.
         /// </summary>
-        public TimeSpan WaitTime { get; set; }
+        public TimeSpan? WaitTime { get; set; }
 
         /// <summary>
         /// Token is used to provide a per-request ACL token which overrides the agent's default token.
@@ -546,7 +545,7 @@ internal ConsulRequest(ConsulClient client, string url, HttpMethod method)
             }
             if (client.Config.WaitTime.HasValue)
             {
-                Params["wait"] = client.Config.WaitTime.Value.TotalMilliseconds.ToString(CultureInfo.InvariantCulture);
+                Params["wait"] = client.Config.WaitTime.Value.ToGoDuration();
             }
             if (!string.IsNullOrEmpty(client.Config.Token))
             {
@@ -675,9 +674,9 @@ protected override void ApplyOptions()
             {
                 Params["index"] = Options.WaitIndex.ToString();
             }
-            if (Options.WaitTime != TimeSpan.Zero)
+            if (Options.WaitTime.HasValue)
             {
-                Params["wait"] = Options.WaitTime.ToGoDuration();
+                Params["wait"] = Options.WaitTime.Value.ToGoDuration();
             }
             if (!string.IsNullOrEmpty(Options.Token))
             {