From 21a6c5f6deb9484cd0a2955d2305635f3d220d15 Mon Sep 17 00:00:00 2001 From: Thomas Farr Date: Wed, 6 Sep 2023 10:46:06 +1200 Subject: [PATCH] Re-generate `ingest` namespace (#340) Signed-off-by: Thomas Farr --- .../Configuration/CodeConfiguration.cs | 1 + .../Generator/ApiEndpointFactory.cs | 58 ++- src/ApiGenerator/OpenSearch.openapi.json | 436 +++++++++--------- src/OpenSearch.Client/ApiUrlsLookup.cs | 5 - src/OpenSearch.Client/Descriptors.Ingest.cs | 177 ------- .../IOpenSearchClient.Generated.cs | 6 - .../OpenSearch.Client.csproj | 12 +- .../OpenSearchClient.Ingest.cs | 187 -------- .../OpenSearchClient.NoNamespace.cs | 8 - src/OpenSearch.Client/Requests.Ingest.cs | 269 ----------- .../_Generated/ApiUrlsLookup.cs | 13 + .../_Generated/Descriptors.Ingest.cs | 229 +++++++++ .../_Generated/IOpenSearchClient.cs | 4 + .../_Generated/OpenSearchClient.Ingest.cs | 295 ++++++++++++ .../OpenSearchClient.NoNamespace.cs | 5 + .../_Generated/Requests.Ingest.cs | 273 +++++++++++ src/OpenSearch.Client/_Generated/Requests.cs | 1 + .../RequestParameters.Ingest.cs | 153 ------ .../IOpenSearchLowLevelClient.Generated.cs | 6 - .../OpenSearchLowLevelClient.Ingest.cs | 151 ------ .../OpenSearchLowLevelClient.NoNamespace.cs | 7 - .../RequestParameters.Ingest.cs | 169 +++++++ .../_Generated/IOpenSearchLowLevelClient.cs | 4 + .../OpenSearchLowLevelClient.Ingest.cs | 298 ++++++++++++ .../OpenSearchLowLevelClient.NoNamespace.cs | 3 + 25 files changed, 1559 insertions(+), 1211 deletions(-) delete mode 100644 src/OpenSearch.Client/Descriptors.Ingest.cs delete mode 100644 src/OpenSearch.Client/OpenSearchClient.Ingest.cs delete mode 100644 src/OpenSearch.Client/Requests.Ingest.cs create mode 100644 src/OpenSearch.Client/_Generated/Descriptors.Ingest.cs create mode 100644 src/OpenSearch.Client/_Generated/OpenSearchClient.Ingest.cs create mode 100644 src/OpenSearch.Client/_Generated/Requests.Ingest.cs delete mode 100644 src/OpenSearch.Net/Api/RequestParameters/RequestParameters.Ingest.cs delete mode 100644 src/OpenSearch.Net/OpenSearchLowLevelClient.Ingest.cs create mode 100644 src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Ingest.cs create mode 100644 src/OpenSearch.Net/_Generated/OpenSearchLowLevelClient.Ingest.cs diff --git a/src/ApiGenerator/Configuration/CodeConfiguration.cs b/src/ApiGenerator/Configuration/CodeConfiguration.cs index bbe62a0ad4..43d90c8470 100644 --- a/src/ApiGenerator/Configuration/CodeConfiguration.cs +++ b/src/ApiGenerator/Configuration/CodeConfiguration.cs @@ -41,6 +41,7 @@ public static class CodeConfiguration { // e.g. new Glob("nodes.*"), new("dangling_indices.*"), + new("ingest.*"), new("tasks.*") }; diff --git a/src/ApiGenerator/Generator/ApiEndpointFactory.cs b/src/ApiGenerator/Generator/ApiEndpointFactory.cs index db67cc890f..c5ae4a719a 100644 --- a/src/ApiGenerator/Generator/ApiEndpointFactory.cs +++ b/src/ApiGenerator/Generator/ApiEndpointFactory.cs @@ -30,6 +30,7 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using System.Net.Mime; using ApiGenerator.Configuration; using ApiGenerator.Configuration.Overrides; using ApiGenerator.Domain; @@ -76,7 +77,7 @@ public static ApiEndpoint From(string name, List<(string HttpPath, OpenApiPathIt Name = p.Name, Required = requiredPathParams?.Contains(p.Name) ?? false, Type = GetOpenSearchType(p.Schema), - Options = GetEnumOptions(p.Schema), + Options = GetEnumOptions(p.Schema) }) .ToImmutableSortedDictionary(p => p.Name, p => p); @@ -90,7 +91,7 @@ public static ApiEndpoint From(string name, List<(string HttpPath, OpenApiPathIt Description = p.Description, Options = GetEnumOptions(p.Schema), Deprecated = GetDeprecation(p.Schema), - VersionAdded = p.Schema.GetExtension("x-version-added") as string, + VersionAdded = p.Schema.XVersionAdded() }); var endpoint = new ApiEndpoint @@ -103,14 +104,14 @@ public static ApiEndpoint From(string name, List<(string HttpPath, OpenApiPathIt OfficialDocumentationLink = new Documentation { Description = variants[0].Operation.Description, - Url = variants[0].Operation.ExternalDocumentation?.Url, + Url = variants[0].Operation.ExternalDocumentation?.Url }, Url = urlInfo, - Body = variants.Select(v => v.Operation.RequestBody).FirstOrDefault(b => b != null) is {} reqBody ? new Body - { - Description = reqBody.Description, - Required = reqBody.IsRequired - } : null, + Body = variants + .Select(v => v.Operation.RequestBody) + .FirstOrDefault(b => b != null) is { } reqBody + ? new Body { Description = GetDescription(reqBody), Required = reqBody.IsRequired } + : null, HttpMethods = variants.Select(v => v.HttpMethod.ToString().ToUpper()).Distinct().ToList(), }; @@ -138,10 +139,10 @@ private static void PatchRequestParameters(ApiEndpoint endpoint) => ?? throw new ArgumentNullException("ApiQueryParametersPatcher.Patch(endpoint.Name, endpoint.Url.Params, endpoint.Overrides)"); private static string GetOpenSearchType(JsonSchema schema) - { - while (schema.HasReference) schema = schema.Reference; + { + schema = schema.ActualSchema; - if (schema.GetExtension("x-data-type") is string dataType) + if (schema.XDataType() is {} dataType) return dataType == "array" ? "list" : dataType; return schema.Type switch @@ -153,23 +154,38 @@ private static string GetOpenSearchType(JsonSchema schema) }; } - private static IEnumerable GetEnumOptions(JsonSchema schema) - { - while (schema.HasReference) schema = schema.Reference; + private static IEnumerable GetEnumOptions(JsonSchema schema) => + schema.ActualSchema.Enumeration?.Select(e => e.ToString()) ?? Enumerable.Empty(); - return schema.Enumeration?.Select(e => e.ToString()) ?? Enumerable.Empty(); - } + private static QueryParameterDeprecation GetDeprecation(IJsonExtensionObject schema) => + (schema.XDeprecationMessage(), schema.XVersionDeprecated()) switch + { + (null, null) => null, + var (m, v) => new QueryParameterDeprecation { Description = m, Version = v } + }; - private static QueryParameterDeprecation GetDeprecation(IJsonExtensionObject schema) + private static string GetDescription(OpenApiRequestBody requestBody) { - var message = schema.GetExtension("x-deprecation-message") as string; - var version = schema.GetExtension("x-version-deprecated") as string; + if (!string.IsNullOrWhiteSpace(requestBody.Description)) + return requestBody.Description; - return message != null || version != null - ? new QueryParameterDeprecation { Description = message, Version = version } + return requestBody.Content.TryGetValue(MediaTypeNames.Application.Json, out var content) + ? content.Schema?.ActualSchema.Description : null; } + private static string XDeprecationMessage(this IJsonExtensionObject schema) => + schema.GetExtension("x-deprecation-message") as string; + + private static string XVersionDeprecated(this IJsonExtensionObject schema) => + schema.GetExtension("x-version-deprecated") as string; + + private static string XVersionAdded(this IJsonExtensionObject schema) => + schema.GetExtension("x-version-added") as string; + + private static string XDataType(this IJsonExtensionObject schema) => + schema.GetExtension("x-data-type") as string; + private static object GetExtension(this IJsonExtensionObject schema, string key) => schema.ExtensionData?.TryGetValue(key, out var value) ?? false ? value : null; } diff --git a/src/ApiGenerator/OpenSearch.openapi.json b/src/ApiGenerator/OpenSearch.openapi.json index ee92752dcb..fb73202fd2 100644 --- a/src/ApiGenerator/OpenSearch.openapi.json +++ b/src/ApiGenerator/OpenSearch.openapi.json @@ -279,8 +279,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -1024,8 +1024,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -1152,8 +1152,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -1264,8 +1264,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -1842,8 +1842,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -2021,8 +2021,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -2178,8 +2178,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -2292,8 +2292,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -2425,8 +2425,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -2545,8 +2545,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -2722,8 +2722,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -3094,8 +3094,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -3512,8 +3512,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -3630,8 +3630,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -3750,8 +3750,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -3886,8 +3886,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -4006,8 +4006,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -4134,8 +4134,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -4385,8 +4385,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -4504,8 +4504,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -4626,8 +4626,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -4756,8 +4756,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -5044,8 +5044,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -5205,8 +5205,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -5380,7 +5380,7 @@ } }, "x-deprecation-message": "The hot accepts /_cluster/nodes as prefix for backwards compatibility reasons", - "x-ignorable": "true", + "x-ignorable": true, "x-operation-group": "nodes.hot_threads", "x-version-added": "1.0", "x-version-deprecated": "1.0" @@ -5461,7 +5461,7 @@ } }, "x-deprecation-message": "The hot threads API accepts `hotthreads` but only `hot_threads` is documented", - "x-ignorable": "true", + "x-ignorable": true, "x-operation-group": "nodes.hot_threads", "x-version-added": "1.0", "x-version-deprecated": "1.0" @@ -5554,7 +5554,7 @@ } }, "x-deprecation-message": "The hot accepts /_cluster/nodes as prefix for backwards compatibility reasons", - "x-ignorable": "true", + "x-ignorable": true, "x-operation-group": "nodes.hot_threads", "x-version-added": "1.0", "x-version-deprecated": "1.0" @@ -5647,7 +5647,7 @@ } }, "x-deprecation-message": "The hot threads API accepts `hotthreads` but only `hot_threads` is documented", - "x-ignorable": "true", + "x-ignorable": true, "x-operation-group": "nodes.hot_threads", "x-version-added": "1.0", "x-version-deprecated": "1.0" @@ -5694,8 +5694,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -5789,8 +5789,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -5930,8 +5930,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6035,8 +6035,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6108,8 +6108,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6239,8 +6239,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6382,8 +6382,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6647,8 +6647,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6724,8 +6724,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -6775,8 +6775,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -6918,8 +6918,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -7003,8 +7003,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -7403,8 +7403,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -7477,8 +7477,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8092,8 +8092,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -8176,8 +8176,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8257,8 +8257,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8342,8 +8342,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8409,8 +8409,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8470,8 +8470,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -8622,8 +8622,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8706,8 +8706,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8751,8 +8751,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8869,8 +8869,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -8931,8 +8931,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -8995,8 +8995,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -9174,8 +9174,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -10302,7 +10302,7 @@ } }, "x-deprecation-message": "The hot threads API accepts `hotthreads` but only `hot_threads` is documented", - "x-ignorable": "true", + "x-ignorable": true, "x-operation-group": "nodes.hot_threads", "x-version-added": "1.0", "x-version-deprecated": "1.0" @@ -11072,7 +11072,7 @@ } }, "x-deprecation-message": "The hot threads API accepts `hotthreads` but only `hot_threads` is documented", - "x-ignorable": "true", + "x-ignorable": true, "x-operation-group": "nodes.hot_threads", "x-version-added": "1.0", "x-version-deprecated": "1.0" @@ -13733,8 +13733,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -14041,8 +14041,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -14095,8 +14095,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -14166,8 +14166,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -14241,8 +14241,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -14325,8 +14325,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -14407,8 +14407,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -16274,8 +16274,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16383,8 +16383,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16493,8 +16493,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16653,8 +16653,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16708,8 +16708,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16775,8 +16775,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16837,8 +16837,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16907,8 +16907,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -16991,8 +16991,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17067,8 +17067,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17130,8 +17130,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17196,8 +17196,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17274,8 +17274,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -17340,8 +17340,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17429,8 +17429,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17513,8 +17513,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17611,8 +17611,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -17687,8 +17687,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -17761,8 +17761,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -18379,8 +18379,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -18456,8 +18456,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -18517,8 +18517,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -18670,8 +18670,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -18754,8 +18754,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -19243,8 +19243,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -19345,8 +19345,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -19574,8 +19574,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -19751,8 +19751,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -19912,8 +19912,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -20140,8 +20140,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -20226,8 +20226,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -20302,8 +20302,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -20384,8 +20384,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -20466,8 +20466,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } } ], @@ -20622,8 +20622,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -21125,8 +21125,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -21219,8 +21219,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -21296,8 +21296,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -23966,8 +23966,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -24051,8 +24051,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -24170,8 +24170,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -27256,8 +27256,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -27373,8 +27373,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -27509,8 +27509,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -27725,8 +27725,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -27829,8 +27829,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -28219,8 +28219,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { @@ -28323,8 +28323,8 @@ "type": "string", "pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$", "description": "Operation timeout for connection to cluster-manager node.", - "x-data-type": "time", - "x-version-added": "2.0.0" + "x-version-added": "2.0.0", + "x-data-type": "time" } }, { diff --git a/src/OpenSearch.Client/ApiUrlsLookup.cs b/src/OpenSearch.Client/ApiUrlsLookup.cs index 7d7791c00c..afb43a9b78 100644 --- a/src/OpenSearch.Client/ApiUrlsLookup.cs +++ b/src/OpenSearch.Client/ApiUrlsLookup.cs @@ -134,11 +134,6 @@ internal static partial class ApiUrlsLookups internal static ApiUrls IndicesBulkAlias = new ApiUrls(new[]{"_aliases"}); internal static ApiUrls IndicesValidateQuery = new ApiUrls(new[]{"_validate/query", "{index}/_validate/query"}); internal static ApiUrls NoNamespaceRootNodeInfo = new ApiUrls(new[]{""}); - internal static ApiUrls IngestDeletePipeline = new ApiUrls(new[]{"_ingest/pipeline/{id}"}); - internal static ApiUrls IngestGetPipeline = new ApiUrls(new[]{"_ingest/pipeline", "_ingest/pipeline/{id}"}); - internal static ApiUrls IngestGrokProcessorPatterns = new ApiUrls(new[]{"_ingest/processor/grok"}); - internal static ApiUrls IngestPutPipeline = new ApiUrls(new[]{"_ingest/pipeline/{id}"}); - internal static ApiUrls IngestSimulatePipeline = new ApiUrls(new[]{"_ingest/pipeline/_simulate", "_ingest/pipeline/{id}/_simulate"}); internal static ApiUrls NoNamespaceMultiGet = new ApiUrls(new[]{"_mget", "{index}/_mget"}); internal static ApiUrls NoNamespaceMultiSearch = new ApiUrls(new[]{"_msearch", "{index}/_msearch"}); internal static ApiUrls NoNamespaceMultiSearchTemplate = new ApiUrls(new[]{"_msearch/template", "{index}/_msearch/template"}); diff --git a/src/OpenSearch.Client/Descriptors.Ingest.cs b/src/OpenSearch.Client/Descriptors.Ingest.cs deleted file mode 100644 index 9b9739e9c7..0000000000 --- a/src/OpenSearch.Client/Descriptors.Ingest.cs +++ /dev/null @@ -1,177 +0,0 @@ -/* 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. -*/ -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ----------------------------------------------- -// -// This file is automatically generated -// Please do not edit these files manually -// Run the following in the root of the repos: -// -// *NIX : ./build.sh codegen -// Windows : build.bat codegen -// -// ----------------------------------------------- -// ReSharper disable RedundantUsingDirective -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Linq.Expressions; -using OpenSearch.Net; -using OpenSearch.Net.Utf8Json; -using OpenSearch.Net.Specification.IngestApi; - -// ReSharper disable RedundantBaseConstructorCall -// ReSharper disable UnusedTypeParameter -// ReSharper disable PartialMethodWithSinglePart -// ReSharper disable RedundantNameQualifier -namespace OpenSearch.Client.Specification.IngestApi -{ - ///Descriptor for DeletePipeline - public partial class DeletePipelineDescriptor : RequestDescriptorBase, IDeletePipelineRequest - { - internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline; - ////_ingest/pipeline/{id} - ///this parameter is required - public DeletePipelineDescriptor(Id id): base(r => r.Required("id", id)) - { - } - - ///Used for serialization purposes, making sure we have a parameterless constructor - [SerializationConstructor] - protected DeletePipelineDescriptor(): base() - { - } - - // values part of the url path - 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); - } - - ///Descriptor for GetPipeline - public partial class GetPipelineDescriptor : RequestDescriptorBase, IGetPipelineRequest - { - internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGetPipeline; - ////_ingest/pipeline - public GetPipelineDescriptor(): base() - { - } - - ////_ingest/pipeline/{id} - ///Optional, accepts null - public GetPipelineDescriptor(Id id): base(r => r.Optional("id", id)) - { - } - - // values part of the url path - Id IGetPipelineRequest.Id => Self.RouteValues.Get("id"); - ///Comma separated list of pipeline ids. Wildcards supported - 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 - public partial class GrokProcessorPatternsDescriptor : RequestDescriptorBase, IGrokProcessorPatternsRequest - { - internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGrokProcessorPatterns; - // values part of the url path - // Request parameters - } - - ///Descriptor for PutPipeline - public partial class PutPipelineDescriptor : RequestDescriptorBase, IPutPipelineRequest - { - internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestPutPipeline; - ////_ingest/pipeline/{id} - ///this parameter is required - public PutPipelineDescriptor(Id id): base(r => r.Required("id", id)) - { - } - - ///Used for serialization purposes, making sure we have a parameterless constructor - [SerializationConstructor] - protected PutPipelineDescriptor(): base() - { - } - - // values part of the url path - 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); - } - - ///Descriptor for SimulatePipeline - public partial class SimulatePipelineDescriptor : RequestDescriptorBase, ISimulatePipelineRequest - { - internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestSimulatePipeline; - ////_ingest/pipeline/_simulate - public SimulatePipelineDescriptor(): base() - { - } - - ////_ingest/pipeline/{id}/_simulate - ///Optional, accepts null - public SimulatePipelineDescriptor(Id id): base(r => r.Optional("id", id)) - { - } - - // values part of the url path - Id ISimulatePipelineRequest.Id => Self.RouteValues.Get("id"); - ///Pipeline ID - public SimulatePipelineDescriptor Id(Id id) => Assign(id, (a, v) => a.RouteValues.Optional("id", v)); - // Request parameters - ///Verbose mode. Display data output for each processor in executed pipeline - public SimulatePipelineDescriptor Verbose(bool? verbose = true) => Qs("verbose", verbose); - } -} diff --git a/src/OpenSearch.Client/IOpenSearchClient.Generated.cs b/src/OpenSearch.Client/IOpenSearchClient.Generated.cs index ed781291ef..1234094d32 100644 --- a/src/OpenSearch.Client/IOpenSearchClient.Generated.cs +++ b/src/OpenSearch.Client/IOpenSearchClient.Generated.cs @@ -82,12 +82,6 @@ IndicesNamespace Indices get; } - ///Ingest APIs - IngestNamespace Ingest - { - get; - } - ///Nodes APIs NodesNamespace Nodes { diff --git a/src/OpenSearch.Client/OpenSearch.Client.csproj b/src/OpenSearch.Client/OpenSearch.Client.csproj index 0352af667e..7db27cba3c 100644 --- a/src/OpenSearch.Client/OpenSearch.Client.csproj +++ b/src/OpenSearch.Client/OpenSearch.Client.csproj @@ -33,15 +33,21 @@ True Requests.cs + + True + Requests.cs + True Descriptors.cs - - + + True + Descriptors.cs + True OpenSearchClient.cs - \ No newline at end of file + diff --git a/src/OpenSearch.Client/OpenSearchClient.Ingest.cs b/src/OpenSearch.Client/OpenSearchClient.Ingest.cs deleted file mode 100644 index effd01fd11..0000000000 --- a/src/OpenSearch.Client/OpenSearchClient.Ingest.cs +++ /dev/null @@ -1,187 +0,0 @@ -/* 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. -*/ -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ----------------------------------------------- -// -// This file is automatically generated -// Please do not edit these files manually -// Run the following in the root of the repos: -// -// *NIX : ./build.sh codegen -// Windows : build.bat codegen -// -// ----------------------------------------------- -// ReSharper disable RedundantUsingDirective -using System; -using System.Threading; -using System.Threading.Tasks; -using OpenSearch.Net.Specification.IngestApi; - -// ReSharper disable once CheckNamespace -// ReSharper disable RedundantTypeArgumentsOfMethod -namespace OpenSearch.Client.Specification.IngestApi -{ - /// - /// Ingest APIs. - /// Not intended to be instantiated directly. Use the property - /// on . - /// - /// - public class IngestNamespace : NamespacedClientProxy - { - internal IngestNamespace(OpenSearchClient client): base(client) - { - } - - /// - /// DELETE request to the ingest.delete_pipeline API, read more about this API online: - /// - /// - /// - public DeletePipelineResponse DeletePipeline(Id id, Func selector = null) => DeletePipeline(selector.InvokeOrDefault(new DeletePipelineDescriptor(id: id))); - /// - /// DELETE request to the ingest.delete_pipeline API, read more about this API online: - /// - /// - /// - public Task DeletePipelineAsync(Id id, Func selector = null, CancellationToken ct = default) => DeletePipelineAsync(selector.InvokeOrDefault(new DeletePipelineDescriptor(id: id)), ct); - /// - /// DELETE request to the ingest.delete_pipeline API, read more about this API online: - /// - /// - /// - public DeletePipelineResponse DeletePipeline(IDeletePipelineRequest request) => DoRequest(request, request.RequestParameters); - /// - /// DELETE request to the ingest.delete_pipeline API, read more about this API online: - /// - /// - /// - public Task DeletePipelineAsync(IDeletePipelineRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); - /// - /// GET request to the ingest.get_pipeline API, read more about this API online: - /// - /// - /// - public GetPipelineResponse GetPipeline(Func selector = null) => GetPipeline(selector.InvokeOrDefault(new GetPipelineDescriptor())); - /// - /// GET request to the ingest.get_pipeline API, read more about this API online: - /// - /// - /// - public Task GetPipelineAsync(Func selector = null, CancellationToken ct = default) => GetPipelineAsync(selector.InvokeOrDefault(new GetPipelineDescriptor()), ct); - /// - /// GET request to the ingest.get_pipeline API, read more about this API online: - /// - /// - /// - public GetPipelineResponse GetPipeline(IGetPipelineRequest request) => DoRequest(request, request.RequestParameters); - /// - /// GET request to the ingest.get_pipeline API, read more about this API online: - /// - /// - /// - public Task GetPipelineAsync(IGetPipelineRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); - /// - /// GET request to the ingest.processor_grok API, read more about this API online: - /// - /// - /// - public GrokProcessorPatternsResponse GrokProcessorPatterns(Func selector = null) => GrokProcessorPatterns(selector.InvokeOrDefault(new GrokProcessorPatternsDescriptor())); - /// - /// GET request to the ingest.processor_grok API, read more about this API online: - /// - /// - /// - public Task GrokProcessorPatternsAsync(Func selector = null, CancellationToken ct = default) => GrokProcessorPatternsAsync(selector.InvokeOrDefault(new GrokProcessorPatternsDescriptor()), ct); - /// - /// GET request to the ingest.processor_grok API, read more about this API online: - /// - /// - /// - public GrokProcessorPatternsResponse GrokProcessorPatterns(IGrokProcessorPatternsRequest request) => DoRequest(request, request.RequestParameters); - /// - /// GET request to the ingest.processor_grok API, read more about this API online: - /// - /// - /// - public Task GrokProcessorPatternsAsync(IGrokProcessorPatternsRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); - /// - /// PUT request to the ingest.put_pipeline API, read more about this API online: - /// - /// - /// - public PutPipelineResponse PutPipeline(Id id, Func selector) => PutPipeline(selector.InvokeOrDefault(new PutPipelineDescriptor(id: id))); - /// - /// PUT request to the ingest.put_pipeline API, read more about this API online: - /// - /// - /// - public Task PutPipelineAsync(Id id, Func selector, CancellationToken ct = default) => PutPipelineAsync(selector.InvokeOrDefault(new PutPipelineDescriptor(id: id)), ct); - /// - /// PUT request to the ingest.put_pipeline API, read more about this API online: - /// - /// - /// - public PutPipelineResponse PutPipeline(IPutPipelineRequest request) => DoRequest(request, request.RequestParameters); - /// - /// PUT request to the ingest.put_pipeline API, read more about this API online: - /// - /// - /// - public Task PutPipelineAsync(IPutPipelineRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); - /// - /// POST request to the ingest.simulate API, read more about this API online: - /// - /// - /// - public SimulatePipelineResponse SimulatePipeline(Func selector = null) => SimulatePipeline(selector.InvokeOrDefault(new SimulatePipelineDescriptor())); - /// - /// POST request to the ingest.simulate API, read more about this API online: - /// - /// - /// - public Task SimulatePipelineAsync(Func selector = null, CancellationToken ct = default) => SimulatePipelineAsync(selector.InvokeOrDefault(new SimulatePipelineDescriptor()), ct); - /// - /// POST request to the ingest.simulate API, read more about this API online: - /// - /// - /// - public SimulatePipelineResponse SimulatePipeline(ISimulatePipelineRequest request) => DoRequest(request, request.RequestParameters); - /// - /// POST request to the ingest.simulate API, read more about this API online: - /// - /// - /// - public Task SimulatePipelineAsync(ISimulatePipelineRequest request, CancellationToken ct = default) => DoRequestAsync(request, request.RequestParameters, ct); - } -} diff --git a/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs b/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs index 004b2c52d4..3bd6f6800d 100644 --- a/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs +++ b/src/OpenSearch.Client/OpenSearchClient.NoNamespace.cs @@ -84,13 +84,6 @@ public IndicesNamespace Indices private set; } - ///Ingest APIs - public IngestNamespace Ingest - { - get; - private set; - } - ///Nodes APIs public NodesNamespace Nodes { @@ -110,7 +103,6 @@ partial void SetupNamespaces() Cat = new CatNamespace(this); Cluster = new ClusterNamespace(this); Indices = new IndicesNamespace(this); - Ingest = new IngestNamespace(this); Nodes = new NodesNamespace(this); Snapshot = new SnapshotNamespace(this); } diff --git a/src/OpenSearch.Client/Requests.Ingest.cs b/src/OpenSearch.Client/Requests.Ingest.cs deleted file mode 100644 index 1246736a54..0000000000 --- a/src/OpenSearch.Client/Requests.Ingest.cs +++ /dev/null @@ -1,269 +0,0 @@ -/* 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. -*/ -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ----------------------------------------------- -// -// This file is automatically generated -// Please do not edit these files manually -// Run the following in the root of the repos: -// -// *NIX : ./build.sh codegen -// Windows : build.bat codegen -// -// ----------------------------------------------- -// ReSharper disable RedundantUsingDirective -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Linq.Expressions; -using System.Runtime.Serialization; -using OpenSearch.Net; -using OpenSearch.Net.Utf8Json; -using OpenSearch.Net.Specification.IngestApi; - -// ReSharper disable RedundantBaseConstructorCall -// ReSharper disable UnusedTypeParameter -// ReSharper disable PartialMethodWithSinglePart -// ReSharper disable RedundantNameQualifier -namespace OpenSearch.Client.Specification.IngestApi -{ - [InterfaceDataContract] - public partial interface IDeletePipelineRequest : IRequest - { - [IgnoreDataMember] - Id Id - { - get; - } - } - - ///Request for DeletePipeline - public partial class DeletePipelineRequest : PlainRequestBase, IDeletePipelineRequest - { - protected IDeletePipelineRequest Self => this; - internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline; - ////_ingest/pipeline/{id} - ///this parameter is required - public DeletePipelineRequest(Id id): base(r => r.Required("id", id)) - { - } - - ///Used for serialization purposes, making sure we have a parameterless constructor - [SerializationConstructor] - protected DeletePipelineRequest(): base() - { - } - - // values part of the url path - [IgnoreDataMember] - 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 Time MasterTimeout - { - get => Q