Fix cleanup repository patch and regen LL code (#6055)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: stevejgordon

src/ApiGenerator/RestSpecification/Core/fleet.msearch.json

@@ -13,14 +13,14 @@
     "url":{
       "paths":[
         {
-          "path":"/_fleet/_msearch",
+          "path":"/_fleet/_fleet_msearch",
           "methods":[
             "GET",
             "POST"
           ]
         },
         {
-          "path":"/{index}/_fleet/_msearch",
+          "path":"/{index}/_fleet/_fleet_msearch",
           "methods":[
             "GET",
             "POST"

src/ApiGenerator/RestSpecification/Core/fleet.search.json

@@ -13,7 +13,7 @@
     "url":{
       "paths":[
         {
-          "path":"/{index}/_fleet/_search",
+          "path":"/{index}/_fleet/_fleet_search",
           "methods":[
             "GET",
             "POST"

src/ApiGenerator/RestSpecification/Core/nodes.hot_threads.json

@@ -134,10 +134,19 @@
         "options":[
           "cpu",
           "wait",
-          "block"
+          "block",
+          "mem"
         ],
         "description":"The type to sample (default: cpu)"
       },
+      "sort":{
+        "type":"enum",
+        "options":[
+          "cpu",
+          "total"
+        ],
+        "description":"The sort order for 'cpu' type (default: total)"
+      },
       "timeout":{
         "type":"time",
         "description":"Explicit operation timeout"

src/ApiGenerator/RestSpecification/Core/open_point_in_time.json

@@ -52,7 +52,8 @@
       },
       "keep_alive": {
         "type": "string",
-        "description": "Specific the time to live for the point in time"
+        "description": "Specific the time to live for the point in time",
+        "required": true
       }
     }
   }

src/ApiGenerator/RestSpecification/_Patches/snapshot.cleanup_repository.patch.json

@@ -422,6 +422,15 @@ public enum IndicesShardStoresStatus
 		All
 	}
 
+	[StringEnum]
+	public enum Sort
+	{
+		[EnumMember(Value = "cpu")]
+		Cpu,
+		[EnumMember(Value = "total")]
+		Total
+	}
+
 	[StringEnum]
 	public enum ThreadType
 	{
@@ -430,7 +439,9 @@ public enum ThreadType
 		[EnumMember(Value = "wait")]
 		Wait,
 		[EnumMember(Value = "block")]
-		Block
+		Block,
+		[EnumMember(Value = "mem")]
+		Mem
 	}
 
 	[StringEnum]
@@ -496,6 +507,7 @@ static KnownEnums()
 			EnumStringResolvers.TryAdd(typeof(Conflicts), (e) => GetStringValue((Conflicts)e));
 			EnumStringResolvers.TryAdd(typeof(OpType), (e) => GetStringValue((OpType)e));
 			EnumStringResolvers.TryAdd(typeof(IndicesShardStoresStatus), (e) => GetStringValue((IndicesShardStoresStatus)e));
+			EnumStringResolvers.TryAdd(typeof(Sort), (e) => GetStringValue((Sort)e));
 			EnumStringResolvers.TryAdd(typeof(ThreadType), (e) => GetStringValue((ThreadType)e));
 			EnumStringResolvers.TryAdd(typeof(GridType), (e) => GetStringValue((GridType)e));
 			EnumStringResolvers.TryAdd(typeof(GroupBy), (e) => GetStringValue((GroupBy)e));
@@ -978,6 +990,19 @@ public static string GetStringValue(this IndicesShardStoresStatus enumValue)
 			throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'IndicesShardStoresStatus'");
 		}
 
+		public static string GetStringValue(this Sort enumValue)
+		{
+			switch (enumValue)
+			{
+				case Sort.Cpu:
+					return "cpu";
+				case Sort.Total:
+					return "total";
+			}
+
+			throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'Sort'");
+		}
+
 		public static string GetStringValue(this ThreadType enumValue)
 		{
 			switch (enumValue)
@@ -988,6 +1013,8 @@ public static string GetStringValue(this ThreadType enumValue)
 					return "wait";
 				case ThreadType.Block:
 					return "block";
+				case ThreadType.Mem:
+					return "mem";
 			}
 
 			throw new ArgumentException($"'{enumValue.ToString()}' is not a valid value for enum 'ThreadType'");

src/Elasticsearch.Net/Api/Enums.Generated.cs

@@ -67,6 +67,13 @@ public long? Snapshots
 			set => Q("snapshots", value);
 		}
 
+		///<summary>The sort order for 'cpu' type (default: total)</summary>
+		public Sort? Sort
+		{
+			get => Q<Sort? >("sort");
+			set => Q("sort", value);
+		}
+
 		///<summary>The type to sample (default: cpu)</summary>
 		public ThreadType? ThreadType
 		{

src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Nodes.cs

@@ -31,7 +31,7 @@ namespace Elasticsearch.Net.Specification.SnapshotApi
 	public class CleanupRepositoryRequestParameters : RequestParameters<CleanupRepositoryRequestParameters>
 	{
 		public override HttpMethod DefaultHttpMethod => HttpMethod.POST;
-		public override bool SupportsBody => true;
+		public override bool SupportsBody => false;
 		///<summary>Explicit operation timeout for connection to master node</summary>
 		public TimeSpan MasterTimeout
 		{

src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Snapshot.cs

@@ -57,48 +57,48 @@ public TResponse GlobalCheckpoints<TResponse>(string index, GlobalCheckpointsReq
 		[MapsApi("fleet.global_checkpoints", "index")]
 		public Task<TResponse> GlobalCheckpointsAsync<TResponse>(string index, GlobalCheckpointsRequestParameters requestParameters = null, CancellationToken ctx = default)
 			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(GET, Url($"{index:index}/_fleet/global_checkpoints"), ctx, null, RequestParams(requestParameters));
-		///<summary>POST on /_fleet/_msearch</summary>
+		///<summary>POST on /_fleet/_fleet_msearch</summary>
 		///<param name = "body">The request definitions (metadata-fleet search request definition pairs), separated by newlines</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		///<remarks>Note: Experimental within the Elasticsearch server, this functionality is Experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features. This functionality is subject to potential breaking changes within a minor version, meaning that your referencing code may break when this library is upgraded.</remarks>
 		public TResponse Msearch<TResponse>(PostData body, MsearchRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, "_fleet/_msearch", body, RequestParams(requestParameters));
-		///<summary>POST on /_fleet/_msearch</summary>
+			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, "_fleet/_fleet_msearch", body, RequestParams(requestParameters));
+		///<summary>POST on /_fleet/_fleet_msearch</summary>
 		///<param name = "body">The request definitions (metadata-fleet search request definition pairs), separated by newlines</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		///<remarks>Note: Experimental within the Elasticsearch server, this functionality is Experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features. This functionality is subject to potential breaking changes within a minor version, meaning that your referencing code may break when this library is upgraded.</remarks>
 		[MapsApi("fleet.msearch", "body")]
 		public Task<TResponse> MsearchAsync<TResponse>(PostData body, MsearchRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, "_fleet/_msearch", ctx, body, RequestParams(requestParameters));
-		///<summary>POST on /{index}/_fleet/_msearch</summary>
+			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, "_fleet/_fleet_msearch", ctx, body, RequestParams(requestParameters));
+		///<summary>POST on /{index}/_fleet/_fleet_msearch</summary>
 		///<param name = "index">The index name to use as the default</param>
 		///<param name = "body">The request definitions (metadata-fleet search request definition pairs), separated by newlines</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		///<remarks>Note: Experimental within the Elasticsearch server, this functionality is Experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features. This functionality is subject to potential breaking changes within a minor version, meaning that your referencing code may break when this library is upgraded.</remarks>
 		public TResponse Msearch<TResponse>(string index, PostData body, MsearchRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"{index:index}/_fleet/_msearch"), body, RequestParams(requestParameters));
-		///<summary>POST on /{index}/_fleet/_msearch</summary>
+			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"{index:index}/_fleet/_fleet_msearch"), body, RequestParams(requestParameters));
+		///<summary>POST on /{index}/_fleet/_fleet_msearch</summary>
 		///<param name = "index">The index name to use as the default</param>
 		///<param name = "body">The request definitions (metadata-fleet search request definition pairs), separated by newlines</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		///<remarks>Note: Experimental within the Elasticsearch server, this functionality is Experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features. This functionality is subject to potential breaking changes within a minor version, meaning that your referencing code may break when this library is upgraded.</remarks>
 		[MapsApi("fleet.msearch", "index, body")]
 		public Task<TResponse> MsearchAsync<TResponse>(string index, PostData body, MsearchRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, Url($"{index:index}/_fleet/_msearch"), ctx, body, RequestParams(requestParameters));
-		///<summary>POST on /{index}/_fleet/_search</summary>
+			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, Url($"{index:index}/_fleet/_fleet_msearch"), ctx, body, RequestParams(requestParameters));
+		///<summary>POST on /{index}/_fleet/_fleet_search</summary>
 		///<param name = "index">The index name to search.</param>
 		///<param name = "body">The search definition using the Query DSL</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		///<remarks>Note: Experimental within the Elasticsearch server, this functionality is Experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features. This functionality is subject to potential breaking changes within a minor version, meaning that your referencing code may break when this library is upgraded.</remarks>
 		public TResponse Search<TResponse>(string index, PostData body, SearchRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"{index:index}/_fleet/_search"), body, RequestParams(requestParameters));
