diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index dc3f3f9647..8278e813ee 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: # 1.0.1 is skipped because it doesn't have a tag in OpenSearch repo, we can't check out to compile plugins - version: [1.3.1, 1.3.0, 1.2.4, 1.2.3, 1.2.2, 1.2.1, 1.2.0, 1.1.0, 1.0.0] + version: [2.0.0, 1.3.1, 1.3.0, 1.2.4, 1.2.3, 1.2.2, 1.2.1, 1.2.0, 1.1.0, 1.0.0] steps: # Due to https://github.com/opensearch-project/project-website/issues/737 diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json index 1784c943a0..a0fc9eb459 100644 --- a/build/scripts/packages.lock.json +++ b/build/scripts/packages.lock.json @@ -96,11 +96,11 @@ }, "OpenSearch.OpenSearch.Managed": { "type": "Direct", - "requested": "[0.1.0-canary.0.276, )", - "resolved": "0.1.0-canary.0.276", - "contentHash": "hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ==", + "requested": "[0.1.0-canary.0.277, )", + "resolved": "0.1.0-canary.0.277", + "contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.276", + "OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.277", "Proc": "0.6.1", "System.Net.Http": "4.3.1" } @@ -252,8 +252,8 @@ }, "OpenSearch.Stack.ArtifactsApi": { "type": "Transitive", - "resolved": "0.1.0-canary.0.276", - "contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==", + "resolved": "0.1.0-canary.0.277", + "contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==", "dependencies": { "SemanticVersioning": "0.8.0", "System.Text.Json": "4.6.0" diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index 7801ec9b8e..591560bc31 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..61d584244c --- /dev/null +++ b/packages/opensearch.opensearch.ephemeral/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg==", + "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..74db023a66 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..99cd72ad18 --- /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 @@ +76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg== \ 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..4ee713c4b6 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..37c35f2a70 --- /dev/null +++ b/packages/opensearch.opensearch.managed/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==", + "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..89ec751109 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..d03bbe7a2a --- /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 @@ +d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w== \ 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 87% 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..a1813f26b7 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,15 +13,15 @@ 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..f6c887f8f6 --- /dev/null +++ b/packages/opensearch.opensearch.xunit/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA==", + "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..2c7f6450c6 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..53eb6c5eec --- /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 @@ +ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA== \ 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 85% 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..bd512b9492 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,14 +12,14 @@ 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..3355d2a1ff --- /dev/null +++ b/packages/opensearch.stack.artifactsapi/0.1.0-canary.0.277/.nupkg.metadata @@ -0,0 +1,5 @@ +{ + "version": 2, + "contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==", + "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..f66a97410d 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..2cbf0e6b51 --- /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 @@ +xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg== \ 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 91% 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..176fb42ff3 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,7 +12,7 @@ https://github.com/opensearch-project/opensearch-net-abstractions/releases OpenSearch opensearch,opensearch,stack,versioning,artifacts - + 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..cd96038ad0 --- /dev/null +++ b/src/ApiGenerator/RestSpecification/Core/cat.cluster_manager.json @@ -0,0 +1,69 @@ +{ + "cat.cluster_manager":{ + "documentation":{ + "url":"https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/", + "description":"Returns information about the cluster-manager node." + }, + "stability":"stable", + "url":{ + "paths":[ + { + "path":"/_cat/cluster_manager", + "methods":[ + "GET" + ] + }, + { + "path":"/_cat/master", + "methods":[ + "GET" + ], + "deprecated":{ + "version":"2.0.0", + "description":"To promote inclusive language, please use '/_cat/cluster_manager' instead." + } + } + ] + }, + "params":{ + "format":{ + "type":"string", + "description":"a short version of the Accept header, e.g. json, yaml" + }, + "local":{ + "type":"boolean", + "description":"Return local information, do not retrieve the state from cluster-manager node (default: false)" + }, + "master_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to master node", + "deprecated":{ + "version":"2.0.0", + "description":"To promote inclusive language, use 'cluster_manager_timeout' instead." + } + }, + "cluster_manager_timeout":{ + "type":"time", + "description":"Explicit operation timeout for connection to cluster-manager node" + }, + "h":{ + "type":"list", + "description":"Comma-separated list of column names to display" + }, + "help":{ + "type":"boolean", + "description":"Return help information", + "default":false + }, + "s":{ + "type":"list", + "description":"Comma-separated list of column names or column aliases to sort by" + }, + "v":{ + "type":"boolean", + "description":"Verbose mode. Display column headers", + "default":false + } + } + } +} diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs new file mode 100644 index 0000000000..1f1717190b --- /dev/null +++ b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: Apache-2.0 +* +* The OpenSearch Contributors require contributions made to +* this file be licensed under the Apache-2.0 license or a +* compatible open source license. +* +* Modifications Copyright OpenSearch Contributors. See +* GitHub history for details. +* +* Licensed to Elasticsearch B.V. under one or more contributor +* license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright +* ownership. Elasticsearch B.V. licenses this file to you under +* the Apache License, Version 2.0 (the "License"); you may +* not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +using System.Runtime.Serialization; + +namespace OpenSearch.Client +{ + [DataContract] + public class CatClusterManagerRecord : ICatRecord + { + [DataMember(Name ="id")] + public string Id { get; set; } + + [DataMember(Name ="ip")] + public string Ip { get; set; } + + [DataMember(Name ="node")] + public string Node { get; set; } + } +} diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs new file mode 100644 index 0000000000..9b253256fd --- /dev/null +++ b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: Apache-2.0 +* +* The OpenSearch Contributors require contributions made to +* this file be licensed under the Apache-2.0 license or a +* compatible open source license. +* +* Modifications Copyright OpenSearch Contributors. See +* GitHub history for details. +* +* Licensed to Elasticsearch B.V. under one or more contributor +* license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright +* ownership. Elasticsearch B.V. licenses this file to you under +* the Apache License, Version 2.0 (the "License"); you may +* not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +namespace OpenSearch.Client +{ + [MapsApi("cat.cluster_manager.json")] + public partial interface ICatClusterManagerRequest { } + + public partial class CatClusterManagerRequest { } + + public partial class CatClusterManagerDescriptor { } +} diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs index 95011ee750..71a3cb84d2 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 => _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/ClusterStats/ClusterNodesStats.cs b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs index 5cefeb7ddf..749580b1f2 100644 --- a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs +++ b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs @@ -237,6 +237,9 @@ public class ClusterOperatingSystemName [DataContract] public class ClusterNodeCount { + [DataMember(Name = "cluster_manager")] + public int ClusterManager { get; internal set; } + [DataMember(Name = "coordinating_only")] public int CoordinatingOnly { get; internal set; } diff --git a/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs b/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs index c240f4cd86..5c4cf6ecf5 100644 --- a/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs +++ b/src/OpenSearch.Client/Cluster/NodesInfo/NodeRole.cs @@ -36,6 +36,9 @@ public enum NodeRole [EnumMember(Value = "master")] Master, + [EnumMember(Value = "cluster_manager")] + ClusterManager, + [EnumMember(Value = "data")] Data, 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..296e346c5e 100644 --- a/src/OpenSearch.Client/Descriptors.Cat.cs +++ b/src/OpenSearch.Client/Descriptors.Cat.cs @@ -286,7 +286,11 @@ 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/latest/opensearch/rest-api/cat/cat-master/ + /// Replaced by in OpenSearch 2.0 + /// public partial class CatMasterDescriptor : RequestDescriptorBase, ICatMasterRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.CatMaster; @@ -308,6 +312,31 @@ public partial class CatMasterDescriptor : RequestDescriptorBase Qs("v", verbose); } + /// + /// Descriptor for cluster_manager + /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-cluster_manager/ + /// + 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 master node (default: false) + public CatClusterManagerDescriptor Local(bool? local = true) => Qs("local", local); + ///Explicit operation timeout for connection to master node + public CatClusterManagerDescriptor ClusterManagerTimeout(Time mastertimeout) => Qs("cluster_manager_timeout", mastertimeout); + ///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 { diff --git a/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs b/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs index b90e4b189e..bd0df9a0a1 100644 --- a/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs +++ b/src/OpenSearch.Client/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs @@ -103,7 +103,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/OpenSearchClient.Cat.cs b/src/OpenSearch.Client/OpenSearchClient.Cat.cs index b2a797a361..94578e0816 100644 --- a/src/OpenSearch.Client/OpenSearchClient.Cat.cs +++ b/src/OpenSearch.Client/OpenSearchClient.Cat.cs @@ -234,27 +234,55 @@ 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/ + /// Replaced by in OpenSearch 2.0 /// 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/ + /// Replaced by in OpenSearch 2.0 /// 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/ + /// Replaced by in OpenSearch 2.0 /// 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/ + /// Replaced by in OpenSearch 2.0 /// 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/latest/opensearch/rest-api/cat/cat-cluster_manager/ + /// + 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/latest/opensearch/rest-api/cat/cat-cluster_manager/ + /// + 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/latest/opensearch/rest-api/cat/cat-cluster_manager/ + /// + 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/latest/opensearch/rest-api/cat/cat-cluster_manager/ + /// + 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/Requests.Cat.cs b/src/OpenSearch.Client/Requests.Cat.cs index 902b6f09f1..53ac454cb3 100644 --- a/src/OpenSearch.Client/Requests.Cat.cs +++ b/src/OpenSearch.Client/Requests.Cat.cs @@ -589,7 +589,10 @@ public partial interface ICatMasterRequest : IRequestRequest for Master https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + /// Request for Master + /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/ + /// Replaced by in OpenSearch 2.0 + /// public partial class CatMasterRequest : PlainRequestBase, ICatMasterRequest { protected ICatMasterRequest Self => this; @@ -650,6 +653,74 @@ public bool? Verbose } } + [InterfaceDataContract] + public partial interface ICatClusterManagerRequest : IRequest + { + } + + /// Request for ClusterManager + /// https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-cluster_manager/ + /// + 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