Re-generate against latest OpenAPI specification (opensearch-project#713

) * Re-generate against latest OpenAPI specification Signed-off-by: Thomas Farr <[email protected]> * Update tests Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]> (cherry picked from commit 275203b)
Xtansia · Aug 14, 2024 · 11c6aa8 · 11c6aa8
1 parent b8c5bf6
commit 11c6aa8
Show file tree

Hide file tree

Showing 16 changed files with 19,222 additions and 12,046 deletions.
diff --git a/src/ApiGenerator/Generator/ApiEndpointFactory.cs b/src/ApiGenerator/Generator/ApiEndpointFactory.cs
diff --git a/src/ApiGenerator/opensearch-openapi.yaml b/src/ApiGenerator/opensearch-openapi.yaml
diff --git a/src/OpenSearch.Client/_Generated/Descriptors.Cluster.cs b/src/OpenSearch.Client/_Generated/Descriptors.Cluster.cs
@@ -185,7 +185,7 @@ public GetComponentTemplateDescriptor MasterTimeout(Time mastertimeout) =>
             Qs("master_timeout", mastertimeout);
     }
 
-    /// <summary>Descriptor for PutComponentTemplate</summary>
+    /// <summary>Descriptor for PutComponentTemplate <para>https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</para></summary>
     public partial class PutComponentTemplateDescriptor
         : RequestDescriptorBase<
             PutComponentTemplateDescriptor,

diff --git a/src/OpenSearch.Client/_Generated/Descriptors.Indices.cs b/src/OpenSearch.Client/_Generated/Descriptors.Indices.cs
@@ -196,7 +196,7 @@ public GetComposableIndexTemplateDescriptor MasterTimeout(Time mastertimeout) =>
             Qs("master_timeout", mastertimeout);
     }
 
-    /// <summary>Descriptor for PutComposableTemplate</summary>
+    /// <summary>Descriptor for PutComposableTemplate <para>https://opensearch.org/docs/latest/im-plugin/index-templates/</para></summary>
     public partial class PutComposableIndexTemplateDescriptor
         : RequestDescriptorBase<
             PutComposableIndexTemplateDescriptor,

