Skip to content

Commit 07fd364

Browse files
bcuffbcuff
committed
Version 6.1.0
This change includes - Upgrade to netstandard2.0 from netstandard1.0 - Upgrade to net461 from net45 - Use AWSCredentials instead of custom credential loading
1 parent e2a09d8 commit 07fd364

29 files changed

+57
-603
lines changed

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/ElasticSearch.Net.Aws.IntegrationTests.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
55
<AssemblyName>ElasticSearch.Net.Aws.IntegrationTests</AssemblyName>
66
<PackageId>ElasticSearch.Net.Aws.IntegrationTests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
9-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
108
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
119
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1210
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -24,19 +22,19 @@
2422
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
2523
</ItemGroup>
2624

27-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2826
<Reference Include="System" />
2927
<Reference Include="Microsoft.CSharp" />
3028
</ItemGroup>
3129

3230
<ItemGroup>
33-
<None Update="TargetConfig.json">
34-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35-
</None>
31+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
3632
</ItemGroup>
3733

3834
<ItemGroup>
39-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
35+
<None Update="TargetConfig.json">
36+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
37+
</None>
4038
</ItemGroup>
4139

4240
</Project>

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PingTests.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ namespace IntegrationTests
1212
[TestFixture]
1313
public class PingTests
1414
{
15-
private static string Region => TestConfig.AwsSettings.Region;
16-
private static ICredentialsProvider Credentials => new StaticCredentialsProvider(TestConfig.AwsSettings);
15+
private static string Region => TestConfig.Region;
1716
[Test]
1817
public void Ping_should_work()
1918
{
20-
var httpConnection = new AwsHttpConnection(Region, Credentials);
19+
var httpConnection = new AwsHttpConnection(Region);
2120
var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
2221
var config = new ConnectionConfiguration(pool, httpConnection);
2322
var client = new ElasticLowLevelClient(config);
@@ -29,7 +28,7 @@ public void Ping_should_work()
2928
[Test]
3029
public void NestPing_should_work()
3130
{
32-
var httpConnection = new AwsHttpConnection(Region, Credentials);
31+
var httpConnection = new AwsHttpConnection(Region);
3332
var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
3433
var config = new Nest.ConnectionSettings(pool, httpConnection);
3534
var client = new Nest.ElasticClient(config);
@@ -41,7 +40,7 @@ public void NestPing_should_work()
4140
public void Random_encoded_url_should_work()
4241
{
4342
var randomString = Guid.NewGuid().ToString("N");
44-
var httpConnection = new AwsHttpConnection(Region, Credentials);
43+
var httpConnection = new AwsHttpConnection(Region);
4544
var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
4645
var config = new ConnectionConfiguration(pool, httpConnection);
4746
var client = new ElasticLowLevelClient(config);
@@ -52,7 +51,7 @@ public void Random_encoded_url_should_work()
5251
[Test]
5352
public void Asterisk_encoded_url_should_work()
5453
{
55-
var httpConnection = new AwsHttpConnection(Region, Credentials);
54+
var httpConnection = new AwsHttpConnection(Region);
5655
var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
5756
var config = new ConnectionConfiguration(pool, httpConnection);
5857
var client = new ElasticLowLevelClient(config);

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/PostTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ namespace IntegrationTests
1111
[TestFixture]
1212
public class PostTests
1313
{
14-
private static string Region => TestConfig.AwsSettings.Region;
15-
private static ICredentialsProvider Credentials => new StaticCredentialsProvider(TestConfig.AwsSettings);
14+
private static string Region => TestConfig.Region;
1615

1716
string _indexName;
1817
ElasticLowLevelClient _client;
1918

2019
[SetUp]
2120
public void Setup()
2221
{
23-
var httpConnection = new AwsHttpConnection(Region, Credentials);
22+
var httpConnection = new AwsHttpConnection(Region);
2423
var pool = new SingleNodeConnectionPool(new Uri(TestConfig.Endpoint));
2524
var config = new ConnectionConfiguration(pool, httpConnection);
2625
_client = new ElasticLowLevelClient(config);

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/SetUpFixture.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Newtonsoft.Json;
44
using Elasticsearch.Net.Aws;
55
using NUnit.Framework;
6+
using System.Diagnostics;
67

78
namespace IntegrationTests
89
{
@@ -16,12 +17,7 @@ public void SetUp()
1617
var config = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
1718

1819
TestConfig.Endpoint = config["endpoint"];
19-
TestConfig.AwsSettings = new AwsSettings
20-
{
21-
AccessKey = config["accessKey"],
22-
SecretKey = config["secretKey"],
23-
Region = config["region"],
24-
};
20+
TestConfig.Region = config["region"];
2521
}
2622
}
2723
}

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/TargetConfig.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
22
"endpoint": "<your aws elasticsearch service endpoint>",
3-
"accessKey": "<your access key>",
4-
"secretKey": "<your secret key>",
53
"region": "us-east-1"
64
}

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.IntegrationTests/TestConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ namespace IntegrationTests
88
public static class TestConfig
99
{
1010
public static string Endpoint { get; set; }
11-
public static AwsSettings AwsSettings { get; set; }
11+
public static string Region { get; set; }
1212
}
1313
}

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/ElasticSearch.Net.Aws.Tests.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
55
<AssemblyName>ElasticSearch.Net.Aws.Tests</AssemblyName>
66
<PackageId>ElasticSearch.Net.Aws.Tests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
9-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
108
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
119
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1210
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -24,12 +22,12 @@
2422
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
2523
</ItemGroup>
2624

27-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
2826
<PackageReference Include="Elasticsearch.Net" Version="6.0.1" />
2927
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
3028
</ItemGroup>
3129

32-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
3331
<Reference Include="System" />
3432
<Reference Include="Microsoft.CSharp" />
3533
</ItemGroup>

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/InstanceProfileTests.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/NamedProfileCredentialProviderTests.cs‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎src/Elasticsearch.Net.Aws/ElasticSearch.Net.Aws.Tests/SignUtilTests.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Diagnostics;
33
using System.Text;
4+
using Amazon.Runtime;
45
using Elasticsearch.Net.Aws;
56
using NUnit.Framework;
67

@@ -17,13 +18,13 @@ public void SetUp()
1718
{
1819
var encoding = new UTF8Encoding(false);
1920
_sampleBody = encoding.GetBytes("Action=ListUsers&Version=2010-05-08");
20-
#if NETCOREAPP1_0
21+
#if NETCOREAPP
2122
var request = new System.Net.Http.HttpRequestMessage(System.Net.Http.HttpMethod.Post, "https://iam.amazonaws.com/");
2223
request.Content = new System.Net.Http.ByteArrayContent(_sampleBody);
2324
request.Content.Headers.TryAddWithoutValidation("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
2425
request.Headers.TryAddWithoutValidation("X-Amz-Date", "20110909T233600Z");
2526
_sampleRequest = new HttpRequestMessageAdapter(request);
26-
#elif NET451
27+
#elif NET461
2728
var request = System.Net.WebRequest.CreateHttp("https://iam.amazonaws.com/");
2829
request.Method = "POST";
2930
request.ContentType = "application/x-www-form-urlencoded; charset=utf-8";
@@ -79,12 +80,8 @@ public void GetSigningKey_should_match_sample()
7980
[Test]
8081
public void SignRequest_should_apply_signature_to_request()
8182
{
82-
var creds = new AwsCredentials
83-
{
84-
AccessKey = "ExampleKey",
85-
SecretKey = "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY",
86-
Token = "token1",
87-
};
83+
var creds = new SessionAWSCredentials("ExampleKey", "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY", "token1")
84+
.GetCredentials();
8885
SignV4Util.SignRequest(_sampleRequest, _sampleBody, creds, "us-east-1", "iam");
8986

9087
var amzDate = _sampleRequest.Headers.XAmzDate;

0 commit comments

Comments
 (0)