feat: remove trailing slash from connection URL (#92)

bednar · web-flow · commit 14f0dfd3173f · 2020-05-12T11:49:20.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Features
 1. [#84](https://github.com/influxdata/influxdb-client-csharp/issues/84): Add possibility to authenticate by Basic Authentication or the URL query parameters
 2. [#91](https://github.com/influxdata/influxdb-client-csharp/pull/91): Added support "inf" in Duration
+2. [#92](https://github.com/influxdata/influxdb-client-csharp/pull/92): Remove trailing slash from connection URL
 
 ### Bug Fixes
 1. [#81](https://github.com/influxdata/influxdb-client-csharp/pull/81): Fixed potentially hangs on of WriteApi.Dispose()
diff --git a/Client.Test/InfluxDbClientTest.cs b/Client.Test/InfluxDbClientTest.cs
@@ -154,5 +154,70 @@ public async Task UserAgentHeader()
             StringAssert.StartsWith("influxdb-client-csharp/1.", request.RequestMessage.Headers["User-Agent"].First());
             StringAssert.EndsWith(".0.0", request.RequestMessage.Headers["User-Agent"].First());
         }
+        
+        [Test]
+        public async Task TrailingSlashInUrl()
+        {
+            MockServer
+                .Given(Request.Create().WithPath("/api/v2/write").UsingPost())
+                .RespondWith(CreateResponse("{}"));
+
+            using (var writeApi = _client.GetWriteApi())
+            {
+                writeApi.WriteRecord("b1", "org1", WritePrecision.Ns,
+                    "h2o_feet,location=coyote_creek water_level=1.0 1");
+            }
+
+            var request = MockServer.LogEntries.Last();
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=org1&bucket=b1&precision=ns",
+                request.RequestMessage.AbsoluteUrl);
+
+            _client.Dispose();
+            _client = InfluxDBClientFactory.Create(MockServerUrl + "/");
+
+            using (var writeApi = _client.GetWriteApi())
+            {
+                writeApi.WriteRecord("b1", "org1", WritePrecision.Ns,
+                    "h2o_feet,location=coyote_creek water_level=1.0 1");
+            }
+
+            request = MockServer.LogEntries.Last();
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=org1&bucket=b1&precision=ns",
+                request.RequestMessage.AbsoluteUrl);
+
+            _client.Dispose();
+            _client = InfluxDBClientFactory.Create(new InfluxDBClientOptions.Builder().Url(MockServerUrl)
+                .AuthenticateToken("my-token".ToCharArray()).Build());
+
+            using (var writeApi = _client.GetWriteApi())
+            {
+                writeApi.WriteRecord("b1", "org1", WritePrecision.Ns,
+                    "h2o_feet,location=coyote_creek water_level=1.0 1");
+            }
+
+            request = MockServer.LogEntries.Last();
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=org1&bucket=b1&precision=ns",
+                request.RequestMessage.AbsoluteUrl);
+
+            _client.Dispose();
+            _client = InfluxDBClientFactory.Create(new InfluxDBClientOptions.Builder().Url(MockServerUrl + "/")
+                .AuthenticateToken("my-token".ToCharArray()).Build());
+
+            using (var writeApi = _client.GetWriteApi())
+            {
+                writeApi.WriteRecord("b1", "org1", WritePrecision.Ns,
+                    "h2o_feet,location=coyote_creek water_level=1.0 1");
+            }
+
+            request = MockServer.LogEntries.Last();
+            Assert.AreEqual(MockServerUrl + "/api/v2/write?org=org1&bucket=b1&precision=ns",
+                request.RequestMessage.AbsoluteUrl);
+            
+            Assert.True(MockServer.LogEntries.Any());
+            foreach (var logEntry in MockServer.LogEntries)
+            {
+                StringAssert.StartsWith(MockServerUrl + "/api/v2/", logEntry.RequestMessage.AbsoluteUrl);
+            }
+        }
     }
 }
diff --git a/Client.Test/ItBucketsApiTest.cs b/Client.Test/ItBucketsApiTest.cs
@@ -163,6 +163,7 @@ public async Task FindBucketByName()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/14900")]
         public async Task FindBucketByNameNotFound()
         {
             var bucket = await _bucketsApi.FindBucketByNameAsync("my-bucket-not-found");
@@ -188,6 +189,7 @@ public async Task FindBucketLogsNotFound()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]
         public async Task FindBucketLogsPaging()
         {
             var bucket = await _bucketsApi.CreateBucketAsync(GenerateName("robot sensor"), RetentionRule(), _organization);
@@ -372,6 +374,7 @@ public async Task Member()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/17244")]
         public async Task Owner()
         {
             var bucket = await _bucketsApi.CreateBucketAsync(GenerateName("robot sensor"), RetentionRule(), _organization);
diff --git a/Client.Test/ItOrganizationsApiTest.cs b/Client.Test/ItOrganizationsApiTest.cs
@@ -152,6 +152,7 @@ public async Task FindOrganizationLogsNotFound()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]
         public async Task FindOrganizationLogsPaging()
         {
             var organization = await _organizationsApi.CreateOrganizationAsync(GenerateName("Constant Pro"));
@@ -226,14 +227,15 @@ public async Task FindOrganizationLogsPaging()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]
         public async Task FindOrganizations()
         {
-            var organizations = await _organizationsApi.FindOrganizationsAsync();
+            var organizations = (await _organizationsApi.FindOrganizationsAsync()).Count;
 
             await _organizationsApi.CreateOrganizationAsync(GenerateName("Constant Pro"));
 
             var organizationsNew = await _organizationsApi.FindOrganizationsAsync();
-            Assert.That(organizationsNew.Count == organizations.Count + 1);
+            Assert.AreEqual(organizationsNew.Count, organizations + 1);
         }
 
         [Test]
diff --git a/Client.Test/ItUsersApiTest.cs b/Client.Test/ItUsersApiTest.cs
@@ -77,6 +77,7 @@ public void FindUserByIdNull()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]
         public async Task FindUserLogs()
         {
             var now = new DateTime();
@@ -112,6 +113,7 @@ public async Task FindUserLogsNotFound()
         }
 
         [Test]
