diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f9ecdc1e9e..7e5c7e8d85 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -12,7 +12,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.2.0, 2.1.0, 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 diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index 9e0f6aee82..60e3b98d38 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -1,18 +1,15 @@ - [Compatibility with OpenSearch](#compatibility-with-opensearch) +- [Upgrading](#upgrading) ## Compatibility with OpenSearch -The below matrix shows the compatibility of the `opensearch-net` with versions of [`OpenSearch`](https://opensearch.org/downloads.html#opensearch). Currently this client is in a pre-release phase. The below matrix shows compatibility for the upcoming version. +The below matrix shows the compatibility of the [`opensearch-net`](https://www.nuget.org/profiles/opensearchproject) with versions of [`OpenSearch`](https://opensearch.org/downloads.html#opensearch). | OpenSearch Version | Client Version | -| --- | --- | -| 1.0.0 | 1.0.0 | -| 1.0.1 | 1.0.0 | -| 1.1.0 | 1.0.0 | -| 1.2.0 | 1.0.0 | -| 1.2.1 | 1.0.0 | -| 1.2.2 | 1.0.0 | -| 1.2.3 | 1.0.0 | -| 1.2.4 | 1.0.0 | -| 1.3.0 | 1.0.0 | -| 1.3.1 | 1.0.0 | +|--------------------|----------------| +| 1.x | 1.0.0, 1.1.0 | +| 2.x | 1.1.0 | + +## Upgrading + +Major versions of OpenSearch introduce breaking changes that require careful upgrades of the client. While `opensearch-net` client 1.1.0 works against the latest OpenSearch 1.x, certain deprecated features removed in OpenSearch 2.0 have also been removed from the client. Please refer to the [OpenSearch documentation](https://opensearch.org/docs/latest/clients/index/) for more information. diff --git a/Directory.Build.props b/Directory.Build.props index 8eb474cb78..a161915c04 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,7 +21,7 @@ Apache-2.0 See https://github.com/opensearch-project/opensearch-net/releases https://github.com/opensearch-project/opensearch-net - https://raw.githubusercontent.com/opensearch-project/opensearch-net/master/build/nuget-icon.png + https://raw.githubusercontent.com/opensearch-project/opensearch-net/main/build/nuget-icon.png diff --git a/OpenSearch.sln b/OpenSearch.sln index 82e3d58a1d..1ec24fd9eb 100644 --- a/OpenSearch.sln +++ b/OpenSearch.sln @@ -42,9 +42,16 @@ EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markdown", "Markdown", "{2FABB663-F4DB-499A-89F8-3A08828D1D91}" ProjectSection(SolutionItems) = preProject + admins.md = admins.md + code_of_conduct.md = code_of_conduct.md + compatibility.md = compatibility.md contributing.md = contributing.md + maintainers.md = maintainers.md license.txt = license.txt readme.md = readme.md + releasing.md = releasing.md + security.md = security.md + user_guide.md = user_guide.md EndProjectSection EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tests.YamlRunner", "tests\Tests.YamlRunner\Tests.YamlRunner.fsproj", "{81473437-5722-4829-A5CD-125B17CCA238}" diff --git a/build/scripts/Versioning.fs b/build/scripts/Versioning.fs index 1991aa2c4f..8aa9d6107f 100644 --- a/build/scripts/Versioning.fs +++ b/build/scripts/Versioning.fs @@ -66,11 +66,11 @@ module Versioning = let globalJson = globalJson () let doc_current = match globalJson.doc_current with - | "master" -> "master" + | "main" -> "main" | _ -> sprintf "%i.%i" version.Major version.Minor let doc_branch = match globalJson.doc_current with - | "master" -> "master" + | "main" -> "main" | _ -> sprintf "%i.x" version.Major let newGlobalJson = { diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json index 2d6c498c66..9c64b59f5e 100644 --- a/build/scripts/packages.lock.json +++ b/build/scripts/packages.lock.json @@ -96,13 +96,13 @@ }, "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": "BoLSf2fiCphayR0TQulvm0m0MISy8kCL+JrPv1QGrlR4YujWAeSi0izb+vnYEWT9+a8IviTMjU2TGZwpcKSuBQ==", "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" + "System.Net.Http": "4.3.4" } }, "Proc": { @@ -166,8 +166,8 @@ }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -252,27 +252,29 @@ }, "OpenSearch.Stack.ArtifactsApi": { "type": "Transitive", - "resolved": "0.1.0-canary.0.276", - "contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==", + "resolved": "0.1.0-canary.0.277", + "contentHash": "S3Mxf2FhxL/WJg9f0LGoGLmpvRyFCH0HitsC3bDAgBweO9aqSNmpVeAm7DvKHMwGpSAglUL0+pOBvo2dCi/iVg==", "dependencies": { "SemanticVersioning": "0.8.0", - "System.Text.Json": "4.6.0" + "System.Net.Http": "4.3.4", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Json": "6.0.5" } }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "HdSSp5MnJSsg08KMfZThpuLPJpPwE5hBXvHwoKWosyHHfe8Mh5WKT0ylEOf6yNzX6Ngjxe4Whkafh5q7Ymac4Q==" + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" }, "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+yH1a49wJMy8Zt4yx5RhJrxO/DBDByAiCzNwiETI+1S4mPdCu0OY4djdciC7Vssk0l22wQaDLrXxXkp+3+7bVA==" + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" }, "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" }, "runtime.native.System": { "type": "Transitive", @@ -311,30 +313,30 @@ }, "runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "NS1U+700m4KFRHR5o4vo9DSlTmlCKu/u7dtE5sUHVIPB+xpXxYQvgBgA6wEIeCz6Yfn0Z52/72WYsToCEPJnrw==", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" } }, "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "b3pthNgxxFcD+Pc0WSEoC0+md3MyhRS6aCEeenvNE3Fdw1HyJ18ZhRFVJJzIeR/O/jpxPboB805Ho0T3Ul7w8A==" + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" }, "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KeLz4HClKf+nFS7p/6Fi/CqyLXh81FpiGzcmuS8DGi9lUqSnZ6Es23/gv2O+1XVGfrbNmviF7CckBpavkBoIFQ==" + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" }, "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { "type": "Transitive", @@ -343,28 +345,28 @@ }, "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "X7IdhILzr4ROXd8mI1BUCQMSHSQwelUlBjF1JyTKCjXaOGn2fB4EKBxQbCK2VjO3WaWIdlXZL3W6TiIVnrhX4g==" + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" }, "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "nyFNiCk/r+VOiIqreLix8yN+q3Wga9+SE8BCgkf+2BwEKiNx6DyvFjCgkfV743/grxv8jHJ8gUK4XEQw7yzRYg==" + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" }, "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ytoewC6wGorL7KoCAvRfsgoJPJbNq+64k2SqW6JcOAebWsFUvCCYgfzQMrnpvPiEl4OrblUlhF2ji+Q1+SVLrQ==" + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" }, "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I8bKw2I8k58Wx7fMKQJn2R8lamboCAiHfHeV/pS65ScKWMMI0+wJkLYlEKvgW1D/XvSl/221clBoR2q9QNNM7A==" + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" }, "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" }, "SemanticVersioning": { "type": "Transitive", @@ -702,10 +704,10 @@ }, "System.Net.Http": { "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "UrTyRczM3ZvNk6oetBuwlu67MFKKRva+r7bw4JDVZ6Y2IukyZ24td5ppsieu/4yZlogVAIuZul9GIQ3hoiz0yA==", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Platforms": "1.1.1", "System.Collections": "4.3.0", "System.Diagnostics.Debug": "4.3.0", "System.Diagnostics.DiagnosticSource": "4.3.0", @@ -730,7 +732,7 @@ "System.Threading.Tasks": "4.3.0", "runtime.native.System": "4.3.0", "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" } }, "System.Net.Primitives": { @@ -888,6 +890,11 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, "System.Runtime.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -923,16 +930,16 @@ }, "System.Runtime.InteropServices.RuntimeInformation": { "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" } }, "System.Runtime.Numerics": { @@ -1111,10 +1118,22 @@ "System.Text.Encoding": "4.3.0" } }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, "System.Text.Json": { "type": "Transitive", - "resolved": "4.6.0", - "contentHash": "4F8Xe+JIkVoDJ8hDAZ7HqLkjctN/6WItJIzQaifBwClC7wmoLSda/Sv2i6i1kycqDb3hWF4JCVbpAweyOKHEUA==" + "resolved": "6.0.5", + "contentHash": "SSH+YYrMpvLcy7Orzb5K1tSyffnFacWahyxCCjYH1PbSHdAF4dekmIetBurFKgtTHDmwEe/J2Csi/7niRH6d/g==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "6.0.0" + } }, "System.Text.RegularExpressions": { "type": "Transitive", diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index 33404d49cf..66cc2f8002 100644 --- a/build/scripts/scripts.fsproj +++ b/build/scripts/scripts.fsproj @@ -37,7 +37,7 @@ - + diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/.nupkg.metadata b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/.nupkg.metadata deleted file mode 100644 index 59c4d8d937..0000000000 --- a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/.nupkg.metadata +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 2, - "contentHash": "Ws9CcKvUOsFM7jMwK9w7px5gdSylPMBxfxuh2tXNDfmfHMNnG1eFPAbUj1UZwnn+H5kwHowknb1LgvLVBrqoag==", - "source": null -} \ No newline at end of file diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.0.1.0-canary.0.276.nupkg b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.0.1.0-canary.0.276.nupkg deleted file mode 100644 index 25c096ecb6..0000000000 Binary files a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.0.1.0-canary.0.276.nupkg and /dev/null differ diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.0.1.0-canary.0.276.nupkg.sha512 b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.0.1.0-canary.0.276.nupkg.sha512 deleted file mode 100644 index 87bf7bdd56..0000000000 --- a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.0.1.0-canary.0.276.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -Ws9CcKvUOsFM7jMwK9w7px5gdSylPMBxfxuh2tXNDfmfHMNnG1eFPAbUj1UZwnn+H5kwHowknb1LgvLVBrqoag== \ No newline at end of file diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/.nupkg.metadata b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/.nupkg.metadata new file mode 100644 index 0000000000..2682a6e309 --- /dev/null +++ b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "LAAfOtWvcjoCxUq47BGbwfFst12nsvd3FYDRR9OUfSp69BzevNp3bhAd5O2sdaspBg9MkuOD5Mhp8TvWRHCG7g==", + "source": null +} \ No newline at end of file diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.0.1.0-canary.0.277.nupkg b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.0.1.0-canary.0.277.nupkg new file mode 100644 index 0000000000..9670f77b2f Binary files /dev/null and b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.0.1.0-canary.0.277.nupkg differ diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.0.1.0-canary.0.277.nupkg.sha512 b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.0.1.0-canary.0.277.nupkg.sha512 new file mode 100644 index 0000000000..8c50222a4d --- /dev/null +++ b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.0.1.0-canary.0.277.nupkg.sha512 @@ -0,0 +1 @@ +LAAfOtWvcjoCxUq47BGbwfFst12nsvd3FYDRR9OUfSp69BzevNp3bhAd5O2sdaspBg9MkuOD5Mhp8TvWRHCG7g== \ No newline at end of file diff --git a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.nuspec b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.nuspec similarity index 87% rename from packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.nuspec rename to packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.nuspec index 8be0c5d858..b7b488105d 100644 --- a/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.276/opensearch.opensearch.ephemeral.nuspec +++ b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/opensearch.opensearch.ephemeral.nuspec @@ -2,7 +2,7 @@ OpenSearch.OpenSearch.Ephemeral - 0.1.0-canary.0.276 + 0.1.0-canary.0.277 OpenSearch Project and contributors Apache-2.0 https://licenses.nuget.org/Apache-2.0 @@ -12,15 +12,15 @@ https://github.com/opensearch-project/opensearch-net-abstractions/releases OpenSearch opensearch,opensearch,cluster,ephemeral - + - + - + diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/.nupkg.metadata b/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/.nupkg.metadata deleted file mode 100644 index ebdfc2d320..0000000000 --- a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/.nupkg.metadata +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 2, - "contentHash": "hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ==", - "source": null -} \ No newline at end of file diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.0.1.0-canary.0.276.nupkg b/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.0.1.0-canary.0.276.nupkg deleted file mode 100644 index 3b9112396f..0000000000 Binary files a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.0.1.0-canary.0.276.nupkg and /dev/null differ diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.0.1.0-canary.0.276.nupkg.sha512 b/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.0.1.0-canary.0.276.nupkg.sha512 deleted file mode 100644 index 9c4b439618..0000000000 --- a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.0.1.0-canary.0.276.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ== \ No newline at end of file diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/.nupkg.metadata b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/.nupkg.metadata new file mode 100644 index 0000000000..29676671e5 --- /dev/null +++ b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "BoLSf2fiCphayR0TQulvm0m0MISy8kCL+JrPv1QGrlR4YujWAeSi0izb+vnYEWT9+a8IviTMjU2TGZwpcKSuBQ==", + "source": null +} \ No newline at end of file diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.0.1.0-canary.0.277.nupkg b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.0.1.0-canary.0.277.nupkg new file mode 100644 index 0000000000..e3d3ed9cb5 Binary files /dev/null and b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.0.1.0-canary.0.277.nupkg differ diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.0.1.0-canary.0.277.nupkg.sha512 b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.0.1.0-canary.0.277.nupkg.sha512 new file mode 100644 index 0000000000..f746c3041f --- /dev/null +++ b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.0.1.0-canary.0.277.nupkg.sha512 @@ -0,0 +1 @@ +BoLSf2fiCphayR0TQulvm0m0MISy8kCL+JrPv1QGrlR4YujWAeSi0izb+vnYEWT9+a8IviTMjU2TGZwpcKSuBQ== \ No newline at end of file diff --git a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.nuspec b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.nuspec similarity index 80% rename from packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.nuspec rename to packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.nuspec index 9412c75125..cdce4e4f2a 100644 --- a/packages/opensearch.opensearch.managed/0.1.0-canary.0.276/opensearch.opensearch.managed.nuspec +++ b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/opensearch.opensearch.managed.nuspec @@ -2,7 +2,7 @@ OpenSearch.OpenSearch.Managed - 0.1.0-canary.0.276 + 0.1.0-canary.0.277 OpenSearch Project and contributors Apache-2.0 https://licenses.nuget.org/Apache-2.0 @@ -13,17 +13,17 @@ https://github.com/opensearch-project/opensearch-net-abstractions/releases OpenSearch opensearch,opensearch,cluster,observable,rx - + - + - + - + - + diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/.nupkg.metadata b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/.nupkg.metadata deleted file mode 100644 index 90bc53d054..0000000000 --- a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/.nupkg.metadata +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 2, - "contentHash": "1aQCdd2GmlKonog5nLXyDNL0obTtGRSlb2UW6NE6nHEsp4G0yQo9GbrY647lFpLH9MCuzeL6jkXjervzfZL1cQ==", - "source": null -} \ No newline at end of file diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.0.1.0-canary.0.276.nupkg b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.0.1.0-canary.0.276.nupkg deleted file mode 100644 index bbb555bc56..0000000000 Binary files a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.0.1.0-canary.0.276.nupkg and /dev/null differ diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.0.1.0-canary.0.276.nupkg.sha512 b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.0.1.0-canary.0.276.nupkg.sha512 deleted file mode 100644 index 25ba66e5bb..0000000000 --- a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.0.1.0-canary.0.276.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -1aQCdd2GmlKonog5nLXyDNL0obTtGRSlb2UW6NE6nHEsp4G0yQo9GbrY647lFpLH9MCuzeL6jkXjervzfZL1cQ== \ No newline at end of file diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/.nupkg.metadata b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/.nupkg.metadata new file mode 100644 index 0000000000..0655ab5d1a --- /dev/null +++ b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "hNAJp5xM9ounExLOS+CmLCTCwpPfirZ5rOTY0UfR2AU+19wp4HLKerwjmJV4cAJM0ba6JvzrjLQcnMGYazM0og==", + "source": null +} \ No newline at end of file diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.0.1.0-canary.0.277.nupkg b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.0.1.0-canary.0.277.nupkg new file mode 100644 index 0000000000..faa8dad276 Binary files /dev/null and b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.0.1.0-canary.0.277.nupkg differ diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.0.1.0-canary.0.277.nupkg.sha512 b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.0.1.0-canary.0.277.nupkg.sha512 new file mode 100644 index 0000000000..0c5d0e4e03 --- /dev/null +++ b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.0.1.0-canary.0.277.nupkg.sha512 @@ -0,0 +1 @@ +hNAJp5xM9ounExLOS+CmLCTCwpPfirZ5rOTY0UfR2AU+19wp4HLKerwjmJV4cAJM0ba6JvzrjLQcnMGYazM0og== \ No newline at end of file diff --git a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.nuspec b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.nuspec similarity index 77% rename from packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.nuspec rename to packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.nuspec index a3fdd3fb65..960998d72f 100644 --- a/packages/opensearch.opensearch.xunit/0.1.0-canary.0.276/opensearch.opensearch.xunit.nuspec +++ b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/opensearch.opensearch.xunit.nuspec @@ -2,7 +2,7 @@ OpenSearch.OpenSearch.Xunit - 0.1.0-canary.0.276 + 0.1.0-canary.0.277 OpenSearch Project and contributors Apache-2.0 https://licenses.nuget.org/Apache-2.0 @@ -12,15 +12,15 @@ https://github.com/opensearch-project/opensearch-net-abstractions/releases OpenSearch opensearch,opensearch,xunit,cluster,integration,test,ephemeral - + - - + + - - + + diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/.nupkg.metadata b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/.nupkg.metadata deleted file mode 100644 index 0499644337..0000000000 --- a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/.nupkg.metadata +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 2, - "contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==", - "source": null -} \ No newline at end of file diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.0.1.0-canary.0.276.nupkg b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.0.1.0-canary.0.276.nupkg deleted file mode 100644 index a37f287cfb..0000000000 Binary files a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.0.1.0-canary.0.276.nupkg and /dev/null differ diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.0.1.0-canary.0.276.nupkg.sha512 b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.0.1.0-canary.0.276.nupkg.sha512 deleted file mode 100644 index 8d51a0c5b9..0000000000 --- a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.0.1.0-canary.0.276.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA== \ No newline at end of file diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/.nupkg.metadata b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/.nupkg.metadata new file mode 100644 index 0000000000..8ee0ba03ee --- /dev/null +++ b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "S3Mxf2FhxL/WJg9f0LGoGLmpvRyFCH0HitsC3bDAgBweO9aqSNmpVeAm7DvKHMwGpSAglUL0+pOBvo2dCi/iVg==", + "source": null +} \ No newline at end of file diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.0.1.0-canary.0.277.nupkg b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.0.1.0-canary.0.277.nupkg new file mode 100644 index 0000000000..f3c5816750 Binary files /dev/null and b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.0.1.0-canary.0.277.nupkg differ diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.0.1.0-canary.0.277.nupkg.sha512 b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.0.1.0-canary.0.277.nupkg.sha512 new file mode 100644 index 0000000000..b66a0f389c --- /dev/null +++ b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.0.1.0-canary.0.277.nupkg.sha512 @@ -0,0 +1 @@ +S3Mxf2FhxL/WJg9f0LGoGLmpvRyFCH0HitsC3bDAgBweO9aqSNmpVeAm7DvKHMwGpSAglUL0+pOBvo2dCi/iVg== \ No newline at end of file diff --git a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.nuspec b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.nuspec similarity index 66% rename from packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.nuspec rename to packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.nuspec index e0274794c9..0abde4ec4c 100644 --- a/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.276/opensearch.stack.artifactsapi.nuspec +++ b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/opensearch.stack.artifactsapi.nuspec @@ -2,7 +2,7 @@ OpenSearch.Stack.ArtifactsApi - 0.1.0-canary.0.276 + 0.1.0-canary.0.277 OpenSearch Project and contributors Apache-2.0 https://licenses.nuget.org/Apache-2.0 @@ -12,15 +12,19 @@ https://github.com/opensearch-project/opensearch-net-abstractions/releases OpenSearch opensearch,opensearch,stack,versioning,artifacts - + - + + + - + + + diff --git a/src/ApiGenerator/ApiGenerator.csproj b/src/ApiGenerator/ApiGenerator.csproj index 84b1e0d811..7702656963 100644 --- a/src/ApiGenerator/ApiGenerator.csproj +++ b/src/ApiGenerator/ApiGenerator.csproj @@ -9,15 +9,13 @@ true - + - - - + diff --git a/src/ApiGenerator/Domain/Code/CsharpNames.cs b/src/ApiGenerator/Domain/Code/CsharpNames.cs index 94012c6e5e..f247b4cdde 100644 --- a/src/ApiGenerator/Domain/Code/CsharpNames.cs +++ b/src/ApiGenerator/Domain/Code/CsharpNames.cs @@ -120,7 +120,7 @@ public string PerPathMethodName(string path) var method = MethodName; // This is temporary for transition period - // TODO: remove in master once master in opensearch is scrubbed + // TODO: remove in branch once it in opensearch is scrubbed if (path.Contains("{type}") && !method.Contains("Type")) method += "UsingType"; if (ms("Indices") && !pc("{index}")) diff --git a/src/ApiGenerator/RestSpecification/Core/cat.allocation.json b/src/ApiGenerator/RestSpecification/Core/cat.allocation.json index ee0f9e4f9a..6616747970 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.allocation.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.allocation.json @@ -61,6 +61,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.cluster_manager.json b/src/ApiGenerator/RestSpecification/Core/cat.cluster_manager.json new file mode 100644 index 0000000000..5056437c26 --- /dev/null +++ b/src/ApiGenerator/RestSpecification/Core/cat.cluster_manager.json @@ -0,0 +1,73 @@ +{ + "cat.cluster_manager":{ + "documentation":{ + "url":"https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/", + "description":"Returns information about the cluster_manager node. Introduced in OpenSearch 2.0 instead of cat-master." + }, + "stability":"stable", + "visibility":"public", + "headers":{ + "accept": [ "text/plain", "application/json"] + }, + "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 + } + } + } +} diff --git a/src/ApiGenerator/RestSpecification/Core/cat.indices.json b/src/ApiGenerator/RestSpecification/Core/cat.indices.json index 9c15424353..1f6ad64e01 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.indices.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.indices.json @@ -61,6 +61,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.master.json b/src/ApiGenerator/RestSpecification/Core/cat.master.json index a7affe954e..26e0d29110 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.master.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.master.json @@ -1,8 +1,8 @@ { "cat.master":{ "documentation":{ - "url":"https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/", - "description":"Returns information about the master node." + "url":"https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/", + "description":"Returns information about the master node. Deprecated as of OpenSearch 2.0, use cat-cluster_manager instead." }, "stability":"stable", "visibility":"public", diff --git a/src/ApiGenerator/RestSpecification/Core/cat.nodeattrs.json b/src/ApiGenerator/RestSpecification/Core/cat.nodeattrs.json index 0c04977377..61aa48cd6e 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.nodeattrs.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.nodeattrs.json @@ -32,6 +32,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.nodes.json b/src/ApiGenerator/RestSpecification/Core/cat.nodes.json index 9143293aae..3e6d9e1f2e 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.nodes.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.nodes.json @@ -49,6 +49,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json b/src/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json index 385125a9ee..8164f6c004 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json @@ -32,6 +32,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.plugins.json b/src/ApiGenerator/RestSpecification/Core/cat.plugins.json index 18aea3f816..fd25b004c8 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.plugins.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.plugins.json @@ -32,6 +32,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.repositories.json b/src/ApiGenerator/RestSpecification/Core/cat.repositories.json index adcdae4dbd..294bedc001 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.repositories.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.repositories.json @@ -33,6 +33,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.shards.json b/src/ApiGenerator/RestSpecification/Core/cat.shards.json index 5f6f3a820c..7241591b38 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.shards.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.shards.json @@ -61,6 +61,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.snapshots.json b/src/ApiGenerator/RestSpecification/Core/cat.snapshots.json index c9f94abe36..ce8e73d29e 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.snapshots.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.snapshots.json @@ -45,6 +45,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.templates.json b/src/ApiGenerator/RestSpecification/Core/cat.templates.json index 4512354e0c..d1dfdb95df 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.templates.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.templates.json @@ -44,6 +44,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cat.thread_pool.json b/src/ApiGenerator/RestSpecification/Core/cat.thread_pool.json index fb7e8a53f6..8279f0b7bc 100644 --- a/src/ApiGenerator/RestSpecification/Core/cat.thread_pool.json +++ b/src/ApiGenerator/RestSpecification/Core/cat.thread_pool.json @@ -44,6 +44,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "h":{ "type":"list", "description":"Comma-separated list of column names to display" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.delete_component_template.json b/src/ApiGenerator/RestSpecification/Core/cluster.delete_component_template.json index 0db5cdafa3..b4ee56dab7 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.delete_component_template.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.delete_component_template.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.exists_component_template.json b/src/ApiGenerator/RestSpecification/Core/cluster.exists_component_template.json index c28443242e..64679d2e6b 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.exists_component_template.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.exists_component_template.json @@ -30,6 +30,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.get_component_template.json b/src/ApiGenerator/RestSpecification/Core/cluster.get_component_template.json index c2fb719e18..6e3329031a 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.get_component_template.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.get_component_template.json @@ -36,6 +36,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.get_settings.json b/src/ApiGenerator/RestSpecification/Core/cluster.get_settings.json index 8d58018591..d329a8df2b 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.get_settings.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.get_settings.json @@ -28,6 +28,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.health.json b/src/ApiGenerator/RestSpecification/Core/cluster.health.json index fc8f6c9d15..4aefa8d302 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.health.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.health.json @@ -62,6 +62,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.pending_tasks.json b/src/ApiGenerator/RestSpecification/Core/cluster.pending_tasks.json index 5e44b238fe..176385d912 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.pending_tasks.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.pending_tasks.json @@ -26,7 +26,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.put_component_template.json b/src/ApiGenerator/RestSpecification/Core/cluster.put_component_template.json index 6c24d247ac..50eed63d39 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.put_component_template.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.put_component_template.json @@ -39,7 +39,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.put_settings.json b/src/ApiGenerator/RestSpecification/Core/cluster.put_settings.json index 653ab997c8..32ae4c3ac2 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.put_settings.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.put_settings.json @@ -29,6 +29,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.reroute.json b/src/ApiGenerator/RestSpecification/Core/cluster.reroute.json index 099e33eaac..14b75a551a 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.reroute.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.reroute.json @@ -50,6 +50,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/cluster.state.json b/src/ApiGenerator/RestSpecification/Core/cluster.state.json index 8eede2d2a3..89767d4dc8 100644 --- a/src/ApiGenerator/RestSpecification/Core/cluster.state.json +++ b/src/ApiGenerator/RestSpecification/Core/cluster.state.json @@ -74,7 +74,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "flat_settings":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/dangling_indices.delete_dangling_index.json b/src/ApiGenerator/RestSpecification/Core/dangling_indices.delete_dangling_index.json index 6f789a5018..13670576c3 100644 --- a/src/ApiGenerator/RestSpecification/Core/dangling_indices.delete_dangling_index.json +++ b/src/ApiGenerator/RestSpecification/Core/dangling_indices.delete_dangling_index.json @@ -34,9 +34,13 @@ "type": "time", "description": "Explicit operation timeout" }, - "master_timeout": { - "type": "time", - "description": "Specify timeout for connection to master" + "master_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/dangling_indices.import_dangling_index.json b/src/ApiGenerator/RestSpecification/Core/dangling_indices.import_dangling_index.json index 3f7ad7139a..64c0568eb7 100644 --- a/src/ApiGenerator/RestSpecification/Core/dangling_indices.import_dangling_index.json +++ b/src/ApiGenerator/RestSpecification/Core/dangling_indices.import_dangling_index.json @@ -34,9 +34,13 @@ "type": "time", "description": "Explicit operation timeout" }, - "master_timeout": { - "type": "time", - "description": "Specify timeout for connection to master" + "master_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/delete_script.json b/src/ApiGenerator/RestSpecification/Core/delete_script.json index 1699b7f24f..36b76fb222 100644 --- a/src/ApiGenerator/RestSpecification/Core/delete_script.json +++ b/src/ApiGenerator/RestSpecification/Core/delete_script.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/features.get_features.json b/src/ApiGenerator/RestSpecification/Core/features.get_features.json index 023c24a29c..3ad4adc3a9 100644 --- a/src/ApiGenerator/RestSpecification/Core/features.get_features.json +++ b/src/ApiGenerator/RestSpecification/Core/features.get_features.json @@ -23,6 +23,10 @@ "master_timeout":{ "type":"time", "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/get_script.json b/src/ApiGenerator/RestSpecification/Core/get_script.json index ade8ac8d17..b99b5d3cf1 100644 --- a/src/ApiGenerator/RestSpecification/Core/get_script.json +++ b/src/ApiGenerator/RestSpecification/Core/get_script.json @@ -28,7 +28,11 @@ "params":{ "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/indices.add_block.json b/src/ApiGenerator/RestSpecification/Core/indices.add_block.json index 4d45d76a63..f63cfab61e 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.add_block.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.add_block.json @@ -36,7 +36,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "ignore_unavailable":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.clone.json b/src/ApiGenerator/RestSpecification/Core/indices.clone.json index ef25339b15..d200c10b85 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.clone.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.clone.json @@ -36,9 +36,13 @@ "type" : "time", "description" : "Explicit operation timeout" }, - "master_timeout": { - "type" : "time", - "description" : "Specify timeout for connection to master" + "master_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "wait_for_active_shards": { "type" : "string", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.close.json b/src/ApiGenerator/RestSpecification/Core/indices.close.json index 21e48de027..75ac41325e 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.close.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.close.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "ignore_unavailable":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.create.json b/src/ApiGenerator/RestSpecification/Core/indices.create.json index b91adef4b4..02ddc9c760 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.create.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.create.json @@ -41,7 +41,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/indices.delete.json b/src/ApiGenerator/RestSpecification/Core/indices.delete.json index ba7d4a3df7..2ba5dda8c3 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.delete.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.delete.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "ignore_unavailable":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.delete_alias.json b/src/ApiGenerator/RestSpecification/Core/indices.delete_alias.json index de9ba85b09..6b3a133166 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.delete_alias.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.delete_alias.json @@ -52,7 +52,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/indices.delete_index_template.json b/src/ApiGenerator/RestSpecification/Core/indices.delete_index_template.json index c10502ff00..3fd849a339 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.delete_index_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.delete_index_template.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/indices.delete_template.json b/src/ApiGenerator/RestSpecification/Core/indices.delete_template.json index 7ea4387626..f16a62f6cb 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.delete_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.delete_template.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/indices.exists_index_template.json b/src/ApiGenerator/RestSpecification/Core/indices.exists_index_template.json index f426ed9fac..762477a23f 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.exists_index_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.exists_index_template.json @@ -34,6 +34,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/indices.exists_template.json b/src/ApiGenerator/RestSpecification/Core/indices.exists_template.json index 0a0809d064..d04305300c 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.exists_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.exists_template.json @@ -34,6 +34,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/indices.get.json b/src/ApiGenerator/RestSpecification/Core/indices.get.json index a38002e985..ad98d5b660 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.get.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.get.json @@ -65,7 +65,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/indices.get_index_template.json b/src/ApiGenerator/RestSpecification/Core/indices.get_index_template.json index 90cc1bb5b6..a8392a1d8a 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.get_index_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.get_index_template.json @@ -40,6 +40,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/indices.get_mapping.json b/src/ApiGenerator/RestSpecification/Core/indices.get_mapping.json index d4a499b83b..7e29e1d29d 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.get_mapping.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.get_mapping.json @@ -58,7 +58,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/indices.get_settings.json b/src/ApiGenerator/RestSpecification/Core/indices.get_settings.json index 3807432a20..39fb4847f3 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.get_settings.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.get_settings.json @@ -62,7 +62,11 @@ "params":{ "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "ignore_unavailable":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.get_template.json b/src/ApiGenerator/RestSpecification/Core/indices.get_template.json index e3725cfe6c..66cb7a73ff 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.get_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.get_template.json @@ -44,6 +44,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/indices.open.json b/src/ApiGenerator/RestSpecification/Core/indices.open.json index 3976fd7640..3c094844af 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.open.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.open.json @@ -32,7 +32,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "ignore_unavailable":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.put_alias.json b/src/ApiGenerator/RestSpecification/Core/indices.put_alias.json index b980184a39..c45f0aa36f 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.put_alias.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.put_alias.json @@ -55,7 +55,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/indices.put_index_template.json b/src/ApiGenerator/RestSpecification/Core/indices.put_index_template.json index d583491d93..4963df1614 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.put_index_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.put_index_template.json @@ -40,7 +40,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/indices.put_mapping.json b/src/ApiGenerator/RestSpecification/Core/indices.put_mapping.json index 436ee64773..7bc6e47cd4 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.put_mapping.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.put_mapping.json @@ -55,7 +55,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "ignore_unavailable":{ "type":"boolean", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.put_settings.json b/src/ApiGenerator/RestSpecification/Core/indices.put_settings.json index 46179797cc..09be5ce207 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.put_settings.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.put_settings.json @@ -35,7 +35,11 @@ "params":{ "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "timeout":{ "type":"time", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.put_template.json b/src/ApiGenerator/RestSpecification/Core/indices.put_template.json index 3476d8de6a..50d0034a75 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.put_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.put_template.json @@ -43,7 +43,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/indices.rollover.json b/src/ApiGenerator/RestSpecification/Core/indices.rollover.json index 6c3d8d810c..9d43a18fd6 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.rollover.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.rollover.json @@ -57,7 +57,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "wait_for_active_shards":{ "type":"string", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.shrink.json b/src/ApiGenerator/RestSpecification/Core/indices.shrink.json index ac90ee8fd0..16a781df6a 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.shrink.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.shrink.json @@ -40,9 +40,13 @@ "type" : "time", "description" : "Explicit operation timeout" }, - "master_timeout": { - "type" : "time", - "description" : "Specify timeout for connection to master" + "master_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "wait_for_active_shards": { "type" : "string", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.simulate_index_template.json b/src/ApiGenerator/RestSpecification/Core/indices.simulate_index_template.json index bea437c689..295a457442 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.simulate_index_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.simulate_index_template.json @@ -39,7 +39,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/indices.simulate_template.json b/src/ApiGenerator/RestSpecification/Core/indices.simulate_template.json index ebeac6d213..a6a8a23dd7 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.simulate_template.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.simulate_template.json @@ -45,7 +45,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/indices.split.json b/src/ApiGenerator/RestSpecification/Core/indices.split.json index 70eca76fa3..cc56dff46c 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.split.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.split.json @@ -40,9 +40,13 @@ "type" : "time", "description" : "Explicit operation timeout" }, - "master_timeout": { - "type" : "time", - "description" : "Specify timeout for connection to master" + "master_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "wait_for_active_shards": { "type" : "string", diff --git a/src/ApiGenerator/RestSpecification/Core/indices.update_aliases.json b/src/ApiGenerator/RestSpecification/Core/indices.update_aliases.json index e8a0a6bd57..7ef9f4a9e3 100644 --- a/src/ApiGenerator/RestSpecification/Core/indices.update_aliases.json +++ b/src/ApiGenerator/RestSpecification/Core/indices.update_aliases.json @@ -27,7 +27,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } }, "body":{ diff --git a/src/ApiGenerator/RestSpecification/Core/ingest.delete_pipeline.json b/src/ApiGenerator/RestSpecification/Core/ingest.delete_pipeline.json index 54911f6b47..b67eb57c3f 100644 --- a/src/ApiGenerator/RestSpecification/Core/ingest.delete_pipeline.json +++ b/src/ApiGenerator/RestSpecification/Core/ingest.delete_pipeline.json @@ -30,6 +30,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/ingest.get_pipeline.json b/src/ApiGenerator/RestSpecification/Core/ingest.get_pipeline.json index 7c7648ddb7..0c1d15854b 100644 --- a/src/ApiGenerator/RestSpecification/Core/ingest.get_pipeline.json +++ b/src/ApiGenerator/RestSpecification/Core/ingest.get_pipeline.json @@ -35,6 +35,10 @@ "master_timeout":{ "type":"time", "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/ingest.put_pipeline.json b/src/ApiGenerator/RestSpecification/Core/ingest.put_pipeline.json index a27ef63c2d..c01fb37d24 100644 --- a/src/ApiGenerator/RestSpecification/Core/ingest.put_pipeline.json +++ b/src/ApiGenerator/RestSpecification/Core/ingest.put_pipeline.json @@ -31,6 +31,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/put_script.json b/src/ApiGenerator/RestSpecification/Core/put_script.json index a0e2de556c..de125549c8 100644 --- a/src/ApiGenerator/RestSpecification/Core/put_script.json +++ b/src/ApiGenerator/RestSpecification/Core/put_script.json @@ -51,7 +51,11 @@ }, "master_timeout":{ "type":"time", - "description":"Specify timeout for connection to master" + "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" }, "context":{ "type":"string", diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.cleanup_repository.json b/src/ApiGenerator/RestSpecification/Core/snapshot.cleanup_repository.json index d5ebe950f4..9783af5d07 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.cleanup_repository.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.cleanup_repository.json @@ -27,12 +27,16 @@ }, "params": { "master_timeout": { - "type" : "time", - "description" : "Explicit operation timeout for connection to master node" + "type": "time", + "description": "Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout": { + "type": "time", + "description": "Explicit operation timeout for connection to cluster_manager_timeout node" }, "timeout": { - "type" : "time", - "description" : "Explicit operation timeout" + "type": "time", + "description": "Explicit operation timeout" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.clone.json b/src/ApiGenerator/RestSpecification/Core/snapshot.clone.json index 99dd1cad3a..c069bdcd5a 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.clone.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.clone.json @@ -38,7 +38,11 @@ "master_timeout":{ "type":"time", "description":"Explicit operation timeout for connection to master node" - } + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, }, "body":{ "description":"The snapshot clone definition", diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.create.json b/src/ApiGenerator/RestSpecification/Core/snapshot.create.json index e043331ae6..c05e4d650c 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.create.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.create.json @@ -36,6 +36,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "wait_for_completion":{ "type":"boolean", "description":"Should this request wait until the operation has completed before returning", diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.create_repository.json b/src/ApiGenerator/RestSpecification/Core/snapshot.create_repository.json index bc2193d577..b5d89f5282 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.create_repository.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.create_repository.json @@ -32,6 +32,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.delete.json b/src/ApiGenerator/RestSpecification/Core/snapshot.delete.json index 89d743f892..227d3aec7c 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.delete.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.delete.json @@ -33,6 +33,10 @@ "master_timeout":{ "type":"time", "description":"Explicit operation timeout for connection to master node" + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" } } } diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.delete_repository.json b/src/ApiGenerator/RestSpecification/Core/snapshot.delete_repository.json index c7a1048a70..4cbf5b31f5 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.delete_repository.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.delete_repository.json @@ -30,6 +30,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.get.json b/src/ApiGenerator/RestSpecification/Core/snapshot.get.json index c823922e81..7d526adcbc 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.get.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.get.json @@ -34,6 +34,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "ignore_unavailable":{ "type":"boolean", "description":"Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown" diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.get_repository.json b/src/ApiGenerator/RestSpecification/Core/snapshot.get_repository.json index c426ac2c7b..3a03941ed3 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.get_repository.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.get_repository.json @@ -36,6 +36,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "local":{ "type":"boolean", "description":"Return local information, do not retrieve the state from master node (default: false)" diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.restore.json b/src/ApiGenerator/RestSpecification/Core/snapshot.restore.json index 0f9a478ef6..630381ede2 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.restore.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.restore.json @@ -35,6 +35,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "wait_for_completion":{ "type":"boolean", "description":"Should this request wait until the operation has completed before returning", diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.status.json b/src/ApiGenerator/RestSpecification/Core/snapshot.status.json index 3563ea1a27..40acfc5521 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.status.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.status.json @@ -52,6 +52,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "ignore_unavailable":{ "type":"boolean", "description":"Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown" diff --git a/src/ApiGenerator/RestSpecification/Core/snapshot.verify_repository.json b/src/ApiGenerator/RestSpecification/Core/snapshot.verify_repository.json index 3efda79be2..b0d52a80ca 100644 --- a/src/ApiGenerator/RestSpecification/Core/snapshot.verify_repository.json +++ b/src/ApiGenerator/RestSpecification/Core/snapshot.verify_repository.json @@ -30,6 +30,10 @@ "type":"time", "description":"Explicit operation timeout for connection to master node" }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster_manager_timeout node" + }, "timeout":{ "type":"time", "description":"Explicit operation timeout" diff --git a/src/ApiGenerator/packages.lock.json b/src/ApiGenerator/packages.lock.json index 294ff8359d..42a66abd8e 100644 --- a/src/ApiGenerator/packages.lock.json +++ b/src/ApiGenerator/packages.lock.json @@ -14,11 +14,11 @@ }, "Microsoft.CodeAnalysis.CSharp": { "type": "Direct", - "requested": "[3.1.0-beta3-final, )", - "resolved": "3.1.0-beta3-final", - "contentHash": "jxtDD32QgtTJD60z9KrGw0+vXQBSR+wiqAL8I0XCswlkbI3DMoD1czHYNGuobr9IqTsTFdDb6abwEGYTr/4PvQ==", + "requested": "[4.2.0, )", + "resolved": "4.2.0", + "contentHash": "5IDwr8zGNBmDpxtzxxZj9IHwoA6HJ1/WWT/JacqPQJ4Vz/oZXaHNlzcBPVCZRGWUw+QvVdAhCKwEyJyuAuH/wg==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.1.0-beta3-final]" + "Microsoft.CodeAnalysis.Common": "[4.2.0]" } }, "Microsoft.NETFramework.ReferenceAssemblies": { @@ -33,25 +33,21 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "RazorLight.Unofficial": { + "RazorLight": { "type": "Direct", - "requested": "[2.0.0-beta1.3, )", - "resolved": "2.0.0-beta1.3", - "contentHash": "WJFjgKiHlli7iqxLiueomRPiIG3e6yGajJtA1tFcQwHpfytMec5l+2J0l1ghXv+GzByS5U51w2MOgoGFASg/UA==", + "requested": "[2.1.0, )", + "resolved": "2.1.0", + "contentHash": "WUJUsOJXUXrRpMrlWunn2QsOigF07S+lP2QxuOEBlfswDtuO4SAGaL97tOn0Hq24lMNqR4SWepOMj4Rlx+OfsQ==", "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Html.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Mvc.Razor.Extensions": "2.1.0", - "Microsoft.AspNetCore.Razor.Language": "2.1.0", - "Microsoft.AspNetCore.Razor.Runtime": "2.1.0", - "Microsoft.CodeAnalysis.Razor": "2.1.0", - "Microsoft.Extensions.Caching.Abstractions": "2.1.0", - "Microsoft.Extensions.Caching.Memory": "2.1.0", - "Microsoft.Extensions.DependencyInjection": "2.1.0", - "Microsoft.Extensions.DependencyModel": "2.1.0", - "Microsoft.Extensions.FileProviders.Physical": "2.1.0", - "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" + "Microsoft.AspNetCore.Mvc.Razor.Extensions": "5.0.0", + "Microsoft.CodeAnalysis.Razor": "5.0.0", + "Microsoft.Extensions.Caching.Abstractions": "5.0.0", + "Microsoft.Extensions.Caching.Memory": "5.0.0", + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.DependencyModel": "5.0.0", + "Microsoft.Extensions.FileProviders.Physical": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0", + "System.Buffers": "4.5.1" } }, "ShellProgressBar": { @@ -82,108 +78,47 @@ "System.CommandLine.Rendering": "0.3.0-alpha.20371.2" } }, - "Microsoft.AspNetCore.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "1TQgBfd/NPZLR2o/h6l5Cml2ZCF5hsyV4h9WEwWwAIavrbdTnaNozGGcTOd4AOgQvogMM9UM1ajflm9Cwd0jLQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.0" - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "YTKMi2vHX6P+WHEVpW/DS+eFHnwivCSMklkyamcK1ETtc/4j8H3VR0kgW8XIBqukNxhD8k5wYt22P7PhrWSXjQ==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - } - }, - "Microsoft.AspNetCore.Html.Abstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "RA/znq+vLku3uzSWSn7EddEV1Wrh9l1K/nhN02GKAYgbjm5ecWEyuXH6vFLp84TzZsBwh4OerZ3Q0S4WzxHc3g==", - "dependencies": { - "System.Text.Encodings.Web": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Abstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "vbFDyKsSYBnxl3+RABtN79b0vsTcG66fDY8vD6Nqvu9uLtSej70Q5NcbGlnN6bJpZci5orSdgFTHMhBywivDPg==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Features": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "UmkUePxRjsQW0j5euFFscBwjvTu25b8+qIK/2fI3GvcqQ+mkwgbWNAT8b/Gkoei1m2bTWC07lSdutuRDPPLcJA==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - } - }, "Microsoft.AspNetCore.Mvc.Razor.Extensions": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "894S6+TqW/kCTzXUtNwrH8c3oRGtYPopgPRa4m/5WHvtls1h6+scvWmZ0mqNSpfjxMVN/VFEouRHCVUq5DQUZg==", - "dependencies": { - "Microsoft.AspNetCore.Razor.Language": "2.1.0", - "Microsoft.CodeAnalysis.Razor": "2.1.0" - } - }, - "Microsoft.AspNetCore.Razor": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "xYMZg36TMyhiE8lrW13c0ZgQjqT9rLSHs3AM16PoXAX+wGcp7kfio+2H4E6rUjH2iibm3dcxWaZw2Dji0Xfa6g==", + "resolved": "5.0.0", + "contentHash": "+vVXw0oVVu5dnwseBxZFVeYZ0qPJTI03DTdghRKrcK+QhTM3Nu8orukKqdYObsI4mWZADE8wTILuYR5CowJr+w==", "dependencies": { - "Microsoft.AspNetCore.Html.Abstractions": "2.1.0" + "Microsoft.AspNetCore.Razor.Language": "5.0.0", + "Microsoft.CodeAnalysis.Razor": "5.0.0" } }, "Microsoft.AspNetCore.Razor.Language": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "cZz3JwbzTd4/6xLD2LsnTSVGmH15z4oWa2/40vrpjDa87siqG6xibF7z2s29oNsHFhFog2F+KqI0ay6Q6Dj1BA==" - }, - "Microsoft.AspNetCore.Razor.Runtime": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "tpBIKen4pJUAmYMGH72voZlyNgEy9s2IaOwZQ0/INiqlunZmG7ptvHs5Z6q+XTL1lX8bzKX5RgEH08NjL4zCdA==", - "dependencies": { - "Microsoft.AspNetCore.Html.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Razor": "2.1.0" - } + "resolved": "5.0.0", + "contentHash": "6yOBBASGfXMx1fY6hyjvG+oM3eR8vovIehDdEZW7jAV4gKlY4xuAvTm7Iw1fEq7KPunh2VrJwo7oRK1XxUn1OQ==" }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", - "resolved": "2.6.2-beta2", - "contentHash": "rg5Ql73AmGCMG5Q40Kzbndq7C7S4XvsJA+2QXfZBCy2dRqD+a7BSbx/3942EoRUJ/8Wh9+kLg2G2qC46o3f1Aw==" + "resolved": "3.3.3", + "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "3.1.0-beta3-final", - "contentHash": "u+acJkpsYVgInsiAchcRPnP5sKr9iCrJWvmX0VoKqzFWNfPltBjfF+aWESF2R0lifh8yAkL1BmGJSB3UMEc/SA==", + "resolved": "4.2.0", + "contentHash": "lbusGcuE7D8FtZawQ4G++UFsRQArPzZN1GGXjPQwu3gvCbw7FXDcBq1zDZrZN1vRzPTVe1qyZMvfGhVUzs1TDg==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.6.2-beta2", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.2", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.2" + "Microsoft.CodeAnalysis.Analyzers": "3.3.3", + "System.Collections.Immutable": "5.0.0", + "System.Memory": "4.5.4", + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encoding.CodePages": "6.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.CodeAnalysis.Razor": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "vZzi2Y+kvKAURFPJscERrGo1z72DnvN7oGLDAmaiwsqsF+jNu1IEu3cmjVpWb3LShQ9j5oHW5/ZuI3zXAJgpMA==", + "resolved": "5.0.0", + "contentHash": "s4u/6z/MQ35y/egrXf4WgJlUZf5GGvuba9mZ700dH4XxLBrA9Fw9kFZ8uymoATry7hwz5owvFhBVo+2VnoiGRg==", "dependencies": { - "Microsoft.AspNetCore.Razor.Language": "2.1.0", - "Microsoft.CodeAnalysis.CSharp": "2.8.0", - "Microsoft.CodeAnalysis.Common": "2.8.0" + "Microsoft.AspNetCore.Razor.Language": "5.0.0", + "Microsoft.CodeAnalysis.CSharp": "3.7.0", + "Microsoft.CodeAnalysis.Common": "3.7.0" } }, "Microsoft.CSharp": { @@ -191,174 +126,95 @@ "resolved": "4.4.1", "contentHash": "A5hI3gk6WpcBI0QGZY6/d5CCaYUxJgi7iENn1uYEng+Olo8RfI5ReGVkjXjeu3VR3srLvVYREATXa2M0X7FYJA==" }, - "Microsoft.DotNet.PlatformAbstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "9KPDwvb/hLEVXYruVHVZ8BkebC8j17DmPb56LnqRF74HqSPLjCkrlFUjOtFpQPA2DeADBRTI/e69aCfRBfrhxw==", - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } - }, "Microsoft.Extensions.Caching.Abstractions": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "R7uAb/JRwb9YQBB0qqLlX2qv4RBC/BqqIqFDqzvCjT0T2uPpbuTINLKGp+7uX2dbxjt3cpebSu5GvebeiKYpQA==", + "resolved": "5.0.0", + "contentHash": "bu8As90/SBAouMZ6fJ+qRNo1X+KgHGrVueFhhYi+E5WqEhcnp2HoWRFnMzXQ6g4RdZbvPowFerSbKNH4Dtg5yg==", "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.Caching.Memory": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "Jc1TrYtOxX9gsUXI4ZPVfPLI9aGjGTzVEs/qsBPw2GA+Td840YN4CvXCjgrLtWJckxl6KRNHgoYYBQgZZ/LTqg==", - "dependencies": { - "Microsoft.Extensions.Caching.Abstractions": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Options": "2.1.0" - } - }, - "Microsoft.Extensions.Configuration.Abstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "lMmUjAKvY9r6QmxCS15iSb6ulhwnh0zp44NtnVJ+HIDLFmu4iej41U+dU58On8NRezmlgRXiQtLnBeZSzYNKQg==", + "resolved": "5.0.0", + "contentHash": "/1qPCleFOkJe0O+xmFqCNLFYQZTJz965sVw8CUB/BQgsApBwzAUsL2BUkDvQW+geRUVTXUS9zLa0pBjC2VJ1gA==", "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" + "Microsoft.Extensions.Caching.Abstractions": "5.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", + "Microsoft.Extensions.Options": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "gqQviLfuA31PheEGi+XJoZc1bc9H9RsPa9Gq9XuDct7XGWSR9eVXjK5Sg7CSUPhTFHSuxUFY12wcTYLZ4zM1hg==", + "resolved": "5.0.0", + "contentHash": "Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "8/CtASu80UIoyG+r8FstrmZW5GLtXxzoYpjj3jV0FKZCL5CiFgSH3pAmqut/dC68mu7N1bU6v0UtKKL3gCUQGQ==" + "resolved": "5.0.0", + "contentHash": "ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==" }, "Microsoft.Extensions.DependencyModel": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "nS2XKqi+1A1umnYNLX2Fbm/XnzCxs5i+zXVJ3VC6r9t2z0NZr9FLnJN4VQpKigdcWH/iFTbMuX6M6WQJcTjVIg==", - "dependencies": { - "Microsoft.DotNet.PlatformAbstractions": "2.1.0", - "Newtonsoft.Json": "9.0.1", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Linq": "4.1.0" - } + "resolved": "5.0.0", + "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "itv+7XBu58pxi8mykxx9cUO1OOVYe0jmQIZVSZVp5lOcLxB7sSV2bnHiI1RSu6Nxne/s6+oBla3ON5CCMSmwhQ==", + "resolved": "5.0.0", + "contentHash": "iuZIiZ3mteEb+nsUqpGXKx2cGF+cv6gWPd5jqQI4hzqdiJ6I94ddLjKhQOuRW1lueHwocIw30xbSHGhQj0zjdQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "A9xLomqD4tNFqDfleapx2C14ZcSjCTzn/4Od0W/wBYdlLF2tYDJ204e75HjpWDVTkr03kgdZbM3QZ6ZeDsrBYg==", + "resolved": "5.0.0", + "contentHash": "1rkd8UO2qf21biwO7X0hL9uHP7vtfmdv/NLvKgCRHkdz1XnW8zVQJXyEYiN68WYpExgtVWn55QF0qBzgfh1mGg==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.FileSystemGlobbing": "2.1.0" + "Microsoft.Extensions.FileProviders.Abstractions": "5.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "JEwwhwbVTEXJu4W4l/FFx7FG9Fh5R8999mZl6qJImjM/LY4DxQsFYzpSkziMdY022n7TQpNUxJlH9bKZc7TqWw==" - }, - "Microsoft.Extensions.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "BpMaoBxdXr5VD0yk7rYN6R8lAU9X9JbvsPveNdKT+llIn3J5s4sxpWqaSG/NnzTzTLU5eJE5nrecTl7clg/7dQ==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.1.0" - } + "resolved": "5.0.0", + "contentHash": "ArliS8lGk8sWRtrWpqI8yUVYJpRruPjCDT+EIjrgkA/AAPRctlAkRISVZ334chAKktTLzD1+PK8F5IZpGedSqA==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "GfD2VtvN9z1W+m6pZZe98yh9VWTSdNY2dZSxtca9uFIY6aBI6twvskMvLO/ktClBOTQmAov/7Em+IWFlHepa0A==" + "resolved": "5.0.0", + "contentHash": "NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==" }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "VOM1pPMi9+7/4Vc9aPLU8btHOBQy1+AvpqxLxFI2OVtqGv+1klPaV59g9R6aSt2U7ijfB3TjvAO4Tc/cn9/hxA==", + "resolved": "5.0.0", + "contentHash": "CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Primitives": "2.1.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", + "Microsoft.Extensions.Primitives": "5.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "gMwH6wgWOPfyfLfMLEP+ZF7/MSJq35e0xxKEYUjt8veEznY45nBVqdfI876+9SFQq2ChcqKf2UyYc2XYj2v27w==", - "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - } - }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "2.1.2", - "contentHash": "mOJy3M0UN+LUG21dLGMxaWZEP6xYpQEpLuvuEQBaownaX4YuhH6NmNUlN9si+vNkAS6dwJ//N1O4DmLf2CikVg==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "QfS/nQI7k/BLgmLrw7qm7YBoULEvgWnPI+cYsbfCVFTW8Aj+i8JhccxcFMu1RWms0YZzF+UHguNBK4Qn89e2Sg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1" - } - }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", - "dependencies": { - "System.Runtime": "4.1.0" - } + "resolved": "5.0.0", + "contentHash": "cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==" }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==" }, "System.CommandLine": { "type": "Transitive", @@ -377,336 +233,33 @@ "System.CommandLine": "2.0.0-beta1.20371.2" } }, - "System.Diagnostics.Debug": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "w5U95fVKHY4G8ASs/K5iK3J5LY+/dLFd4vKejsnI/ZhBsWS9hQakfx3Zr7lRWKg4tAw9r4iktyvsTagWkqYCiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "System.Globalization": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "B95h0YLEL2oSnwF/XjqSWKnwKOy/01VWkNlsCeMTFJLLabflpGV26nK164eRs5GiaRSBGpOxQ3pKoSnnyZN5pg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3KlTJceQc3gnGIaHZ7UBZO26SHL1SHE4ddrmiwumFnId+CEHP+O8r386tZKaE6zlk5/mF8vifMBzHj9SaXN+mQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.IO.FileSystem": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.IO": "4.1.0", - "System.IO.FileSystem.Primitives": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Handles": "4.0.1", - "System.Text.Encoding": "4.0.11", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.IO.FileSystem.Primitives": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==", - "dependencies": { - "System.Runtime": "4.1.0" - } - }, - "System.Linq": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0" - } - }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.0.12", - "contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "JCKANJ0TI7kzoQzuwB/OoJANy1Lg338B6+JVacPl4TpUwi3cReg3nMLplMq2uqYfHFQpKIlHAUVAJlImZz/4ng==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.IO": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "dependencies": { - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "4inTox4wTBaDhB7V3mPvp9XlCbeGYWVEM9/fXALd52vNEAVisc1BoVWQPuUuD0Ga//dNbA/WeMy9u9mzLxGTHQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, - "System.Resources.ResourceManager": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "TxwVeUNoTgUOdQ09gfTjvW411MF+w9MBYL7AtNVc+HtBCFlutPLhUCdZjNkjbhj3bNQWMdHboF0KIWEOjJssbA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Globalization": "4.0.11", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "v6c/4Yaa9uWsq+JMhnOFewrYkgdNHNG2eMKuNqRn8P733rNXeRCGvV5FkkjBXn2dbVkPXOsO0xjsEeM1q2zC0g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1" - } + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.2", - "contentHash": "wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "CUOHjTT/vgP0qGW22U4/hDlOqXmcPq5YicBaXdUR2UiUoLwBT+olO6we4DVbq57jeX5uXH2uerVZhf0qGj+sVQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Handles": "4.0.1" - } - }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "U3gGeMlDZXxCEiY4DwVLSacg+DFWCvoiX+JThA/rvw37Sqrku7sEFeVBBBMBnfB6FeZHsyDx85HlKL19x0HtZA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.1.2", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==" - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "N+3xqIcg3VDKyjwwCGaZ9HawG9aC6cSDI+s7ROma310GQo8vilFZa86hqKppwTHleR/G0sfOzhvgnUxWCR/DrQ==", - "dependencies": { - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "k1S4Gc6IGwtHGT8188RSeGaX86Qw/wnrgNLshJvsdNUOPP9etMmo8S07c+UlOAx4K/xLuN9ivA1bD0LVurtIxQ==", + "resolved": "6.0.0", + "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.2", - "contentHash": "BG/TNxDFv0svAzx8OiMXDlsHfGw623BZ8tCXw4YLhDFDvDhNUEV58jKYMGRnkbJNm7c3JNNJDiN7JBMzxRBR2w==" + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, "Wcwidth": { "type": "Transitive", diff --git a/src/OpenSearch.Client.JsonNetSerializer/README.md b/src/OpenSearch.Client.JsonNetSerializer/README.md new file mode 100644 index 0000000000..7d4dbef40f --- /dev/null +++ b/src/OpenSearch.Client.JsonNetSerializer/README.md @@ -0,0 +1 @@ +An auxiliary library used by `OpenSearch.Client` to serialize and deserialize data. diff --git a/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json b/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json index c7c2b24dcd..43b55c4fcc 100644 --- a/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json +++ b/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json @@ -87,18 +87,18 @@ "resolved": "5.0.0", "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" }, - "opensearch.net": { + "opensearch.client": { "type": "Project", "dependencies": { - "Microsoft.CSharp": "4.6.0", - "System.Buffers": "4.5.1", - "System.Diagnostics.DiagnosticSource": "5.0.0" + "OpenSearch.Net": "1.0.0" } }, - "OpenSearch.Client": { + "opensearch.net": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "Microsoft.CSharp": "4.6.0", + "System.Buffers": "4.5.1", + "System.Diagnostics.DiagnosticSource": "5.0.0" } } }, @@ -295,6 +295,12 @@ "System.Runtime": "4.3.0" } }, + "opensearch.client": { + "type": "Project", + "dependencies": { + "OpenSearch.Net": "1.0.0" + } + }, "opensearch.net": { "type": "Project", "dependencies": { @@ -304,12 +310,6 @@ "System.Reflection.Emit": "4.3.0", "System.Reflection.Emit.Lightweight": "4.3.0" } - }, - "OpenSearch.Client": { - "type": "Project", - "dependencies": { - "OpenSearch.Net": "1.0.0" - } } } } diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs new file mode 100644 index 0000000000..b42831d6b7 --- /dev/null +++ b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs @@ -0,0 +1,51 @@ +/* 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 +{ + /// + /// See docs here + /// + /// Introduced in OpenSearch 2.0 instead of + [DataContract] + public class CatClusterManagerRecord : ICatRecord + { + [DataMember(Name ="id")] + public string Id { get; set; } + + [DataMember(Name ="ip")] + public string Ip { get; set; } + + [DataMember(Name ="host")] + public string Host { get; set; } + + [DataMember(Name ="node")] + public string Node { get; set; } + } +} diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs new file mode 100644 index 0000000000..169635ca7f --- /dev/null +++ b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs @@ -0,0 +1,39 @@ +/* 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")] + ///Introduced in OpenSearch 2.0 instead of + public partial interface ICatClusterManagerRequest { } + + ///Introduced in OpenSearch 2.0 instead of + public partial class CatClusterManagerRequest { } + + ///Introduced in OpenSearch 2.0 instead of + public partial class CatClusterManagerDescriptor { } +} diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs index 3e15275b57..e82bc67f11 100644 --- a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs +++ b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs @@ -29,6 +29,10 @@ namespace OpenSearch.Client { + /// + /// See docs here + /// + /// Deprecated as of OpenSearch 2.0, use instead [DataContract] public class CatMasterRecord : ICatRecord { @@ -38,6 +42,9 @@ public class CatMasterRecord : ICatRecord [DataMember(Name ="ip")] public string Ip { get; set; } + [DataMember(Name ="host")] + public string Host { get; set; } + [DataMember(Name ="node")] public string Node { get; set; } } diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs index bb5190346d..f71200effc 100644 --- a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs +++ b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs @@ -28,9 +28,12 @@ namespace OpenSearch.Client { [MapsApi("cat.master.json")] + /// Deprecated as of OpenSearch 2.0, use instead public partial interface ICatMasterRequest { } + /// Deprecated as of OpenSearch 2.0, use instead public partial class CatMasterRequest { } + /// Deprecated as of OpenSearch 2.0, use instead public partial class CatMasterDescriptor { } } diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs index 95011ee750..c87692ee26 100644 --- a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs +++ b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs @@ -33,6 +33,7 @@ namespace OpenSearch.Client public class CatNodesRecord : ICatRecord { public string Build => _b ?? _build; + public string ClusterManager => Master ?? _cm ?? _cluster_manager; public string CompletionSize => _completionSize ?? _cs ?? _completion_size; [DataMember(Name ="cpu")] @@ -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; } diff --git a/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs b/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs index eee21ac68b..482dd8a754 100644 --- a/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs +++ b/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs @@ -44,9 +44,14 @@ public class ClusterStateResponse : DynamicResponseBase [DataMember(Name = "cluster_uuid")] public string ClusterUUID => State.Get("cluster_uuid"); + ///Deprecated as of OpenSearch 2.0, use instead [DataMember(Name = "master_node")] public string MasterNode => State.Get("master_node"); + ///Introduced in OpenSearch 2.0 instead of + [DataMember(Name = "cluster_manager_node")] + public string ClusterManagerNode => State.Get("cluster_manager_node"); + [DataMember(Name = "state_uuid")] public string StateUUID => State.Get("state_uuid"); diff --git a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs index 5cefeb7ddf..4a7d7dfd02 100644 --- a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs +++ b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs @@ -237,6 +237,10 @@ public class ClusterOperatingSystemName [DataContract] public class ClusterNodeCount { + ///Introduced in OpenSearch 2.0 instead of + [DataMember(Name = "cluster_manager")] + public int ClusterManager { get; internal set; } + [DataMember(Name = "coordinating_only")] public int CoordinatingOnly { get; internal set; } @@ -246,6 +250,7 @@ public class ClusterNodeCount [DataMember(Name = "ingest")] public int Ingest { get; internal set; } + ///Deprecated as of OpenSearch 2.0, use instead [DataMember(Name = "master")] public int Master { get; internal set; } diff --git a/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs b/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs index c240f4cd86..e109e15cc8 100644 --- a/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs +++ b/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs @@ -33,9 +33,14 @@ namespace OpenSearch.Client [StringEnum] public enum NodeRole { + ///Deprecated as of OpenSearch 2.0, use instead [EnumMember(Value = "master")] Master, + ///Introduced in OpenSearch 2.0 instead of + [EnumMember(Value = "cluster_manager")] + ClusterManager, + [EnumMember(Value = "data")] Data, diff --git a/src/OpenSearch.Client/CommonAbstractions/SerializationBehavior/JsonFormatters/SingleOrEnumerableFormatter.cs b/src/OpenSearch.Client/CommonAbstractions/SerializationBehavior/JsonFormatters/SingleOrEnumerableFormatter.cs index 477df9ed2b..e77fa877fb 100644 --- a/src/OpenSearch.Client/CommonAbstractions/SerializationBehavior/JsonFormatters/SingleOrEnumerableFormatter.cs +++ b/src/OpenSearch.Client/CommonAbstractions/SerializationBehavior/JsonFormatters/SingleOrEnumerableFormatter.cs @@ -54,7 +54,7 @@ public void Serialize(ref JsonWriter writer, IEnumerable value, IJsonFormatte } // TODO investigate this is really needed - // only used in one place and on master this is already gone + // only used in one place and on main branch this is already gone internal class SerializeAsSingleFormatter : IJsonFormatter> { public IEnumerable Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver) diff --git a/src/OpenSearch.Client/CommonOptions/Stats/SegmentsStats.cs b/src/OpenSearch.Client/CommonOptions/Stats/SegmentsStats.cs index a3cf237aa7..6ff6ccc3e5 100644 --- a/src/OpenSearch.Client/CommonOptions/Stats/SegmentsStats.cs +++ b/src/OpenSearch.Client/CommonOptions/Stats/SegmentsStats.cs @@ -30,6 +30,10 @@ namespace OpenSearch.Client { + /// + /// OpenSearch 2.0 has Lucene upgraded up to version 9.0 which doesn't provide memory info for segments. + /// All fields except `count` might be zeroed. + /// [DataContract] public class SegmentsStats { diff --git a/src/OpenSearch.Client/Descriptors.Cat.cs b/src/OpenSearch.Client/Descriptors.Cat.cs index b515cb7789..57a4d5370c 100644 --- a/src/OpenSearch.Client/Descriptors.Cat.cs +++ b/src/OpenSearch.Client/Descriptors.Cat.cs @@ -84,7 +84,7 @@ public CatAliasesDescriptor(Names name): base(r => r.Optional("name", name)) public CatAliasesDescriptor Headers(params string[] headers) => Qs("h", headers); ///Return help information public CatAliasesDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatAliasesDescriptor Local(bool? local = true) => Qs("local", local); ///Comma-separated list of column names or column aliases to sort by public CatAliasesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); @@ -120,10 +120,14 @@ public CatAllocationDescriptor(NodeIds nodeId): base(r => r.Optional("node_id", public CatAllocationDescriptor Headers(params string[] headers) => Qs("h", headers); ///Return help information public CatAllocationDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatAllocationDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatAllocationDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatAllocationDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatAllocationDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -274,10 +278,14 @@ public CatIndicesDescriptor Index() public CatIndicesDescriptor Help(bool? help = true) => Qs("help", help); ///If set to true segment stats will include stats for segments that are not currently loaded into memory public CatIndicesDescriptor IncludeUnloadedSegments(bool? includeunloadedsegments = true) => Qs("include_unloaded_segments", includeunloadedsegments); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatIndicesDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatIndicesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatIndicesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Set to true to return stats only for primary shards public CatIndicesDescriptor Pri(bool? pri = true) => Qs("pri", pri); ///Comma-separated list of column names or column aliases to sort by @@ -286,7 +294,8 @@ public CatIndicesDescriptor Index() public CatIndicesDescriptor Verbose(bool? verbose = true) => Qs("v", verbose); } - ///Descriptor for Master https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + ///Descriptor for Master https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + ///Deprecated as of OpenSearch 2.0, use instead public partial class CatMasterDescriptor : RequestDescriptorBase, ICatMasterRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.CatMaster; @@ -298,7 +307,7 @@ public partial class CatMasterDescriptor : RequestDescriptorBase Qs("h", headers); ///Return help information public CatMasterDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatMasterDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node public CatMasterDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); @@ -308,6 +317,29 @@ public partial class CatMasterDescriptor : RequestDescriptorBase Qs("v", verbose); } + ///Descriptor for Master https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + ///Introduced in OpenSearch 2.0 instead of + public partial class CatClusterManagerDescriptor : RequestDescriptorBase, ICatClusterManagerRequest + { + internal override ApiUrls ApiUrls => ApiUrlsLookups.CatClusterManager; + // values part of the url path + // Request parameters + ///a short version of the Accept header, e.g. json, yaml + public CatClusterManagerDescriptor Format(string format) => Qs("format", format); + ///Comma-separated list of column names to display + public CatClusterManagerDescriptor Headers(params string[] headers) => Qs("h", headers); + ///Return help information + public CatClusterManagerDescriptor Help(bool? help = true) => Qs("help", help); + ///Return local information, do not retrieve the state from cluster_manager node (default: false) + public CatClusterManagerDescriptor Local(bool? local = true) => Qs("local", local); + ///Explicit operation timeout for connection to cluster_manager node + public CatClusterManagerDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); + ///Comma-separated list of column names or column aliases to sort by + public CatClusterManagerDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); + ///Verbose mode. Display column headers + public CatClusterManagerDescriptor Verbose(bool? verbose = true) => Qs("v", verbose); + } + ///Descriptor for NodeAttributes https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/ public partial class CatNodeAttributesDescriptor : RequestDescriptorBase, ICatNodeAttributesRequest { @@ -320,10 +352,14 @@ public partial class CatNodeAttributesDescriptor : RequestDescriptorBase Qs("h", headers); ///Return help information public CatNodeAttributesDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatNodeAttributesDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatNodeAttributesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatNodeAttributesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatNodeAttributesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -347,7 +383,11 @@ public partial class CatNodesDescriptor : RequestDescriptorBaseReturn help information public CatNodesDescriptor Help(bool? help = true) => Qs("help", help); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatNodesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatNodesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatNodesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -366,10 +406,14 @@ public partial class CatPendingTasksDescriptor : RequestDescriptorBase Qs("h", headers); ///Return help information public CatPendingTasksDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatPendingTasksDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatPendingTasksDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatPendingTasksDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatPendingTasksDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -390,10 +434,14 @@ public partial class CatPluginsDescriptor : RequestDescriptorBase Qs("help", help); ///Include bootstrap plugins in the response public CatPluginsDescriptor IncludeBootstrap(bool? includebootstrap = true) => Qs("include_bootstrap", includebootstrap); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatPluginsDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatPluginsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatPluginsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatPluginsDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -455,10 +503,14 @@ public partial class CatRepositoriesDescriptor : RequestDescriptorBase Qs("h", headers); ///Return help information public CatRepositoriesDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node + ///Return local information, do not retrieve the state from cluster_manager node public CatRepositoriesDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatRepositoriesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatRepositoriesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatRepositoriesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -537,10 +589,14 @@ public CatShardsDescriptor Index() public CatShardsDescriptor Headers(params string[] headers) => Qs("h", headers); ///Return help information public CatShardsDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatShardsDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatShardsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatShardsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatShardsDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -576,7 +632,11 @@ public CatSnapshotsDescriptor(Names repository): base(r => r.Optional("repositor ///Set to true to ignore unavailable snapshots public CatSnapshotsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatSnapshotsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatSnapshotsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatSnapshotsDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -635,10 +695,14 @@ public CatTemplatesDescriptor(Name name): base(r => r.Optional("name", name)) public CatTemplatesDescriptor Headers(params string[] headers) => Qs("h", headers); ///Return help information public CatTemplatesDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatTemplatesDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatTemplatesDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatTemplatesDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatTemplatesDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers @@ -671,10 +735,14 @@ public CatThreadPoolDescriptor(Names threadPoolPatterns): base(r => r.Optional(" public CatThreadPoolDescriptor Headers(params string[] headers) => Qs("h", headers); ///Return help information public CatThreadPoolDescriptor Help(bool? help = true) => Qs("help", help); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public CatThreadPoolDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CatThreadPoolDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CatThreadPoolDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Comma-separated list of column names or column aliases to sort by public CatThreadPoolDescriptor SortByColumns(params string[] sortbycolumns) => Qs("s", sortbycolumns); ///Verbose mode. Display column headers diff --git a/src/OpenSearch.Client/Descriptors.Cluster.cs b/src/OpenSearch.Client/Descriptors.Cluster.cs index 92d1d3e12c..a49cfbebdf 100644 --- a/src/OpenSearch.Client/Descriptors.Cluster.cs +++ b/src/OpenSearch.Client/Descriptors.Cluster.cs @@ -89,7 +89,11 @@ public partial class ClusterGetSettingsDescriptor : RequestDescriptorBaseWhether to return all default clusters setting. public ClusterGetSettingsDescriptor IncludeDefaults(bool? includedefaults = true) => Qs("include_defaults", includedefaults); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ClusterGetSettingsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ClusterGetSettingsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public ClusterGetSettingsDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -123,10 +127,14 @@ public ClusterHealthDescriptor Index() public ClusterHealthDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Specify the level of detail for returned information public ClusterHealthDescriptor Level(Level? level) => Qs("level", level); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public ClusterHealthDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ClusterHealthDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ClusterHealthDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public ClusterHealthDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Wait until the specified number of shards is active @@ -149,10 +157,14 @@ public partial class ClusterPendingTasksDescriptor : RequestDescriptorBase ApiUrlsLookups.ClusterPendingTasks; // values part of the url path // Request parameters - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public ClusterPendingTasksDescriptor Local(bool? local = true) => Qs("local", local); - ///Specify timeout for connection to master + ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ClusterPendingTasksDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ClusterPendingTasksDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for PostVotingConfigExclusions @@ -178,7 +190,11 @@ public partial class ClusterPutSettingsDescriptor : RequestDescriptorBaseReturn settings in flat format (default: false) public ClusterPutSettingsDescriptor FlatSettings(bool? flatsettings = true) => Qs("flat_settings", flatsettings); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ClusterPutSettingsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ClusterPutSettingsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public ClusterPutSettingsDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -202,7 +218,11 @@ public partial class ClusterRerouteDescriptor : RequestDescriptorBaseReturn an explanation of why the commands can or cannot be executed public ClusterRerouteDescriptor Explain(bool? explain = true) => Qs("explain", explain); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ClusterRerouteDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ClusterRerouteDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Limit the information returned to the specified metrics. Defaults to all but metadata public ClusterRerouteDescriptor Metric(params string[] metric) => Qs("metric", metric); ///Retries allocation of shards that are blocked due to too many subsequent allocation failures @@ -254,10 +274,14 @@ public ClusterStateDescriptor Index() public ClusterStateDescriptor FlatSettings(bool? flatsettings = true) => Qs("flat_settings", flatsettings); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public ClusterStateDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public ClusterStateDescriptor Local(bool? local = true) => Qs("local", local); - ///Specify timeout for connection to master + ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ClusterStateDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ClusterStateDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Wait for the metadata version to be equal or greater than the specified metadata version public ClusterStateDescriptor WaitForMetadataVersion(long? waitformetadataversion) => Qs("wait_for_metadata_version", waitformetadataversion); ///The maximum time to wait for wait_for_metadata_version before timing out diff --git a/src/OpenSearch.Client/Descriptors.DanglingIndices.cs b/src/OpenSearch.Client/Descriptors.DanglingIndices.cs index cd99fb3377..15bf3c7c79 100644 --- a/src/OpenSearch.Client/Descriptors.DanglingIndices.cs +++ b/src/OpenSearch.Client/Descriptors.DanglingIndices.cs @@ -77,8 +77,12 @@ protected DeleteDanglingIndexDescriptor(): base() // Request parameters ///Must be set to true in order to delete the dangling index public DeleteDanglingIndexDescriptor AcceptDataLoss(bool? acceptdataloss = true) => Qs("accept_data_loss", acceptdataloss); - ///Specify timeout for connection to master + ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteDanglingIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteDanglingIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public DeleteDanglingIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -104,8 +108,12 @@ protected ImportDanglingIndexDescriptor(): base() // Request parameters ///Must be set to true in order to import the dangling index public ImportDanglingIndexDescriptor AcceptDataLoss(bool? acceptdataloss = true) => Qs("accept_data_loss", acceptdataloss); - ///Specify timeout for connection to master + ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ImportDanglingIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ImportDanglingIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public ImportDanglingIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } diff --git a/src/OpenSearch.Client/Descriptors.Indices.cs b/src/OpenSearch.Client/Descriptors.Indices.cs index 719b81abe2..8cc3c4f1f8 100644 --- a/src/OpenSearch.Client/Descriptors.Indices.cs +++ b/src/OpenSearch.Client/Descriptors.Indices.cs @@ -90,8 +90,12 @@ public AddIndexBlockDescriptor Index() public AddIndexBlockDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public AddIndexBlockDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public AddIndexBlockDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public AddIndexBlockDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public AddIndexBlockDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -191,8 +195,12 @@ protected CloneIndexDescriptor(): base() public CloneIndexDescriptor Index() where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Required("index", (IndexName)v)); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CloneIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CloneIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public CloneIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Set the number of active shards to wait for on the cloned index before the operation returns. @@ -231,8 +239,12 @@ public CloseIndexDescriptor Index() public CloseIndexDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public CloseIndexDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CloseIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CloseIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public CloseIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Sets the number of active shards to wait for before the operation returns. @@ -264,9 +276,14 @@ public CreateIndexDescriptor Index() where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Required("index", (IndexName)v)); // Request parameters ///Whether a type should be expected in the body of the mappings. + ///Deprecated as of OpenSearch 2.0 public CreateIndexDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CreateIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CreateIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public CreateIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Set the number of active shards to wait for before the operation returns. @@ -305,8 +322,12 @@ public DeleteIndexDescriptor Index() public DeleteIndexDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Ignore unavailable indexes (default: false) public DeleteIndexDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public DeleteIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -339,8 +360,12 @@ public DeleteAliasDescriptor Index() ///A shortcut into calling Index(Indices.All) public DeleteAliasDescriptor AllIndices() => Index(Indices.All); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteAliasDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteAliasDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit timestamp for the document public DeleteAliasDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -364,8 +389,12 @@ protected DeleteIndexTemplateDescriptor(): base() // values part of the url path Name IDeleteIndexTemplateRequest.Name => Self.RouteValues.Get("name"); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteIndexTemplateDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteIndexTemplateDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public DeleteIndexTemplateDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -406,7 +435,7 @@ public IndexExistsDescriptor Index() public IndexExistsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Whether to return all default setting for each of the indices. public IndexExistsDescriptor IncludeDefaults(bool? includedefaults = true) => Qs("include_defaults", includedefaults); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public IndexExistsDescriptor Local(bool? local = true) => Qs("local", local); } @@ -450,7 +479,7 @@ public AliasExistsDescriptor Index() public AliasExistsDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public AliasExistsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public AliasExistsDescriptor Local(bool? local = true) => Qs("local", local); } @@ -475,13 +504,19 @@ protected IndexTemplateExistsDescriptor(): base() // Request parameters ///Return settings in flat format (default: false) public IndexTemplateExistsDescriptor FlatSettings(bool? flatsettings = true) => Qs("flat_settings", flatsettings); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public IndexTemplateExistsDescriptor Local(bool? local = true) => Qs("local", local); - ///Explicit operation timeout for connection to master node + ///Specify timeout for connection to master node + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public IndexTemplateExistsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public IndexTemplateExistsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for TypeExists https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/exists/ + ///Deprecated as of OpenSearch 2.0 public partial class TypeExistsDescriptor : RequestDescriptorBase, ITypeExistsRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.IndicesTypeExists; @@ -515,7 +550,7 @@ public TypeExistsDescriptor Index() public TypeExistsDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public TypeExistsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public TypeExistsDescriptor Local(bool? local = true) => Qs("local", local); } @@ -632,11 +667,16 @@ public GetIndexDescriptor Index() ///Whether to return all default setting for each of the indices. public GetIndexDescriptor IncludeDefaults(bool? includedefaults = true) => Qs("include_defaults", includedefaults); ///Whether to add the type name to the response (default: false) + ///Deprecated as of OpenSearch 2.0 public GetIndexDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public GetIndexDescriptor Local(bool? local = true) => Qs("local", local); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for GetAlias https://opensearch.org/docs/latest/opensearch/rest-api/alias/ @@ -686,7 +726,7 @@ public GetAliasDescriptor Index() public GetAliasDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public GetAliasDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public GetAliasDescriptor Local(bool? local = true) => Qs("local", local); } @@ -733,8 +773,9 @@ public GetFieldMappingDescriptor Index() ///Whether the default mapping values should be returned as well public GetFieldMappingDescriptor IncludeDefaults(bool? includedefaults = true) => Qs("include_defaults", includedefaults); ///Whether a type should be returned in the body of the mappings. + ///Deprecated as of OpenSearch 2.0 public GetFieldMappingDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public GetFieldMappingDescriptor Local(bool? local = true) => Qs("local", local); } @@ -770,9 +811,14 @@ public GetMappingDescriptor Index() ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public GetMappingDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Whether to add the type name to the response (default: false) + ///Deprecated as of OpenSearch 2.0 public GetMappingDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetMappingDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetMappingDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for GetSettings @@ -826,10 +872,14 @@ public GetIndexSettingsDescriptor Index() public GetIndexSettingsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Whether to return all default setting for each of the indices. public GetIndexSettingsDescriptor IncludeDefaults(bool? includedefaults = true) => Qs("include_defaults", includedefaults); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public GetIndexSettingsDescriptor Local(bool? local = true) => Qs("local", local); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetIndexSettingsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetIndexSettingsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for GetTemplate https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-templates/ @@ -855,11 +905,17 @@ public GetIndexTemplateDescriptor(Names name): base(r => r.Optional("name", name ///Return settings in flat format (default: false) public GetIndexTemplateDescriptor FlatSettings(bool? flatsettings = true) => Qs("flat_settings", flatsettings); ///Whether a type should be returned in the body of the mappings. + ///Deprecated as of OpenSearch 2.0 public GetIndexTemplateDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public GetIndexTemplateDescriptor Local(bool? local = true) => Qs("local", local); - ///Explicit operation timeout for connection to master node + ///Specify timeout for connection to master node + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetIndexTemplateDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetIndexTemplateDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for Open https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/close-index/ @@ -894,8 +950,12 @@ public OpenIndexDescriptor Index() public OpenIndexDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public OpenIndexDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public OpenIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public OpenIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public OpenIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Sets the number of active shards to wait for before the operation returns. @@ -930,8 +990,12 @@ public PutAliasDescriptor Index() ///A shortcut into calling Index(Indices.All) public PutAliasDescriptor AllIndices() => Index(Indices.All); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public PutAliasDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public PutAliasDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit timestamp for the document public PutAliasDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -968,9 +1032,14 @@ public PutMappingDescriptor Index() ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public PutMappingDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Whether a type should be expected in the body of the mappings. + ///Deprecated as of OpenSearch 2.0 public PutMappingDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public PutMappingDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public PutMappingDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public PutMappingDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///When true, applies mappings only to the write index of an alias @@ -1010,8 +1079,12 @@ public UpdateIndexSettingsDescriptor Index() public UpdateIndexSettingsDescriptor FlatSettings(bool? flatsettings = true) => Qs("flat_settings", flatsettings); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public UpdateIndexSettingsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public UpdateIndexSettingsDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public UpdateIndexSettingsDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Whether to update existing settings. If set to `true` existing settings on an index remain unchanged, the default is `false` public UpdateIndexSettingsDescriptor PreserveExisting(bool? preserveexisting = true) => Qs("preserve_existing", preserveexisting); ///Explicit operation timeout @@ -1040,9 +1113,14 @@ protected PutIndexTemplateDescriptor(): base() ///Whether the index template should only be added if new or can also replace an existing one public PutIndexTemplateDescriptor Create(bool? create = true) => Qs("create", create); ///Whether a type should be returned in the body of the mappings. + ///Deprecated as of OpenSearch 2.0 public PutIndexTemplateDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public PutIndexTemplateDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public PutIndexTemplateDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for Refresh https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/get-documents/ @@ -1133,9 +1211,14 @@ protected RolloverIndexDescriptor(): base() ///If set to true the rollover action will only be validated but not actually performed even if a condition matches. The default is false public RolloverIndexDescriptor DryRun(bool? dryrun = true) => Qs("dry_run", dryrun); ///Whether a type should be included in the body of the mappings. + ///Deprecated as of OpenSearch 2.0 public RolloverIndexDescriptor IncludeTypeName(bool? includetypename = true) => Qs("include_type_name", includetypename); - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public RolloverIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public RolloverIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public RolloverIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Set the number of active shards to wait for on the newly created rollover index before the operation returns. @@ -1203,8 +1286,12 @@ protected ShrinkIndexDescriptor(): base() public ShrinkIndexDescriptor Index() where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Required("index", (IndexName)v)); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public ShrinkIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public ShrinkIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public ShrinkIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Set the number of active shards to wait for on the shrunken index before the operation returns. @@ -1237,8 +1324,12 @@ protected SplitIndexDescriptor(): base() public SplitIndexDescriptor Index() where TOther : class => Assign(typeof(TOther), (a, v) => a.RouteValues.Required("index", (IndexName)v)); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public SplitIndexDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public SplitIndexDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public SplitIndexDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Set the number of active shards to wait for on the shrunken index before the operation returns. @@ -1251,8 +1342,12 @@ public partial class BulkAliasDescriptor : RequestDescriptorBase ApiUrlsLookups.IndicesBulkAlias; // values part of the url path // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public BulkAliasDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public BulkAliasDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Request timeout public BulkAliasDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } diff --git a/src/OpenSearch.Client/Descriptors.Ingest.cs b/src/OpenSearch.Client/Descriptors.Ingest.cs index 3d03919f49..d3bfa39e0f 100644 --- a/src/OpenSearch.Client/Descriptors.Ingest.cs +++ b/src/OpenSearch.Client/Descriptors.Ingest.cs @@ -76,7 +76,11 @@ protected DeletePipelineDescriptor(): base() Id IDeletePipelineRequest.Id => Self.RouteValues.Get("id"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeletePipelineDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeletePipelineDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public DeletePipelineDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -102,7 +106,11 @@ public GetPipelineDescriptor(Id id): base(r => r.Optional("id", id)) public GetPipelineDescriptor Id(Id id) => Assign(id, (a, v) => a.RouteValues.Optional("id", v)); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetPipelineDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetPipelineDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for GrokProcessorPatterns @@ -133,7 +141,11 @@ protected PutPipelineDescriptor(): base() Id IPutPipelineRequest.Id => Self.RouteValues.Get("id"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public PutPipelineDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public PutPipelineDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public PutPipelineDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } diff --git a/src/OpenSearch.Client/Descriptors.NoNamespace.cs b/src/OpenSearch.Client/Descriptors.NoNamespace.cs index 251c2e022b..bc85a863fe 100644 --- a/src/OpenSearch.Client/Descriptors.NoNamespace.cs +++ b/src/OpenSearch.Client/Descriptors.NoNamespace.cs @@ -440,8 +440,12 @@ protected DeleteScriptDescriptor(): base() // values part of the url path Id IDeleteScriptRequest.Id => Self.RouteValues.Get("id"); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteScriptDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteScriptDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public DeleteScriptDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -781,8 +785,12 @@ protected GetScriptDescriptor(): base() // values part of the url path Id IGetScriptRequest.Id => Self.RouteValues.Get("id"); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetScriptDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetScriptDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for Source https://opensearch.org/docs/latest/opensearch/rest-api/document-apis/get-documents/ @@ -1154,8 +1162,12 @@ protected PutScriptDescriptor(): base() ///Script context public PutScriptDescriptor Context(Name context) => Assign(context, (a, v) => a.RouteValues.Optional("context", v)); // Request parameters - ///Specify timeout for connection to master + ///Specify timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public PutScriptDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Specify timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public PutScriptDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public PutScriptDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -1367,7 +1379,7 @@ public SearchShardsDescriptor Index() public SearchShardsDescriptor ExpandWildcards(ExpandWildcards? expandwildcards) => Qs("expand_wildcards", expandwildcards); ///Whether specified concrete indices should be ignored when unavailable (missing or closed) public SearchShardsDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public SearchShardsDescriptor Local(bool? local = true) => Qs("local", local); ///Specify the node or shard the operation should be performed on (default: random) public SearchShardsDescriptor Preference(string preference) => Qs("preference", preference); diff --git a/src/OpenSearch.Client/Descriptors.Snapshot.cs b/src/OpenSearch.Client/Descriptors.Snapshot.cs index 483de32980..7bdbabdcf8 100644 --- a/src/OpenSearch.Client/Descriptors.Snapshot.cs +++ b/src/OpenSearch.Client/Descriptors.Snapshot.cs @@ -76,7 +76,11 @@ protected CleanupRepositoryDescriptor(): base() Name ICleanupRepositoryRequest.RepositoryName => Self.RouteValues.Get("repository"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CleanupRepositoryDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CleanupRepositoryDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public CleanupRepositoryDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -105,7 +109,11 @@ protected CloneSnapshotDescriptor(): base() Name ICloneSnapshotRequest.TargetSnapshot => Self.RouteValues.Get("target_snapshot"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CloneSnapshotDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CloneSnapshotDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for Snapshot https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-snapshots/ @@ -130,7 +138,11 @@ protected SnapshotDescriptor(): base() Name ISnapshotRequest.Snapshot => Self.RouteValues.Get("snapshot"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public SnapshotDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public SnapshotDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Should this request wait until the operation has completed before returning public SnapshotDescriptor WaitForCompletion(bool? waitforcompletion = true) => Qs("wait_for_completion", waitforcompletion); } @@ -155,7 +167,11 @@ protected CreateRepositoryDescriptor(): base() Name ICreateRepositoryRequest.RepositoryName => Self.RouteValues.Get("repository"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public CreateRepositoryDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public CreateRepositoryDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public CreateRepositoryDescriptor Timeout(Time timeout) => Qs("timeout", timeout); ///Whether to verify the repository after creation @@ -184,7 +200,11 @@ protected DeleteSnapshotDescriptor(): base() Name IDeleteSnapshotRequest.Snapshot => Self.RouteValues.Get("snapshot"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteSnapshotDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteSnapshotDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for DeleteRepository https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-snapshots/ @@ -207,7 +227,11 @@ protected DeleteRepositoryDescriptor(): base() Names IDeleteRepositoryRequest.RepositoryName => Self.RouteValues.Get("repository"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public DeleteRepositoryDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public DeleteRepositoryDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public DeleteRepositoryDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } @@ -236,7 +260,11 @@ protected GetSnapshotDescriptor(): base() ///Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown public GetSnapshotDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetSnapshotDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetSnapshotDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Whether to show verbose snapshot info or only show the basic info found in the repository index blob public GetSnapshotDescriptor Verbose(bool? verbose = true) => Qs("verbose", verbose); } @@ -261,10 +289,14 @@ public GetRepositoryDescriptor(Names repository): base(r => r.Optional("reposito ///A comma-separated list of repository names public GetRepositoryDescriptor RepositoryName(Names repository) => Assign(repository, (a, v) => a.RouteValues.Optional("repository", v)); // Request parameters - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public GetRepositoryDescriptor Local(bool? local = true) => Qs("local", local); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public GetRepositoryDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public GetRepositoryDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for Restore https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-snapshots/ @@ -289,7 +321,11 @@ protected RestoreDescriptor(): base() Name IRestoreRequest.Snapshot => Self.RouteValues.Get("snapshot"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public RestoreDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public RestoreDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Should this request wait until the operation has completed before returning public RestoreDescriptor WaitForCompletion(bool? waitforcompletion = true) => Qs("wait_for_completion", waitforcompletion); } @@ -327,7 +363,11 @@ public SnapshotStatusDescriptor(Name repository, Names snapshot): base(r => r.Op ///Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown public SnapshotStatusDescriptor IgnoreUnavailable(bool? ignoreunavailable = true) => Qs("ignore_unavailable", ignoreunavailable); ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public SnapshotStatusDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public SnapshotStatusDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); } ///Descriptor for VerifyRepository https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-snapshots/ @@ -350,7 +390,11 @@ protected VerifyRepositoryDescriptor(): base() Name IVerifyRepositoryRequest.RepositoryName => Self.RouteValues.Get("repository"); // Request parameters ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public VerifyRepositoryDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout); + ///Explicit operation timeout for connection to cluster_manager node + ///Introduced in OpenSearch 2.0 instead of + public VerifyRepositoryDescriptor ClusterManagerTimeout(Time timeout) => Qs("cluster_manager_timeout", timeout); ///Explicit operation timeout public VerifyRepositoryDescriptor Timeout(Time timeout) => Qs("timeout", timeout); } diff --git a/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs b/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs index b90e4b189e..eec9cb3a28 100644 --- a/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs +++ b/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs @@ -89,6 +89,7 @@ public abstract class BulkResponseItemBase /// /// The type against which the bulk operation ran /// + /// Deprecated as of OpenSearch 2.0 [DataMember(Name = "_type")] public string Type { get; internal set; } @@ -103,7 +104,7 @@ public bool IsValid { get { - if (Error != null || Type.IsNullOrEmpty()) return false; + if (Error != null) return false; switch (Operation.ToLowerInvariant()) { diff --git a/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs index 461355c5aa..00c786a691 100644 --- a/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs +++ b/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs @@ -27,10 +27,13 @@ namespace OpenSearch.Client { + ///Deprecated as of OpenSearch 2.0 [MapsApi("indices.exists_type.json")] public partial interface ITypeExistsRequest { } + ///Deprecated as of OpenSearch 2.0 public partial class TypeExistsRequest { } + ///Deprecated as of OpenSearch 2.0 public partial class TypeExistsDescriptor { } } diff --git a/src/OpenSearch.Client/Modules/Gateway/GatewaySettings.cs b/src/OpenSearch.Client/Modules/Gateway/GatewaySettings.cs index 28bf3c746d..a2338b0a14 100644 --- a/src/OpenSearch.Client/Modules/Gateway/GatewaySettings.cs +++ b/src/OpenSearch.Client/Modules/Gateway/GatewaySettings.cs @@ -25,6 +25,8 @@ * under the License. */ +using System; + namespace OpenSearch.Client { /// @@ -34,6 +36,7 @@ public class GatewaySettings public int? ExpectedDataNodes { get; internal set; } /// + [Obsolete] public int? ExpectedMasterNodes { get; internal set; } /// diff --git a/src/OpenSearch.Client/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs b/src/OpenSearch.Client/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs index bccf5261d2..a5e3532a86 100644 --- a/src/OpenSearch.Client/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs +++ b/src/OpenSearch.Client/Modules/SnapshotAndRestore/Repositories/FileSystemRepository.cs @@ -34,7 +34,7 @@ namespace OpenSearch.Client /// /// A snapshot repository that uses a shared file system to store snapshot data. /// The path specified in the location parameter should point to the same location in the shared - /// filesystem and be accessible on all data and master nodes. + /// filesystem and be accessible on all data and cluster_manager nodes. /// public interface IFileSystemRepository : IRepository { } diff --git a/src/OpenSearch.Client/OpenSearchClient.Cat.cs b/src/OpenSearch.Client/OpenSearchClient.Cat.cs index b2a797a361..81bd7ef387 100644 --- a/src/OpenSearch.Client/OpenSearchClient.Cat.cs +++ b/src/OpenSearch.Client/OpenSearchClient.Cat.cs @@ -233,28 +233,60 @@ internal CatNamespace(OpenSearchClient client): base(client) /// /// GET request to the cat.master API, read more about this API online: /// - /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + /// https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + /// Deprecated as of OpenSearch 2.0, use instead /// public CatResponse Master(Func selector = null) => Master(selector.InvokeOrDefault(new CatMasterDescriptor())); /// /// GET request to the cat.master API, read more about this API online: /// - /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + /// https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + /// Deprecated as of OpenSearch 2.0, use instead /// public Task> MasterAsync(Func selector = null, CancellationToken ct = default) => MasterAsync(selector.InvokeOrDefault(new CatMasterDescriptor()), ct); /// /// GET request to the cat.master API, read more about this API online: /// - /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + /// https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + /// Deprecated as of OpenSearch 2.0, use instead /// public CatResponse Master(ICatMasterRequest request) => DoCat(request); /// /// GET request to the cat.master API, read more about this API online: /// - /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + /// https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + /// Deprecated as of OpenSearch 2.0, use instead /// public Task> MasterAsync(ICatMasterRequest request, CancellationToken ct = default) => DoCatAsync(request, ct); /// + /// GET request to the cat.cluster_manager API, read more about this API online: + /// + /// https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/ + /// Introduced in OpenSearch 2.0 instead of + /// + public CatResponse ClusterManager(Func selector = null) => ClusterManager(selector.InvokeOrDefault(new CatClusterManagerDescriptor())); + /// + /// GET request to the cat.cluster_manager API, read more about this API online: + /// + /// https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/ + /// Introduced in OpenSearch 2.0 instead of + /// + public Task> ClusterManagerAsync(Func selector = null, CancellationToken ct = default) => ClusterManagerAsync(selector.InvokeOrDefault(new CatClusterManagerDescriptor()), ct); + /// + /// GET request to the cat.cluster_manager API, read more about this API online: + /// + /// https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/ + /// Introduced in OpenSearch 2.0 instead of + /// + public CatResponse ClusterManager(ICatClusterManagerRequest request) => DoCat(request); + /// + /// GET request to the cat.cluster_manager API, read more about this API online: + /// + /// https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/ + /// Introduced in OpenSearch 2.0 instead of + /// + public Task> ClusterManagerAsync(ICatClusterManagerRequest request, CancellationToken ct = default) => DoCatAsync(request, ct); + /// /// GET request to the cat.nodeattrs API, read more about this API online: /// /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodeattrs/ diff --git a/src/OpenSearch.Client/OpenSearchClient.Indices.cs b/src/OpenSearch.Client/OpenSearchClient.Indices.cs index ffaf29bb04..880108f2b5 100644 --- a/src/OpenSearch.Client/OpenSearchClient.Indices.cs +++ b/src/OpenSearch.Client/OpenSearchClient.Indices.cs @@ -355,24 +355,28 @@ internal IndicesNamespace(OpenSearchClient client): base(client) /// /// https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/exists/ /// + /// Deprecated as of OpenSearch 2.0 public ExistsResponse TypeExists(Indices index, Names type, Func selector = null) => TypeExists(selector.InvokeOrDefault(new TypeExistsDescriptor(index: index, type: type))); /// /// HEAD request to the indices.exists_type API, read more about this API online: /// /// https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/exists/ /// + /// Deprecated as of OpenSearch 2.0 public Task TypeExistsAsync(Indices index, Names type, Func selector = null, CancellationToken ct = default) => TypeExistsAsync(selector.InvokeOrDefault(new TypeExistsDescriptor(index: index, type: type)), ct); /// /// HEAD request to the indices.exists_type API, read more about this API online: /// /// https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/exists/ /// + /// Deprecated as of OpenSearch 2.0 public ExistsResponse TypeExists(ITypeExistsRequest request) => DoRequest(request, request.RequestParameters); /// /// HEAD request to the indices.exists_type API, read more about this API online: /// /// https://opensearch.org/docs/latest/opensearch/rest-api/index-apis/exists/ /// + /// Deprecated as of OpenSearch 2.0 public Task TypeExistsAsync(ITypeExistsRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); /// /// POST request to the indices.flush API, read more about this API online: diff --git a/src/OpenSearch.Client/README.md b/src/OpenSearch.Client/README.md new file mode 100644 index 0000000000..384d0ad630 --- /dev/null +++ b/src/OpenSearch.Client/README.md @@ -0,0 +1,3 @@ +`OpenSearch.Client` is a high level OpenSearch .NET client that maps closely to the original OpenSearch API. All requests and responses are exposed through types, making it easy for users to get up and running quickly. + +Under the covers, `OpenSearch.Client` uses the `OpenSearch.Net` low level client to dispatch requests and responses, using and extending many of the types within `OpenSearch.Net`. The low level client is exposed on the high level client through the `.LowLevel` property. diff --git a/src/OpenSearch.Client/Requests.Cat.cs b/src/OpenSearch.Client/Requests.Cat.cs index 902b6f09f1..da193c4adc 100644 --- a/src/OpenSearch.Client/Requests.Cat.cs +++ b/src/OpenSearch.Client/Requests.Cat.cs @@ -119,7 +119,7 @@ public bool? Help set => Q("help", value); } - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public bool? Local { get => Q("local"); @@ -203,7 +203,7 @@ public bool? Help set => Q("help", value); } - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public bool? Local { get => Q("local"); @@ -211,12 +211,21 @@ public bool? Local } ///Explicit operation timeout for connection to master node + ///Deprecated as of OpenSearch 2.0, use instead public Time MasterTimeout { get => Q + ///Request for Master https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + ///Deprecated as of OpenSearch 2.0, use instead public partial class CatMasterRequest : PlainRequestBase, ICatMasterRequest { protected ICatMasterRequest Self => this; @@ -621,7 +640,7 @@ public bool? Help set => Q("help", value); } - ///Return local information, do not retrieve the state from master node (default: false) + ///Return local information, do not retrieve the state from cluster_manager node (default: false) public bool? Local { get => Q("local"); @@ -650,6 +669,73 @@ public bool? Verbose } } + [InterfaceDataContract] + public partial interface ICatClusterManagerRequest : IRequest + { + } + + ///Request for ClusterManager https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/ + ///Introduced in OpenSearch 2.0 instead of + public partial class CatClusterManagerRequest : PlainRequestBase, ICatClusterManagerRequest + { + protected ICatClusterManagerRequest Self => this; + internal override ApiUrls ApiUrls => ApiUrlsLookups.CatClusterManager; + // values part of the url path + // Request parameters + ///a short version of the Accept header, e.g. json, yaml + public string Format + { + get => Q("format"); + set + { + Q("format", value); + SetAcceptHeader(value); + } + } + + ///Comma-separated list of column names to display + public string[] Headers + { + get => Q("h"); + set => Q("h", value); + } + + ///Return help information + public bool? Help + { + get => Q("help"); + set => Q("help", value); + } + + ///Return local information, do not retrieve the state from cluster_manager node (default: false) + public bool? Local + { + get => Q("local"); + set => Q("local", value); + } + + ///Explicit operation timeout for connection to cluster_manager node + public Time ClusterManagerTimeout + { + get => Q