From 7904c080706c70e585a272f46be0b05a96228af7 Mon Sep 17 00:00:00 2001
From: Heinrichs <Heinrichs@itc.rwth-aachen.de>
Date: Fri, 28 Jun 2019 16:35:48 +0200
Subject: [PATCH] Fix: Configuration is now added to the ConsulClient
(coscine/issues#132)
---
src/Configuration.Tests/Configuration.Tests.csproj | 1 +
src/Configuration.Tests/ConsulConfigurationTests.cs | 1 -
src/Configuration/Configuration.csproj | 3 +++
src/Configuration/ConsulConfiguration.cs | 8 ++++----
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/Configuration.Tests/Configuration.Tests.csproj b/src/Configuration.Tests/Configuration.Tests.csproj
index c6c67c3..95e33f9 100644
--- a/src/Configuration.Tests/Configuration.Tests.csproj
+++ b/src/Configuration.Tests/Configuration.Tests.csproj
@@ -40,6 +40,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
+ <Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
diff --git a/src/Configuration.Tests/ConsulConfigurationTests.cs b/src/Configuration.Tests/ConsulConfigurationTests.cs
index 5b0011b..cbd7ed4 100644
--- a/src/Configuration.Tests/ConsulConfigurationTests.cs
+++ b/src/Configuration.Tests/ConsulConfigurationTests.cs
@@ -17,7 +17,6 @@ namespace Coscine.Configuration.Tests
[Test]
public void ConsulConfigurationAsyncTest()
{
-
DefaultTester.ConfigurationAsyncTest(_configuration);
}
diff --git a/src/Configuration/Configuration.csproj b/src/Configuration/Configuration.csproj
index 5a49d37..f1bf86f 100644
--- a/src/Configuration/Configuration.csproj
+++ b/src/Configuration/Configuration.csproj
@@ -30,6 +30,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>false</SignAssembly>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
<HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
diff --git a/src/Configuration/ConsulConfiguration.cs b/src/Configuration/ConsulConfiguration.cs
index da7867f..7ede101 100644
--- a/src/Configuration/ConsulConfiguration.cs
+++ b/src/Configuration/ConsulConfiguration.cs
@@ -31,7 +31,7 @@ namespace Coscine.Configuration
Value = value
};
- using (var client = new ConsulClient())
+ using (var client = new ConsulClient(Configuration))
{
var putAttempt = await client.KV.Put(putPair);
@@ -41,7 +41,7 @@ namespace Coscine.Configuration
public async Task<byte[]> GetAsync(string key)
{
- using (var client = new ConsulClient())
+ using (var client = new ConsulClient(Configuration))
{
var getPair = await client.KV.Get(key);
@@ -72,7 +72,7 @@ namespace Coscine.Configuration
public async Task<string[]> KeysAsync(string prefix)
{
- using (var client = new ConsulClient())
+ using (var client = new ConsulClient(Configuration))
{
var keys = await client.KV.Keys(prefix);
return keys.Response;
@@ -81,7 +81,7 @@ namespace Coscine.Configuration
public async Task<bool> DeleteAsync(string key)
{
- using (var client = new ConsulClient())
+ using (var client = new ConsulClient(Configuration))
{
var deleteRequest = await client.KV.Delete(key);
return deleteRequest.Response;
--
GitLab