diff --git a/src/OpenSearch.Client/_Generated/OpenSearchClient.Cluster.cs b/src/OpenSearch.Client/_Generated/OpenSearchClient.Cluster.cs
@@ -233,7 +233,7 @@ public Task<GetComponentTemplateResponse> GetComponentTemplateAsync(
         /// <summary>
         /// <c>PUT</c> request to the <c>cluster.put_component_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template">https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</a>
         /// </summary>
         public PutComponentTemplateResponse PutComponentTemplate(
             Name name,
@@ -246,7 +246,7 @@ Func<PutComponentTemplateDescriptor, IPutComponentTemplateRequest> selector
         /// <summary>
         /// <c>PUT</c> request to the <c>cluster.put_component_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template">https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</a>
         /// </summary>
         public Task<PutComponentTemplateResponse> PutComponentTemplateAsync(
             Name name,
@@ -261,7 +261,7 @@ public Task<PutComponentTemplateResponse> PutComponentTemplateAsync(
         /// <summary>
         /// <c>PUT</c> request to the <c>cluster.put_component_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template">https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</a>
         /// </summary>
         public PutComponentTemplateResponse PutComponentTemplate(
             IPutComponentTemplateRequest request
@@ -274,7 +274,7 @@ IPutComponentTemplateRequest request
         /// <summary>
         /// <c>PUT</c> request to the <c>cluster.put_component_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template">https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</a>
         /// </summary>
         public Task<PutComponentTemplateResponse> PutComponentTemplateAsync(
             IPutComponentTemplateRequest request,

diff --git a/src/OpenSearch.Client/_Generated/OpenSearchClient.Indices.cs b/src/OpenSearch.Client/_Generated/OpenSearchClient.Indices.cs
@@ -254,7 +254,7 @@ public Task<GetComposableIndexTemplateResponse> GetComposableTemplateAsync(
         /// <summary>
         /// <c>PUT</c> request to the <c>indices.put_index_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/">https://opensearch.org/docs/latest/im-plugin/index-templates/</a>
         /// </summary>
         public PutComposableIndexTemplateResponse PutComposableTemplate(
             Name name,
@@ -267,7 +267,7 @@ Func<PutComposableIndexTemplateDescriptor, IPutComposableIndexTemplateRequest> s
         /// <summary>
         /// <c>PUT</c> request to the <c>indices.put_index_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/">https://opensearch.org/docs/latest/im-plugin/index-templates/</a>
         /// </summary>
         public Task<PutComposableIndexTemplateResponse> PutComposableTemplateAsync(
             Name name,
@@ -282,7 +282,7 @@ public Task<PutComposableIndexTemplateResponse> PutComposableTemplateAsync(
         /// <summary>
         /// <c>PUT</c> request to the <c>indices.put_index_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/">https://opensearch.org/docs/latest/im-plugin/index-templates/</a>
         /// </summary>
         public PutComposableIndexTemplateResponse PutComposableTemplate(
             IPutComposableIndexTemplateRequest request
@@ -295,7 +295,7 @@ IPutComposableIndexTemplateRequest request
         /// <summary>
         /// <c>PUT</c> request to the <c>indices.put_index_template</c> API, read more about this API online:
         /// <para></para>
-        /// <a></a>
+        /// <a href="https://opensearch.org/docs/latest/im-plugin/index-templates/">https://opensearch.org/docs/latest/im-plugin/index-templates/</a>
         /// </summary>
         public Task<PutComposableIndexTemplateResponse> PutComposableTemplateAsync(
             IPutComposableIndexTemplateRequest request,

diff --git a/src/OpenSearch.Client/_Generated/Requests.Cluster.cs b/src/OpenSearch.Client/_Generated/Requests.Cluster.cs
@@ -248,7 +248,7 @@ public partial interface IPutComponentTemplateRequest
         Name Name { get; }
     }
 
-    /// <summary>Request for PutComponentTemplate</summary>
+    /// <summary>Request for PutComponentTemplate <para>https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</para></summary>
     public partial class PutComponentTemplateRequest
         : PlainRequestBase<PutComponentTemplateRequestParameters>,
             IPutComponentTemplateRequest

diff --git a/src/OpenSearch.Client/_Generated/Requests.Indices.cs b/src/OpenSearch.Client/_Generated/Requests.Indices.cs
@@ -262,7 +262,7 @@ public partial interface IPutComposableIndexTemplateRequest
         Name Name { get; }
     }
 
-    /// <summary>Request for PutComposableTemplate</summary>
+    /// <summary>Request for PutComposableTemplate <para>https://opensearch.org/docs/latest/im-plugin/index-templates/</para></summary>
     public partial class PutComposableIndexTemplateRequest
         : PlainRequestBase<PutComposableIndexTemplateRequestParameters>,
             IPutComposableIndexTemplateRequest

diff --git a/src/OpenSearch.Net/_Generated/Api/Enums.cs b/src/OpenSearch.Net/_Generated/Api/Enums.cs
@@ -58,6 +58,12 @@ public enum Bytes
         [EnumMember(Value = "b")]
         B,
 
+        [EnumMember(Value = "g")]
+        G,
+
+        [EnumMember(Value = "gb")]
+        Gb,
+
         [EnumMember(Value = "k")]
         K,
 
@@ -70,23 +76,17 @@ public enum Bytes
         [EnumMember(Value = "mb")]
         Mb,
 
-        [EnumMember(Value = "g")]
-        G,
+        [EnumMember(Value = "p")]
+        P,
 
-        [EnumMember(Value = "gb")]
-        Gb,
+        [EnumMember(Value = "pb")]
+        Pb,
 
         [EnumMember(Value = "t")]
         T,
 
         [EnumMember(Value = "tb")]
-        Tb,
-
-        [EnumMember(Value = "p")]
-        P,
-
-        [EnumMember(Value = "pb")]
-        Pb
+        Tb
     }
 
     [Flags, StringEnum]
@@ -95,42 +95,42 @@ public enum ExpandWildcards
         [EnumMember(Value = "all")]
         All = 1 << 0,
 
-        [EnumMember(Value = "open")]
-        Open = 1 << 1,
-
         [EnumMember(Value = "closed")]
-        Closed = 1 << 2,
+        Closed = 1 << 1,
 
         [EnumMember(Value = "hidden")]
-        Hidden = 1 << 3,
+        Hidden = 1 << 2,
 
         [EnumMember(Value = "none")]
-        None = 1 << 4
+        None = 1 << 3,
+
+        [EnumMember(Value = "open")]
+        Open = 1 << 4
     }
 
     [StringEnum]
     public enum TimeUnit
     {
-        [EnumMember(Value = "nanos")]
-        Nanos,
+        [EnumMember(Value = "d")]
+        D,
+
+        [EnumMember(Value = "h")]
+        H,
+
+        [EnumMember(Value = "m")]
+        M,
 
         [EnumMember(Value = "micros")]
         Micros,
 
         [EnumMember(Value = "ms")]
         Ms,
 
-        [EnumMember(Value = "s")]
-        S,
-
-        [EnumMember(Value = "m")]
-        M,
-
-        [EnumMember(Value = "h")]
-        H,
+        [EnumMember(Value = "nanos")]
+        Nanos,
 
-        [EnumMember(Value = "d")]
-        D
+        [EnumMember(Value = "s")]
+        S
     }
 
     public static partial class KnownEnums
@@ -146,16 +146,16 @@ public static string GetStringValue(this Bytes enumValue) =>
             enumValue switch
             {
                 Bytes.B => "b",
+                Bytes.G => "g",
+                Bytes.Gb => "gb",
                 Bytes.K => "k",
                 Bytes.Kb => "kb",
                 Bytes.M => "m",
                 Bytes.Mb => "mb",
-                Bytes.G => "g",
-                Bytes.Gb => "gb",
-                Bytes.T => "t",
-                Bytes.Tb => "tb",
                 Bytes.P => "p",
                 Bytes.Pb => "pb",
+                Bytes.T => "t",
+                Bytes.Tb => "tb",
                 _
                     => throw new ArgumentException(
                         $"'{enumValue.ToString()}' is not a valid value for enum 'Bytes'"
@@ -167,27 +167,27 @@ public static string GetStringValue(this ExpandWildcards enumValue)
             var list = new List<string>();
             if ((enumValue & ExpandWildcards.All) != 0)
                 list.Add("all");
-            if ((enumValue & ExpandWildcards.Open) != 0)
-                list.Add("open");
             if ((enumValue & ExpandWildcards.Closed) != 0)
                 list.Add("closed");
             if ((enumValue & ExpandWildcards.Hidden) != 0)
                 list.Add("hidden");
             if ((enumValue & ExpandWildcards.None) != 0)
                 list.Add("none");
+            if ((enumValue & ExpandWildcards.Open) != 0)
+                list.Add("open");
             return string.Join(",", list);
         }
 
         public static string GetStringValue(this TimeUnit enumValue) =>
             enumValue switch
             {
-                TimeUnit.Nanos => "nanos",
+                TimeUnit.D => "d",
+                TimeUnit.H => "h",
+                TimeUnit.M => "m",
                 TimeUnit.Micros => "micros",
                 TimeUnit.Ms => "ms",
+                TimeUnit.Nanos => "nanos",
                 TimeUnit.S => "s",
-                TimeUnit.M => "m",
-                TimeUnit.H => "h",
-                TimeUnit.D => "d",
                 _
                     => throw new ArgumentException(
                         $"'{enumValue.ToString()}' is not a valid value for enum 'TimeUnit'"

diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Cluster.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Cluster.cs
@@ -163,7 +163,7 @@ public TimeSpan MasterTimeout
         }
     }
 
-    /// <summary>Request options for PutComponentTemplate</summary>
+    /// <summary>Request options for PutComponentTemplate <para>https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</para></summary>
     public partial class PutComponentTemplateRequestParameters
         : RequestParameters<PutComponentTemplateRequestParameters>
     {

diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Indices.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Indices.cs
@@ -177,7 +177,7 @@ public TimeSpan MasterTimeout
         }
     }
 
-    /// <summary>Request options for PutComposableTemplate</summary>
+    /// <summary>Request options for PutComposableTemplate <para>https://opensearch.org/docs/latest/im-plugin/index-templates/</para></summary>
     public partial class PutComposableIndexTemplateRequestParameters
         : RequestParameters<PutComposableIndexTemplateRequestParameters>
     {

diff --git a/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Cluster.cs b/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Cluster.cs
@@ -197,8 +197,8 @@ public Task<TResponse> GetComponentTemplateAsync<TResponse>(
                 RequestParams(requestParameters)
             );
 
-        /// <summary>PUT on /_component_template/{name}</summary>
-        /// <param name="name">Name of the component template to create. Opensearch includes the following built-in component templates: `logs-mappings`; &#x27;logs-settings`; `metrics-mappings`; `metrics-settings`;`synthetics-mapping`; `synthetics-settings`. Opensearch Agent uses these templates to configure backing indices for its data streams. If you use Opensearch Agent and want to overwrite one of these templates, set the `version` for your replacement template higher than the current version. If you don&#x2019;t use Opensearch Agent and want to disable all built-in component and index templates, set `stack.templates.enabled` to `false` using the cluster update settings API.</param>
+        /// <summary>PUT on /_component_template/{name} <para>https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</para></summary>
+        /// <param name="name">Name of the component template to create. OpenSearch includes the following built-in component templates: `logs-mappings`; &#x27;logs-settings`; `metrics-mappings`; `metrics-settings`;`synthetics-mapping`; `synthetics-settings`. OpenSearch Agent uses these templates to configure backing indices for its data streams. If you use OpenSearch Agent and want to overwrite one of these templates, set the `version` for your replacement template higher than the current version. If you don&#x27;t use OpenSearch Agent and want to disable all built-in component and index templates, set `stack.templates.enabled` to `false` using the cluster update settings API.</param>
         /// <param name="body">The template definition.</param>
         /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
         public TResponse PutComponentTemplate<TResponse>(
@@ -214,8 +214,8 @@ public TResponse PutComponentTemplate<TResponse>(
                 RequestParams(requestParameters)
             );
 
-        /// <summary>PUT on /_component_template/{name}</summary>
-        /// <param name="name">Name of the component template to create. Opensearch includes the following built-in component templates: `logs-mappings`; &#x27;logs-settings`; `metrics-mappings`; `metrics-settings`;`synthetics-mapping`; `synthetics-settings`. Opensearch Agent uses these templates to configure backing indices for its data streams. If you use Opensearch Agent and want to overwrite one of these templates, set the `version` for your replacement template higher than the current version. If you don&#x2019;t use Opensearch Agent and want to disable all built-in component and index templates, set `stack.templates.enabled` to `false` using the cluster update settings API.</param>
+        /// <summary>PUT on /_component_template/{name} <para>https://opensearch.org/docs/latest/im-plugin/index-templates/#use-component-templates-to-create-an-index-template</para></summary>
+        /// <param name="name">Name of the component template to create. OpenSearch includes the following built-in component templates: `logs-mappings`; &#x27;logs-settings`; `metrics-mappings`; `metrics-settings`;`synthetics-mapping`; `synthetics-settings`. OpenSearch Agent uses these templates to configure backing indices for its data streams. If you use OpenSearch Agent and want to overwrite one of these templates, set the `version` for your replacement template higher than the current version. If you don&#x27;t use OpenSearch Agent and want to disable all built-in component and index templates, set `stack.templates.enabled` to `false` using the cluster update settings API.</param>
         /// <param name="body">The template definition.</param>
         /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
         [MapsApi("cluster.put_component_template", "name, body")]

diff --git a/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Indices.cs b/src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Indices.cs
@@ -192,7 +192,7 @@ public Task<TResponse> GetComposableTemplateForAllAsync<TResponse>(
                 RequestParams(requestParameters)
             );
 
-        /// <summary>PUT on /_index_template/{name}</summary>
+        /// <summary>PUT on /_index_template/{name} <para>https://opensearch.org/docs/latest/im-plugin/index-templates/</para></summary>
         /// <param name="name">Index or template name.</param>
         /// <param name="body">The template definition.</param>
         /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
@@ -209,7 +209,7 @@ public TResponse PutComposableTemplateForAll<TResponse>(
                 RequestParams(requestParameters)
             );
 
-        /// <summary>PUT on /_index_template/{name}</summary>
+        /// <summary>PUT on /_index_template/{name} <para>https://opensearch.org/docs/latest/im-plugin/index-templates/</para></summary>
         /// <param name="name">Index or template name.</param>
         /// <param name="body">The template definition.</param>
         /// <param name="requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>

diff --git a/tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs b/tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
@@ -44,11 +44,10 @@ await GET("/_cluster/state")
 					.Request(c => c.Cluster.State(new ClusterStateRequest()))
 					.FluentAsync(c => c.Cluster.StateAsync())
 					.RequestAsync(c => c.Cluster.StateAsync(new ClusterStateRequest()))
-
 				;
 
 			var metrics = ClusterStateMetric.ClusterManagerNode | ClusterStateMetric.Metadata;
-			await GET("/_cluster/state/metadata%2Ccluster_manager_node")
+			await GET("/_cluster/state/cluster_manager_node%2Cmetadata")
 					.Fluent(c => c.Cluster.State(null, p => p.Metric(metrics)))
 					.Request(c => c.Cluster.State(new ClusterStateRequest(metrics)))
 					.FluentAsync(c => c.Cluster.StateAsync(null, p => p.Metric(metrics)))

diff --git a/tests/Tests/Cluster/NodesInfo/NodesInfoUrlTests.cs b/tests/Tests/Cluster/NodesInfo/NodesInfoUrlTests.cs
@@ -54,14 +54,14 @@ await GET("/_nodes/foo")
 				;
 
 			var metrics = NodesInfoMetric.Http | NodesInfoMetric.Jvm;
-			await GET("/_nodes/jvm%2Chttp")
+			await GET("/_nodes/http%2Cjvm")
 					.Fluent(c => c.Nodes.Info(p => p.Metric(metrics)))
 					.Request(c => c.Nodes.Info(new NodesInfoRequest(metrics)))
 					.FluentAsync(c => c.Nodes.InfoAsync(p => p.Metric(metrics)))
 					.RequestAsync(c => c.Nodes.InfoAsync(new NodesInfoRequest(metrics)))
 				;
 
-			await GET("/_nodes/foo/jvm%2Chttp")
+			await GET("/_nodes/foo/http%2Cjvm")
 					.Fluent(c => c.Nodes.Info(n => n.NodeId("foo").Metric(metrics)))
 					.Request(c => c.Nodes.Info(new NodesInfoRequest("foo", metrics)))
 					.FluentAsync(c => c.Nodes.InfoAsync(n => n.NodeId("foo").Metric(metrics)))

diff --git a/tests/Tests/Cluster/NodesStats/NodesStatsUrlTests.cs b/tests/Tests/Cluster/NodesStats/NodesStatsUrlTests.cs
@@ -69,14 +69,14 @@ await GET("/_nodes/foo/stats/fs%2Cjvm")
 				;
 
 			var indexMetrics = NodesStatsIndexMetric.Fielddata | NodesStatsIndexMetric.Merge;
-			await GET("/_nodes/stats/fs%2Cjvm/merge%2Cfielddata")
+			await GET("/_nodes/stats/fs%2Cjvm/fielddata%2Cmerge")
 					.Fluent(c => c.Nodes.Stats(p => p.Metric(metrics).IndexMetric(indexMetrics)))
 					.Request(c => c.Nodes.Stats(new NodesStatsRequest(metrics, indexMetrics)))
 					.FluentAsync(c => c.Nodes.StatsAsync(p => p.Metric(metrics).IndexMetric(indexMetrics)))
 					.RequestAsync(c => c.Nodes.StatsAsync(new NodesStatsRequest(metrics, indexMetrics)))
 				;
 
-			await GET("/_nodes/foo/stats/fs%2Cjvm/merge%2Cfielddata")
+			await GET("/_nodes/foo/stats/fs%2Cjvm/fielddata%2Cmerge")
 					.Fluent(c => c.Nodes.Stats(p => p.NodeId("foo").Metric(metrics).IndexMetric(indexMetrics)))
 					.Request(c => c.Nodes.Stats(new NodesStatsRequest("foo", metrics, indexMetrics)))
 					.FluentAsync(c => c.Nodes.StatsAsync(p => p.NodeId("foo").Metric(metrics).IndexMetric(indexMetrics)))