Skip to content

Commit 22a7ff4

Browse files
committed
Version 7.0.3 - AWSOptions setup
1 parent 2ae0cd6 commit 22a7ff4

File tree

3 files changed

+42
-15
lines changed

3 files changed

+42
-15
lines changed

Diff for: README.md

+22-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
Add-on to [elasticsearch-net / NEST](https://github.com/elastic/elasticsearch-net) for using AWS's elasticsearch service.
44

55
## Install Package
6-
On Nuget
6+
7+
On Nuget:
8+
79
* [Current Version 5.0+](https://www.nuget.org/packages/Elasticsearch.Net.Aws/)
810
* [NEST / Elasticsearch.Net 2.X](https://www.nuget.org/packages/bcuff.Elasticsearch.Net.Aws-v2/)
911
* [NEST / Elasticsearch.Net 1.X](https://www.nuget.org/packages/Elasticsearch.Net.Aws-v1/)
@@ -27,36 +29,47 @@ dotnet add package Elasticsearch.Net.Aws-v1
2729

2830
## Setup
2931

30-
#### Elasticsearch.Net Version >= 2.0.2
32+
### Elasticsearch.Net Version >= 2.0.2
3133

32-
**Use Package Elasticsearch.Net.Aws**
34+
Use Package [Elasticsearch.Net.Aws](https://www.nuget.org/packages/Elasticsearch.Net.Aws/).
35+
36+
#### Typical Setup
3337

3438
```csharp
3539
// for NEST
3640
37-
// if using app.config, environment variables, or roles
3841
// This constructor will look up AWS credentials in the
3942
// same way that the AWSSDK does automatically.
40-
var httpConnection = new AwsHttpConnection("us-east-1");
43+
var httpConnection = new AwsHttpConnection();
4144

4245
var pool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
4346
var config = new ConnectionSettings(pool, httpConnection);
4447
var client = new ElasticClient(config);
4548
```
4649

50+
#### .NET Core Applications using IConfiguration
51+
52+
```csharp
53+
IConfiguration config = Configuration;
54+
var options = config.GetAWSOptions();
55+
var httpConnection = new AwsHttpConnection(options);
56+
57+
// same as above
58+
```
59+
4760
#### Elasticsearch.Net Version 1.7.1
4861

49-
**Use Package Elasticsearch.Net.Aws-v1**
62+
Use Package [Elasticsearch.Net.Aws-v1](https://www.nuget.org/packages/Elasticsearch.Net.Aws-v1)
5063

5164
Source for this version is maintained on the version-1 branch
5265

5366
```csharp
5467
// for NEST
5568
var client = new ElasticClient(settings, connection: new AwsHttpConnection(settings, new AwsSettings
5669
{
57-
AccessKey = "My AWS access key",
58-
SecretKey = "My AWS secret key",
59-
Region = "us-east-1",
70+
AccessKey = "My AWS access key",
71+
SecretKey = "My AWS secret key",
72+
Region = "us-east-1",
6073
}));
6174
```
6275

Diff for: src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/AwsHttpConnection.cs

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
using System.Net.Http;
55
using Amazon;
66
using Amazon.Runtime;
7+
#if NETSTANDARD
8+
using Amazon.Extensions.NETCore.Setup;
9+
#endif
710

811
namespace Elasticsearch.Net.Aws
912
{
@@ -15,6 +18,13 @@ public class AwsHttpConnection : HttpConnection
1518
private readonly AWSCredentials _credentials;
1619
private readonly RegionEndpoint _region;
1720

21+
#if NETSTANDARD
22+
public AwsHttpConnection(AWSOptions options)
23+
: this(options.Credentials, options.Region)
24+
{
25+
}
26+
#endif
27+
1828
/// <summary>
1929
/// Initializes a new instance of the AwsHttpConnection class with the specified AccessKey, SecretKey and Token.
2030
/// </summary>

Diff for: src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>7.0.2</VersionPrefix>
4+
<VersionPrefix>7.0.3</VersionPrefix>
55
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
66
<AssemblyName>Elasticsearch.Net.Aws</AssemblyName>
77
<PackageId>Elasticsearch.Net.Aws</PackageId>
8-
<PackageVersion>7.0.2</PackageVersion>
8+
<PackageVersion>7.0.3</PackageVersion>
99
<Authors>Brandon Cuff</Authors>
1010
<Description>Enables request signing necessary for using the AWS Elasticsearch service.</Description>
1111
<Copyright>Copyright 2015</Copyright>
1212
<PackageLicenseUrl>https://raw.githubusercontent.com/bcuff/elasticsearch-net-aws/master/LICENSE</PackageLicenseUrl>
1313
<PackageProjectUrl>https://github.com/bcuff/elasticsearch-net-aws</PackageProjectUrl>
14-
<PackageReleaseNotes>Support NET Framework 4.6.1</PackageReleaseNotes>
14+
<PackageReleaseNotes>Added AWSOptions overload.</PackageReleaseNotes>
1515
<PackageTags>elasticsearch elastic search aws amazon</PackageTags>
1616
<RepositoryUrl>https://github.com/bcuff/elasticsearch-net-aws</RepositoryUrl>
17-
<AssemblyVersion>7.0.2</AssemblyVersion>
18-
<FileVersion>7.0.2</FileVersion>
19-
<Version>7.0.2</Version>
17+
<AssemblyVersion>7.0.3</AssemblyVersion>
18+
<FileVersion>7.0.3</FileVersion>
19+
<Version>7.0.3</Version>
2020
</PropertyGroup>
2121

2222
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -25,6 +25,10 @@
2525
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
2626
</PropertyGroup>
2727

28+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
29+
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.3.*" />
30+
</ItemGroup>
31+
2832
<ItemGroup>
2933
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
3034
<PackageReference Include="AWSSDK.Core" Version="3.3.*" />

0 commit comments

Comments
 (0)