-		///<summary>POST on /{index}/_fleet/_search</summary>
+			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"{index:index}/_fleet/_fleet_search"), body, RequestParams(requestParameters));
+		///<summary>POST on /{index}/_fleet/_fleet_search</summary>
 		///<param name = "index">The index name to search.</param>
 		///<param name = "body">The search definition using the Query DSL</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		///<remarks>Note: Experimental within the Elasticsearch server, this functionality is Experimental and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but experimental features are not subject to the support SLA of official GA features. This functionality is subject to potential breaking changes within a minor version, meaning that your referencing code may break when this library is upgraded.</remarks>
 		[MapsApi("fleet.search", "index, body")]
 		public Task<TResponse> SearchAsync<TResponse>(string index, PostData body, SearchRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, Url($"{index:index}/_fleet/_search"), ctx, body, RequestParams(requestParameters));
+			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, Url($"{index:index}/_fleet/_fleet_search"), ctx, body, RequestParams(requestParameters));
 	}
 }

src/Elasticsearch.Net/ElasticLowLevelClient.Fleet.cs

@@ -48,17 +48,15 @@ internal LowLevelSnapshotNamespace(ElasticLowLevelClient client): base(client)
 
 		///<summary>POST on /_snapshot/{repository}/_cleanup <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/clean-up-snapshot-repo-api.html</para></summary>
 		///<param name = "repository">A repository name</param>
