Skip to content
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

OpenSearch 2.0 essential support #29

Merged
merged 5 commits into from
Jun 14, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
# 1.0.1 is skipped because it doesn't have a tag in OpenSearch repo, we can't check out to compile plugins
version: [1.3.1, 1.3.0, 1.2.4, 1.2.3, 1.2.2, 1.2.1, 1.2.0, 1.1.0, 1.0.0]
version: [2.0.0, 1.3.1, 1.3.0, 1.2.4, 1.2.3, 1.2.2, 1.2.1, 1.2.0, 1.1.0, 1.0.0]

steps:
# Due to https://github.com/opensearch-project/project-website/issues/737
Expand Down
12 changes: 6 additions & 6 deletions build/scripts/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@
},
"OpenSearch.OpenSearch.Managed": {
"type": "Direct",
"requested": "[0.1.0-canary.0.276, )",
"resolved": "0.1.0-canary.0.276",
"contentHash": "hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ==",
"requested": "[0.1.0-canary.0.277, )",
"resolved": "0.1.0-canary.0.277",
"contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==",
"dependencies": {
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.276",
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.277",
"Proc": "0.6.1",
"System.Net.Http": "4.3.1"
}
Expand Down Expand Up @@ -252,8 +252,8 @@
},
"OpenSearch.Stack.ArtifactsApi": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==",
"dependencies": {
"SemanticVersioning": "0.8.0",
"System.Text.Json": "4.6.0"
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<PackageReference Include="FSharp.Core" Version="5.0.0" />

<PackageReference Include="Bullseye" Version="3.3.0" />
<PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.276" />
<PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.277" />

<PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
<PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg==",
"source": null
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need a new line?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be, but it is an autogenerated file.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.OpenSearch.Ephemeral</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,15 +12,15 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,cluster,ephemeral</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="SharpZipLib.NETStandard" version="1.0.7" exclude="Build,Analyzers" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="SharpZipLib.NETStandard" version="1.0.7" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.OpenSearch.Managed</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -13,15 +13,15 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,cluster,observable,rx</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="Proc" version="0.6.1" exclude="Build,Analyzers" />
<dependency id="System.Net.Http" version="4.3.1" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="Proc" version="0.6.1" exclude="Build,Analyzers" />
<dependency id="System.Net.Http" version="4.3.1" exclude="Build,Analyzers" />
</group>
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.OpenSearch.Xunit</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,14 +12,14 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,xunit,cluster,integration,test,ephemeral</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="xunit" version="2.3.1" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="xunit" version="2.3.1" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.Stack.ArtifactsApi</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,7 +12,7 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,stack,versioning,artifacts</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="SemanticVersioning" version="0.8.0" exclude="Build,Analyzers" />
Expand Down
69 changes: 69 additions & 0 deletions src/ApiGenerator/RestSpecification/Core/cat.cluster_manager.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"cat.cluster_manager":{
"documentation":{
"url":"https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/",
"description":"Returns information about the cluster-manager node."
},
"stability":"stable",
"url":{
"paths":[
{
"path":"/_cat/cluster_manager",
"methods":[
"GET"
]
},
{
"path":"/_cat/master",
"methods":[
"GET"
],
"deprecated":{
"version":"2.0.0",
"description":"To promote inclusive language, please use '/_cat/cluster_manager' instead."
}
}
]
},
"params":{
"format":{
"type":"string",
"description":"a short version of the Accept header, e.g. json, yaml"
},
"local":{
"type":"boolean",
"description":"Return local information, do not retrieve the state from cluster-manager node (default: false)"
},
"master_timeout":{
"type":"time",
"description":"Explicit operation timeout for connection to master node",
"deprecated":{
"version":"2.0.0",
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
}
},
"cluster_manager_timeout":{
"type":"time",
"description":"Explicit operation timeout for connection to cluster-manager node"
},
"h":{
"type":"list",
"description":"Comma-separated list of column names to display"
},
"help":{
"type":"boolean",
"description":"Return help information",
"default":false
},
"s":{
"type":"list",
"description":"Comma-separated list of column names or column aliases to sort by"
},
"v":{
"type":"boolean",
"description":"Verbose mode. Display column headers",
"default":false
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

using System.Runtime.Serialization;

namespace OpenSearch.Client
{
[DataContract]
public class CatClusterManagerRecord : ICatRecord
{
[DataMember(Name ="id")]
public string Id { get; set; }

[DataMember(Name ="ip")]
public string Ip { get; set; }

[DataMember(Name ="node")]
public string Node { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

namespace OpenSearch.Client
{
[MapsApi("cat.cluster_manager.json")]
public partial interface ICatClusterManagerRequest { }

public partial class CatClusterManagerRequest { }

public partial class CatClusterManagerDescriptor { }
}
7 changes: 7 additions & 0 deletions src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ namespace OpenSearch.Client
public class CatNodesRecord : ICatRecord
{
public string Build => _b ?? _build;
public string ClusterManager => _cm ?? _cluster_manager;
public string CompletionSize => _completionSize ?? _cs ?? _completion_size;

[DataMember(Name ="cpu")]
Expand Down Expand Up @@ -125,6 +126,12 @@ public class CatNodesRecord : ICatRecord
[DataMember(Name ="build")]
internal string _build { get; set; }

[DataMember(Name ="cm")]
internal string _cm { get; set; }

[DataMember(Name ="cluster_manager")]
internal string _cluster_manager { get; set; }

[DataMember(Name ="completion.size")]
internal string _completion_size { get; set; }

Expand Down
Loading