+        [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]
         public async Task FindUserLogsPaging()
         {
             var user = await _usersApi.CreateUserAsync(GenerateName("John Ryzen"));
diff --git a/Client/Internal/ApiClient.cs b/Client/Internal/ApiClient.cs
@@ -89,7 +89,7 @@ private void InitToken()
                                      Encoding.Default.GetBytes(
                                          _options.Username + ":" + new string(_options.Password)));
 
-                    var request = new RestRequest(_options.Url + "/api/v2/signin", Method.POST)
+                    var request = new RestRequest("/api/v2/signin", Method.POST)
                         .AddHeader("Authorization", header);
 
                     authResponse = RestClient.Execute(request);
@@ -126,7 +126,7 @@ protected internal void Signout()
             _signout = true;
             _sessionToken = null;
 
-            var request = new RestRequest(_options.Url + "/api/v2/signout", Method.POST);
+            var request = new RestRequest("/api/v2/signout", Method.POST);
             RestClient.Execute(request);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ public async Task FindBucketByName()`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`[Test]`
	`166`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/14900")]`
`166`	`167`	`public async Task FindBucketByNameNotFound()`
`167`	`168`	`{`
`168`	`169`	`var bucket = await _bucketsApi.FindBucketByNameAsync("my-bucket-not-found");`
`@@ -188,6 +189,7 @@ public async Task FindBucketLogsNotFound()`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`[Test]`
	`192`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]`
`191`	`193`	`public async Task FindBucketLogsPaging()`
`192`	`194`	`{`
`193`	`195`	`var bucket = await _bucketsApi.CreateBucketAsync(GenerateName("robot sensor"), RetentionRule(), _organization);`
`@@ -372,6 +374,7 @@ public async Task Member()`
`372`	`374`	`}`
`373`	`375`
`374`	`376`	`[Test]`
	`377`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/17244")]`
`375`	`378`	`public async Task Owner()`
`376`	`379`	`{`
`377`	`380`	`var bucket = await _bucketsApi.CreateBucketAsync(GenerateName("robot sensor"), RetentionRule(), _organization);`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ public async Task FindOrganizationLogsNotFound()`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`[Test]`
	`155`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]`
`155`	`156`	`public async Task FindOrganizationLogsPaging()`
`156`	`157`	`{`
`157`	`158`	`var organization = await _organizationsApi.CreateOrganizationAsync(GenerateName("Constant Pro"));`
`@@ -226,14 +227,15 @@ public async Task FindOrganizationLogsPaging()`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`[Test]`
	`230`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]`
`229`	`231`	`public async Task FindOrganizations()`
`230`	`232`	`{`
`231`		`- var organizations = await _organizationsApi.FindOrganizationsAsync();`
	`233`	`+ var organizations = (await _organizationsApi.FindOrganizationsAsync()).Count;`
`232`	`234`
`233`	`235`	`await _organizationsApi.CreateOrganizationAsync(GenerateName("Constant Pro"));`
`234`	`236`
`235`	`237`	`var organizationsNew = await _organizationsApi.FindOrganizationsAsync();`
`236`		`- Assert.That(organizationsNew.Count == organizations.Count + 1);`
	`238`	`+ Assert.AreEqual(organizationsNew.Count, organizations + 1);`
`237`	`239`	`}`
`238`	`240`
`239`	`241`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ public void FindUserByIdNull()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`[Test]`
	`80`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]`
`80`	`81`	`public async Task FindUserLogs()`
`81`	`82`	`{`
`82`	`83`	`var now = new DateTime();`
`@@ -112,6 +113,7 @@ public async Task FindUserLogsNotFound()`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`[Test]`
	`116`	`+ [Ignore("TODO https://github.com/influxdata/influxdb/issues/18048")]`
`115`	`117`	`public async Task FindUserLogsPaging()`
`116`	`118`	`{`
`117`	`119`	`var user = await _usersApi.CreateUserAsync(GenerateName("John Ryzen"));`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private void InitToken()`
`89`	`89`	`Encoding.Default.GetBytes(`
`90`	`90`	`_options.Username + ":" + new string(_options.Password)));`
`91`	`91`
`92`		`- var request = new RestRequest(_options.Url + "/api/v2/signin", Method.POST)`
	`92`	`+ var request = new RestRequest("/api/v2/signin", Method.POST)`
`93`	`93`	`.AddHeader("Authorization", header);`
`94`	`94`
`95`	`95`	`authResponse = RestClient.Execute(request);`
`@@ -126,7 +126,7 @@ protected internal void Signout()`
`126`	`126`	`_signout = true;`
`127`	`127`	`_sessionToken = null;`
`128`	`128`
`129`		`- var request = new RestRequest(_options.Url + "/api/v2/signout", Method.POST);`
	`129`	`+ var request = new RestRequest("/api/v2/signout", Method.POST);`
`130`	`130`	`RestClient.Execute(request);`
`131`	`131`	`}`
`132`	`132`	`}`