-		///<param name = "body"></param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse CleanupRepository<TResponse>(string repository, PostData body, CleanupRepositoryRequestParameters requestParameters = null)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"_snapshot/{repository:repository}/_cleanup"), body, RequestParams(requestParameters));
+		public TResponse CleanupRepository<TResponse>(string repository, CleanupRepositoryRequestParameters requestParameters = null)
+			where TResponse : class, IElasticsearchResponse, new() => DoRequest<TResponse>(POST, Url($"_snapshot/{repository:repository}/_cleanup"), null, RequestParams(requestParameters));
 		///<summary>POST on /_snapshot/{repository}/_cleanup <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/clean-up-snapshot-repo-api.html</para></summary>
 		///<param name = "repository">A repository name</param>
-		///<param name = "body"></param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		[MapsApi("snapshot.cleanup_repository", "repository, body")]
-		public Task<TResponse> CleanupRepositoryAsync<TResponse>(string repository, PostData body, CleanupRepositoryRequestParameters requestParameters = null, CancellationToken ctx = default)
-			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, Url($"_snapshot/{repository:repository}/_cleanup"), ctx, body, RequestParams(requestParameters));
+		[MapsApi("snapshot.cleanup_repository", "repository")]
+		public Task<TResponse> CleanupRepositoryAsync<TResponse>(string repository, CleanupRepositoryRequestParameters requestParameters = null, CancellationToken ctx = default)
+			where TResponse : class, IElasticsearchResponse, new() => DoRequestAsync<TResponse>(POST, Url($"_snapshot/{repository:repository}/_cleanup"), ctx, null, RequestParams(requestParameters));
 		///<summary>PUT on /_snapshot/{repository}/{snapshot}/_clone/{target_snapshot} <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
 		///<param name = "repository">A repository name</param>
 		///<param name = "snapshot">The name of the snapshot to clone from</param>