Skip to content

feat: remove trailing slash from connection URL #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
65 changes: 65 additions & 0 deletions Client.Test/InfluxDbClientTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
}
3 changes: 3 additions & 0 deletions Client.Test/ItBucketsApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions Client.Test/ItOrganizationsApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions Client.Test/ItUsersApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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"));
Expand Down
4 changes: 2 additions & 2 deletions Client/Internal/ApiClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}
Expand Down