Merge branch 'main' into fix/namespacing/ingest

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · May 10, 2023 · 87ffe07 · 87ffe07
2 parents f7ec06b + 1163877
commit 87ffe07
Show file tree

Hide file tree

Showing 431 changed files with 576 additions and 372 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### ⚠️ Breaking Changes ⚠️
-- Moved `OpenSearch.Client` request classes into their respective namespaces to match those in `OpenSearch.Net` ([#206](https://github.com/opensearch-project/opensearch-net/pull/206))
+- Moved `OpenSearch.Client` request classes into their respective namespaces to match those in `OpenSearch.Net` ([#200](https://github.com/opensearch-project/opensearch-net/pull/200), [#202](https://github.com/opensearch-project/opensearch-net/pull/202), [#203](https://github.com/opensearch-project/opensearch-net/pull/203), [#205](https://github.com/opensearch-project/opensearch-net/pull/205), [#206](https://github.com/opensearch-project/opensearch-net/pull/206))
 
 ### Dependencies
 - Bumps `System.Reflection.Emit` from 4.3.0 to 4.7.0
@@ -14,7 +14,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bumps `Fake.Core.Environment` from 5.23.1 to 6.0.0
 - Bumps `Microsoft.TestPlatform.ObjectModel` from 17.4.1 to 17.5.0
 - Bumps `SharpZipLib` from 1.4.1 to 1.4.2
-- Bumps `AWSSDK.Core` from 3.7.103.17 to 3.7.106.24
+- Bumps `AWSSDK.Core` from 3.7.103.17 to 3.7.106.29
+- Bumps `Newtonsoft.Json` from 13.0.2 to 13.0.3
 
 ## [1.3.0]
 ### Added

diff --git a/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json
@@ -120,8 +120,8 @@
       },
       "Newtonsoft.Json": {
         "type": "Transitive",
-        "resolved": "13.0.2",
-        "contentHash": "R2pZ3B0UjeyHShm9vG+Tu0EBb2lC8b0dFzV9gVn50ofHXh9Smjk6kTn7A/FdAsC8B5cKib1OnGYOXxRBz5XQDg=="
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
@@ -883,7 +883,7 @@
       "opensearch.client.jsonnetserializer": {
         "type": "Project",
         "dependencies": {
-          "Newtonsoft.Json": "[13.0.2, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "OpenSearch.Client": "[1.3.0, )"
         }
       },
@@ -951,7 +951,7 @@
         "type": "Project",
         "dependencies": {
           "Bogus": "[34.0.2, )",
-          "Newtonsoft.Json": "[13.0.2, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "OpenSearch.Client": "[1.3.0, )",
           "OpenSearch.OpenSearch.Managed": "[1.3.0, )",
           "Tests.Configuration": "[1.3.0, )"

diff --git a/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json
@@ -120,8 +120,8 @@
       },
       "Newtonsoft.Json": {
         "type": "Transitive",
-        "resolved": "13.0.2",
-        "contentHash": "R2pZ3B0UjeyHShm9vG+Tu0EBb2lC8b0dFzV9gVn50ofHXh9Smjk6kTn7A/FdAsC8B5cKib1OnGYOXxRBz5XQDg=="
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
@@ -883,7 +883,7 @@
       "opensearch.client.jsonnetserializer": {
         "type": "Project",
         "dependencies": {
-          "Newtonsoft.Json": "[13.0.2, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "OpenSearch.Client": "[1.3.0, )"
         }
       },
@@ -951,7 +951,7 @@
         "type": "Project",
         "dependencies": {
           "Bogus": "[34.0.2, )",
-          "Newtonsoft.Json": "[13.0.2, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "OpenSearch.Client": "[1.3.0, )",
           "OpenSearch.OpenSearch.Managed": "[1.3.0, )",
           "Tests.Configuration": "[1.3.0, )"

diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json
@@ -79,9 +79,9 @@
       },
       "Newtonsoft.Json": {
         "type": "Direct",
-        "requested": "[13.0.2, )",
-        "resolved": "13.0.2",
-        "contentHash": "R2pZ3B0UjeyHShm9vG+Tu0EBb2lC8b0dFzV9gVn50ofHXh9Smjk6kTn7A/FdAsC8B5cKib1OnGYOXxRBz5XQDg=="
+        "requested": "[13.0.3, )",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
       "Octokit": {
         "type": "Direct",

diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
@@ -43,7 +43,7 @@
     <PackageReference Include="Fake.IO.Zip" Version="5.23.1" />
     <PackageReference Include="Fake.Tools.Git" Version="5.23.1" />
 
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 
     <PackageReference Include="Octokit" Version="5.0.2" />
     <PackageReference Include="Proc" Version="0.6.1" />

diff --git a/src/OpenSearch.Client.JsonNetSerializer/OpenSearch.Client.JsonNetSerializer.csproj b/src/OpenSearch.Client.JsonNetSerializer/OpenSearch.Client.JsonNetSerializer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
     <PackageId>OpenSearch.Client.JsonNetSerializer</PackageId>
@@ -16,6 +16,6 @@
     <ProjectReference Include="..\OpenSearch.Client\OpenSearch.Client.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 </Project>
diff --git a/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json b/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json
@@ -29,9 +29,9 @@
       },
       "Newtonsoft.Json": {
         "type": "Direct",
-        "requested": "[13.0.2, )",
-        "resolved": "13.0.2",
-        "contentHash": "R2pZ3B0UjeyHShm9vG+Tu0EBb2lC8b0dFzV9gVn50ofHXh9Smjk6kTn7A/FdAsC8B5cKib1OnGYOXxRBz5XQDg=="
+        "requested": "[13.0.3, )",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
@@ -139,9 +139,9 @@
       },
       "Newtonsoft.Json": {
         "type": "Direct",
-        "requested": "[13.0.2, )",
-        "resolved": "13.0.2",
-        "contentHash": "R2pZ3B0UjeyHShm9vG+Tu0EBb2lC8b0dFzV9gVn50ofHXh9Smjk6kTn7A/FdAsC8B5cKib1OnGYOXxRBz5XQDg=="
+        "requested": "[13.0.3, )",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",

diff --git a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatAliasesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.aliases.json")]
 	public partial interface ICatAliasesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatAllocationRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.allocation.json")]
 	public partial interface ICatAllocationRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	/// <summary>
 	/// See docs <see href="https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">here</see>

diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.cluster_manager.json")]
 	///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="ICatMasterRequest"/></remarks>

diff --git a/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs b/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatCountRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs b/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.count.json")]
 	public partial interface ICatCountRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	[JsonFormatter(typeof(CatFielddataRecordFormatter))]

diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net.Utf8Json.Internal;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	internal class CatFielddataRecordFormatter : IJsonFormatter<CatFielddataRecord>
 	{

diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.fielddata.json")]
 	public partial interface ICatFielddataRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatHealthRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.health.json")]
 	public partial interface ICatHealthRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatHelpRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.help.json")]
 	public partial interface ICatHelpRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs b/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs
@@ -32,7 +32,7 @@
 using System.Threading.Tasks;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	internal class CatHelpResponseBuilder : CustomResponseBuilderBase
 	{

diff --git a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatIndicesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.indices.json")]
 	public partial interface ICatIndicesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	/// <summary>
 	/// See docs <see href="https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">here</see>

diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.master.json")]
 	/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ICatClusterManagerRequest"/> instead</remarks>

diff --git a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatNodeAttributesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
@@ -28,7 +28,7 @@
 
 #pragma warning disable 612, 618
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.nodeattrs.json")]
 	public partial interface ICatNodeAttributesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatNodesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.nodes.json")]
 	public partial interface ICatNodesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatPendingTasksRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.pending_tasks.json")]
 	public partial interface ICatPendingTasksRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatPluginsRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.plugins.json")]
 	public partial interface ICatPluginsRequest { }