Skip to content

Commit 2bec7f9

Browse files
anirudhaanirudha
authored
Merge pull request #8 from opensearch-project/dev-rename-es-and-update-md-files
Renaming es to opensearch, update of admin and maintainers, and PR template
2 parents 0fa1d8e + cca3aab commit 2bec7f9

File tree

25 files changed

+66
-114
lines changed

25 files changed

+66
-114
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

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

‎ADMINS.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ This document explains who the admins are (see below), what they do in this repo
44

55
## Current Admins
66

7-
| Admin | GitHub ID | Affiliation |
8-
| -------------------------| --------------------------------------- | ----------- |
9-
7+
| Admin | GitHub ID | Affiliation |
8+
| -------------------------| ---------------------------------------------- | ----------- |
9+
| Anirudha Jadhav | [anirudha](https://github.com/anirudha) | Amazon |
10+
| Joshua Li | [joshuali925](https://github.com/joshuali925) | Amazon |
1011

1112
## Admin Responsibilities
1213

‎MAINTAINERS.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ This document explains who the maintainers are (see below), what they do in this
1717

1818
## Current Maintainers
1919

20-
| Maintainer | GitHub ID | Affiliation |
21-
| ------------------------ | --------------------------------------- | ----------- |
22-
| Jack Mazanec | [jmazanec15](https://github.com/jmazanec15) | Amazon |
23-
| Vamshi Vijay Nakkirtha | [vamshin](https://github.com/vamshin) | Amazon |
24-
| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB) | Amazon |
20+
| Maintainer | GitHub ID | Affiliation |
21+
| ------------------------ | --------------------------------------------------- | ----------- |
22+
| Anirudha Jadhav | [anirudha](https://github.com/anirudha) | Amazon |
23+
| Joshua Li | [joshuali925](https://github.com/joshuali925) | Amazon |
24+
| Alex Meizer | [alexmeizer](https://github.com/alexmeizer) | Bit Quill |
25+
| Guian Gumpac | [guiangumpac](https://github.com/guiangumpac) | Bit Quill |
26+
| Raymond Lum | [raymond-lum](https://github.com/raymond-lum) | Bit Quill |
27+
| Yury Fridlyand | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | Bit Quill |
2528

2629
## Maintainer Responsibilities
2730

‎build/scripts/Building.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ module Build =
163163

164164
//rewrite assemblies to versioned counterparts
165165
let dependentAssemblies =
166-
let injectEsNet =
166+
let injectOpenSearchNet =
167167
match deps |> Seq.contains "OSC" with
168168
| true -> List.append deps ["OpenSearch.Net"]
169169
| false -> deps
170-
injectEsNet
170+
injectOpenSearchNet
171171
|> Seq.map (fun id ->
172172
let p = packages |> Seq.find (fun p -> p.NugetId = id)
173173
p.AssemblyName

‎build/scripts/Commandline.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,27 +242,27 @@ Execution hints can be provided anywhere on the command line
242242
}
243243
}
244244

245-
| ["integrate"; esVersions] ->
245+
| ["integrate"; opensearchVersions] ->
246246
{
247247
parsed with CommandArguments = Integration {
248248
TrxExport = report
249-
ElasticsearchVersions = split esVersions; ClusterFilter = None; TestFilter = None
249+
ElasticsearchVersions = split opensearchVersions; ClusterFilter = None; TestFilter = None
250250
}
251251
}
252-
| ["integrate"; esVersions; clusterFilter] ->
252+
| ["integrate"; opensearchVersions; clusterFilter] ->
253253
{
254254
parsed with CommandArguments = Integration {
255255
TrxExport = report
256-
ElasticsearchVersions = split esVersions;
256+
ElasticsearchVersions = split opensearchVersions;
257257
ClusterFilter = Some clusterFilter;
258258
TestFilter = None
259259
}
260260
}
261-
| ["integrate"; esVersions; clusterFilter; testFilter] ->
261+
| ["integrate"; opensearchVersions; clusterFilter; testFilter] ->
262262
{
263263
parsed with CommandArguments = Integration {
264264
TrxExport = report
265-
ElasticsearchVersions = split esVersions;
265+
ElasticsearchVersions = split opensearchVersions;
266266
ClusterFilter = Some clusterFilter
267267
TestFilter = Some testFilter
268268
}

‎build/scripts/Testing.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ module Tests =
104104
let passedVersions = match args.CommandArguments with | Integration a -> Some a.ElasticsearchVersions | _ -> None
105105
match passedVersions with
106106
| None -> failwith "No versions specified to run integration tests against"
107-
| Some esVersions ->
108-
for esVersion in esVersions do
107+
| Some opensearchVersions ->
108+
for opensearchVersion in opensearchVersions do
109109
Environment.setEnvironVar "NEST_INTEGRATION_TEST" "1"
110-
Environment.setEnvironVar "NEST_INTEGRATION_VERSION" esVersion
110+
Environment.setEnvironVar "NEST_INTEGRATION_VERSION" opensearchVersion
111111
dotnetTest "tests/Tests/Tests.csproj" args

‎issue_template.md

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

‎src/ApiGenerator/Configuration/GeneratorLocations.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ namespace ApiGenerator.Configuration
3333
public static class GeneratorLocations
3434
{
3535
// @formatter:off — disable formatter after this line
36-
public static string EsNetFolder { get; } = $@"{Root}../../src/OpenSearch.Net/";
36+
public static string OpenSearchNetFolder { get; } = $@"{Root}../../src/OpenSearch.Net/";
3737
public static string LastDownloadedRef { get; } = Path.Combine(Root, "last_downloaded_version.txt");
3838

3939
public static string NestFolder { get; } = $@"{Root}../../src/Osc/";
4040
public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification/";
4141
// @formatter:on — enable formatter after this line
4242

4343
public static string HighLevel(params string[] paths) => NestFolder + string.Join("/", paths);
44-
public static string LowLevel(params string[] paths) => EsNetFolder + string.Join("/", paths);
44+
public static string LowLevel(params string[] paths) => OpenSearchNetFolder + string.Join("/", paths);
4545

4646
public static readonly Assembly Assembly = typeof(Generator.ApiGenerator).Assembly;
4747

‎src/ApiGenerator/Generator/Razor/LowLevelClientImplementationGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class LowLevelClientImplementationGenerator : RazorGeneratorBase
4343
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4444
{
4545
// Delete existing files
46-
foreach (var file in Directory.GetFiles(GeneratorLocations.EsNetFolder, "OpenSearchLowLevelClient.*.cs"))
46+
foreach (var file in Directory.GetFiles(GeneratorLocations.OpenSearchNetFolder, "OpenSearchLowLevelClient.*.cs"))
4747
File.Delete(file);
4848

4949
var view = ViewLocations.LowLevel("Client", "Implementation", "OpenSearchLowLevelClient.cshtml");

‎src/ApiGenerator/Generator/Razor/RequestParametersGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class RequestParametersGenerator : RazorGeneratorBase
4242
public override async Task Generate(RestApiSpec spec, ProgressBar progressBar, CancellationToken token)
4343
{
4444
// Delete existing files
45-
foreach (var file in Directory.GetFiles(GeneratorLocations.EsNetFolder, "RequestParameters.*.cs"))
45+
foreach (var file in Directory.GetFiles(GeneratorLocations.OpenSearchNetFolder, "RequestParameters.*.cs"))
4646
File.Delete(file);
4747

4848
var view = ViewLocations.LowLevel("RequestParameters", "RequestParameters.cshtml");

‎src/OpenSearch.Net/Connection/MetaData/MetaHeaderProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class MetaHeaderProvider
4040
public MetaHeaderProvider()
4141
{
4242
var clientVersionInfo = ClientVersionInfo.Create<IOpenSearchLowLevelClient>();
43-
_asyncMetaDataHeader = new MetaDataHeader(clientVersionInfo, "es", true);
44-
_syncMetaDataHeader = new MetaDataHeader(clientVersionInfo, "es", false);
43+
_asyncMetaDataHeader = new MetaDataHeader(clientVersionInfo, "opensearch", true);
44+
_syncMetaDataHeader = new MetaDataHeader(clientVersionInfo, "opensearch", false);
4545
}
4646

4747
public string HeaderName => MetaHeaderName;

‎src/OpenSearch.Net/Extensions/UtilExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ internal static bool HasAny<T>(this IEnumerable<T> list, out T[] enumerated)
7575

7676
internal static Exception AsAggregateOrFirst(this IEnumerable<Exception> exceptions)
7777
{
78-
var es = exceptions as Exception[] ?? exceptions?.ToArray();
79-
if (es == null || es.Length == 0) return null;
78+
var opensearch = exceptions as Exception[] ?? exceptions?.ToArray();
79+
if (opensearch == null || opensearch.Length == 0) return null;
8080

81-
return es.Length == 1 ? es[0] : new AggregateException(es);
81+
return opensearch.Length == 1 ? opensearch[0] : new AggregateException(opensearch);
8282
}
8383

8484
internal static void ThrowIfNull<T>(this T value, string name) where T : class

‎src/OpenSearch.Net/Transport/Pipeline/RequestData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class RequestData
3939
public const string MimeType = "application/json";
4040
public const string MimeTypeTextPlain = "text/plain";
4141
public const string OpaqueIdHeader = "X-Opaque-Id";
42-
public const string RunAsSecurityHeader = "es-security-runas-user";
42+
public const string RunAsSecurityHeader = "opensearch-security-runas-user";
4343

4444
public RequestData(HttpMethod method, string path, PostData data, IConnectionConfigurationValues global, IRequestParameters local,
4545
IMemoryStreamFactory memoryStreamFactory

‎src/Osc/CommonAbstractions/Infer/Fields/Fields.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public override bool Equals(object obj)
140140
case Field fn: return Equals(fn);
141141
case Field[] fns: return Equals(fns);
142142
case Expression e: return Equals(e);
143-
case Expression[] es: return Equals(es);
143+
case Expression[] opensearch: return Equals(opensearch);
144144
default: return false;
145145
}
146146
}

‎src/Osc/CommonAbstractions/Infer/Id/IdResolver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ private PropertyInfo GetInferredId(Type type)
103103
if (!propertyName.IsNullOrEmpty())
104104
return GetPropertyCaseInsensitive(type, propertyName);
105105

106-
var esTypeAtt = OpenSearchTypeAttribute.From(type);
107-
propertyName = esTypeAtt?.IdProperty.IsNullOrEmpty() ?? true ? "Id" : esTypeAtt.IdProperty;
106+
var opensearchTypeAtt = OpenSearchTypeAttribute.From(type);
107+
propertyName = opensearchTypeAtt?.IdProperty.IsNullOrEmpty() ?? true ? "Id" : opensearchTypeAtt.IdProperty;
108108

109109
return GetPropertyCaseInsensitive(type, propertyName);
110110
}

‎src/Osc/CommonAbstractions/Reactive/CoordinatedRequestObserverBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void OnError(Exception error)
6060
// This normalizes task cancellation exceptions for observables
6161
// If a task cancellation happens in the client it bubbles out as a UnexpectedOpenSearchClientException
6262
// where as inside our IObservable implementation we .ThrowIfCancellationRequested() directly.
63-
if (error is UnexpectedOpenSearchClientException es && es.InnerException != null && es.InnerException is OperationCanceledException c)
63+
if (error is UnexpectedOpenSearchClientException opensearch && opensearch.InnerException != null && opensearch.InnerException is OperationCanceledException c)
6464
_onError?.Invoke(c);
6565
else _onError?.Invoke(error);
6666
}

‎src/Osc/Modules/Cluster/DiskBasedShardAllocation/DiskbasedShardAllocationSettings.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Osc
3030
public interface IDiskBasedShardAllocationSettings
3131
{
3232
/// <summary>
33-
/// Controls the high watermark. It defaults to 90%, meaning ES will attempt to relocate shards to another node if the node disk usage rises
33+
/// Controls the high watermark. It defaults to 90%, meaning OpenSearch will attempt to relocate shards to another node if the node disk usage rises
3434
/// above 90%.
3535
/// It can also be set to an absolute byte value (similar to the low watermark) to relocate shards once less than the
3636
/// configured amount of space is available on the node.
@@ -48,9 +48,9 @@ public interface IDiskBasedShardAllocationSettings
4848
bool? IncludeRelocations { get; set; }
4949

5050
/// <summary>
51-
/// Controls the low watermark for disk usage. It defaults to 85%, meaning ES will not allocate new shards to nodes once they have more than
51+
/// Controls the low watermark for disk usage. It defaults to 85%, meaning OpenSearch will not allocate new shards to nodes once they have more than
5252
/// 85% disk used. It can also be set
53-
/// to an absolute byte value (like 500mb) to prevent ES from allocating shards if less than the configured amount of space is available.
53+
/// to an absolute byte value (like 500mb) to prevent OpenSearch from allocating shards if less than the configured amount of space is available.
5454
/// </summary>
5555
string LowWatermark { get; set; }
5656

‎tests/Tests.Core/ManagedElasticsearch/Clusters/IntrusiveOperationCluster.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
namespace Tests.Core.ManagedElasticsearch.Clusters
3131
{
3232
/// <summary>
33-
/// Use this cluster for heavy API's, either on ES's side or the client (intricate setup etc)
33+
/// Use this cluster for heavy API's, either on OpenSearch's side or the client (intricate setup etc)
3434
/// </summary>
3535
public class IntrusiveOperationCluster : ClientTestClusterBase
3636
{

‎tests/Tests.Reproduce/GithubIssue1906.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,21 @@ [U] public void SearchDoesNotTakeDefaultIndexIntoAccount()
4545
.OnRequestCompleted(info =>
4646
{
4747
// info.Uri is /_search/ without the default index
48-
// my ES instance throws an error on the .kibana index (@timestamp field not mapped because I sort on @timestamp)
48+
// my OpenSearch instance throws an error on the .kibana index (@timestamp field not mapped because I sort on @timestamp)
4949
});
5050

5151
var client = new OpenSearchClient(connectionSettings);
52-
var response = client.Search<ESLogEvent>(s => s);
52+
var response = client.Search<OpenSearchLogEvent>(s => s);
5353

5454
response.ApiCall.Uri.AbsolutePath.Should().Be("/GithubIssue1906-%2A/_search");
5555

56-
response = client.Search<ESLogEvent>(new SearchRequest<ESLogEvent>());
56+
response = client.Search<OpenSearchLogEvent>(new SearchRequest<OpenSearchLogEvent>());
5757
response.ApiCall.Uri.AbsolutePath.Should().Be("/GithubIssue1906-%2A/_search");
5858

59-
response = client.Search<ESLogEvent>(new SearchRequest());
59+
response = client.Search<OpenSearchLogEvent>(new SearchRequest());
6060
response.ApiCall.Uri.AbsolutePath.Should().Be("/_search");
6161
}
6262

63-
private class ESLogEvent { }
63+
private class OpenSearchLogEvent { }
6464
}
6565
}

‎tests/Tests.YamlRunner/Models.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ type YamlMap = Dictionary<Object,Object>
4040
type YamlValue = YamlDictionary of YamlMap | YamlString of string
4141

4242
type DoCatch =
43-
| BadRequest // bad_request, 400 response from ES
44-
| Unauthorized //unauthorized a 401 response from ES
45-
| Forbidden //forbidden a 403 response from ES
46-
| Missing //missing a 404 response from ES
47-
| RequestTimeout //request_timeout a 408 response from ES
48-
| Conflict //conflict a 409 response from ES
49-
| Unavailable//unavailable a 503 response from ES
43+
| BadRequest // bad_request, 400 response from OpenSearch
44+
| Unauthorized //unauthorized a 401 response from OpenSearch
45+
| Forbidden //forbidden a 403 response from OpenSearch
46+
| Missing //missing a 404 response from OpenSearch
47+
| RequestTimeout //request_timeout a 408 response from OpenSearch
48+
| Conflict //conflict a 409 response from OpenSearch
49+
| Unavailable//unavailable a 503 response from OpenSearch
5050
| UnknownParameter //param a client-side error indicating an unknown parameter has been passed to the method
51-
| OtherBadResponse //request 4xx-5xx error response from ES, not equal to any named response above
51+
| OtherBadResponse //request 4xx-5xx error response from OpenSearch, not equal to any named response above
5252
| CatchRegex of string // /foo bar/ the text of the error message matches this regular expression
5353

5454
let (|IsDoCatch|_|) (s:string) =

‎tests/Tests/Aggregations/Metric/ExtendedStats/ExtendedStatsAggregationUsageTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public ExtendedStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
5454
};
5555

5656
protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
57-
.ExtendedStats("commit_stats", es => es
57+
.ExtendedStats("commit_stats", opensearch => opensearch
5858
.Field(p => p.NumberOfCommits)
5959
.Sigma(1)
6060
);
@@ -130,7 +130,7 @@ public ExtendedStatsAggregationUsageDocCountZeroTests(ReadOnlyCluster i, Endpoin
130130
};
131131

132132
protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
133-
.ExtendedStats("commit_stats", es => es
133+
.ExtendedStats("commit_stats", opensearch => opensearch
134134
.Field(p => p.NumberOfCommits)
135135
.Sigma(1)
136136
);

‎tests/Tests/Connection/MetaData/MetaHeaderProviderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ [U] public void HeaderName_ReturnsExpectedValue_ForSyncRequest_WhenNotDisabled()
7979
var parts = result.Split(',');
8080
parts.Length.Should().Be(4);
8181

82-
parts[0].Should().StartWith("es=");
83-
var clientVersion = parts[0].Substring(3);
82+
parts[0].Should().StartWith("opensearch=");
83+
var clientVersion = parts[0].Substring(11);
8484
_validVersionRegex.Match(clientVersion).Success.Should().BeTrue();
8585

8686
parts[1].Should().Be("a=0");
@@ -112,8 +112,8 @@ [U] public void HeaderName_ReturnsExpectedValue_ForAsyncRequest_WhenNotDisabled(
112112
var parts = result.Split(',');
113113
parts.Length.Should().Be(4);
114114

115-
parts[0].Should().StartWith("es=");
116-
var clientVersion = parts[0].Substring(3);
115+
parts[0].Should().StartWith("opensearch=");
116+
var clientVersion = parts[0].Substring(11);
117117
_validVersionRegex.Match(clientVersion).Success.Should().BeTrue();
118118

119119
parts[1].Should().Be("a=1");

‎tests/Tests/high-level.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
= NEST - High level client
55

66
The high level client, `OpenSearchClient`, provides a strongly typed query DSL that
7-
maps one-to-one with the {es} query DSL. Please refer to <<es-nest>> for
7+
maps one-to-one with the {opensearch} query DSL. Please refer to <<es-nest>> for
88
installation details.
99

1010
NEST internally uses and still exposes the low level client,

‎tests/Tests/installation.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Package Manager GUI.
2929
=== Installing the NEST client
3030

3131
The high level `OpenSearchClient`, provides a strongly typed query DSL that maps
32-
one-to-one with the {es} query DSL.
32+
one-to-one with the {opensearch} query DSL.
3333

3434
It can be installed from the Package Manager Console inside Visual Studio by
3535
using the following command:

0 commit comments

Comments
 (0)