From df7c0984f74fb59bb20deeb890b2238db1444ffc Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 26 Nov 2020 08:53:50 +0000 Subject: [PATCH] Generate initial NEST code for 7.10.1 --- .../_Patches/indices.flush_synced.patch.json | 20 +++++++++++++++++++ src/Nest/Descriptors.Security.cs | 16 +++++++-------- src/Nest/ElasticClient.Security.cs | 8 ++++---- src/Nest/Requests.Security.cs | 12 +++++------ 4 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 src/ApiGenerator/RestSpecification/_Patches/indices.flush_synced.patch.json diff --git a/src/ApiGenerator/RestSpecification/_Patches/indices.flush_synced.patch.json b/src/ApiGenerator/RestSpecification/_Patches/indices.flush_synced.patch.json new file mode 100644 index 00000000000..d922ae07808 --- /dev/null +++ b/src/ApiGenerator/RestSpecification/_Patches/indices.flush_synced.patch.json @@ -0,0 +1,20 @@ +{ + "indices.flush_synced": { + "url": { + "path": "/_flush/synced", + "paths": [ "/_flush/synced", "/{index}/_flush/synced" ], + "deprecated_paths": [ + { + "version": "7.6.0", + "path": "/_flush/synced", + "description": "Synced flush is deprecated and will be removed in 8.0. Use flush instead." + }, + { + "version": "7.6.0", + "path": "/{index}/_flush/synced", + "description": "Synced flush is deprecated and will be removed in 8.0. Use flush instead." + } + ] + } + } +} \ No newline at end of file diff --git a/src/Nest/Descriptors.Security.cs b/src/Nest/Descriptors.Security.cs index c0e27991b55..62beaeebfa8 100644 --- a/src/Nest/Descriptors.Security.cs +++ b/src/Nest/Descriptors.Security.cs @@ -341,7 +341,7 @@ public partial class GetRoleDescriptor : RequestDescriptorBase ApiUrlsLookups.SecurityGetRole; ////_security/role/{name} ///Optional, accepts null - public GetRoleDescriptor(Name name): base(r => r.Optional("name", name)) + public GetRoleDescriptor(Names name): base(r => r.Optional("name", name)) { } @@ -351,9 +351,9 @@ public GetRoleDescriptor(): base() } // values part of the url path - Name IGetRoleRequest.Name => Self.RouteValues.Get("name"); - ///Role name - public GetRoleDescriptor Name(Name name) => Assign(name, (a, v) => a.RouteValues.Optional("name", v)); + Names IGetRoleRequest.Name => Self.RouteValues.Get("name"); + ///A comma-separated list of role names + public GetRoleDescriptor Name(Names name) => Assign(name, (a, v) => a.RouteValues.Optional("name", v)); // Request parameters } @@ -363,7 +363,7 @@ public partial class GetRoleMappingDescriptor : RequestDescriptorBase ApiUrlsLookups.SecurityGetRoleMapping; ////_security/role_mapping/{name} ///Optional, accepts null - public GetRoleMappingDescriptor(Name name): base(r => r.Optional("name", name)) + public GetRoleMappingDescriptor(Names name): base(r => r.Optional("name", name)) { } @@ -373,9 +373,9 @@ public GetRoleMappingDescriptor(): base() } // values part of the url path - Name IGetRoleMappingRequest.Name => Self.RouteValues.Get("name"); - ///Role-Mapping name - public GetRoleMappingDescriptor Name(Name name) => Assign(name, (a, v) => a.RouteValues.Optional("name", v)); + Names IGetRoleMappingRequest.Name => Self.RouteValues.Get("name"); + ///A comma-separated list of role-mapping names + public GetRoleMappingDescriptor Name(Names name) => Assign(name, (a, v) => a.RouteValues.Optional("name", v)); // Request parameters } diff --git a/src/Nest/ElasticClient.Security.cs b/src/Nest/ElasticClient.Security.cs index 1994aa19b99..9a4d33abe63 100644 --- a/src/Nest/ElasticClient.Security.cs +++ b/src/Nest/ElasticClient.Security.cs @@ -401,13 +401,13 @@ internal SecurityNamespace(ElasticClient client): base(client) /// /// https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html /// - public GetRoleResponse GetRole(Name name = null, Func selector = null) => GetRole(selector.InvokeOrDefault(new GetRoleDescriptor().Name(name: name))); + public GetRoleResponse GetRole(Names name = null, Func selector = null) => GetRole(selector.InvokeOrDefault(new GetRoleDescriptor().Name(name: name))); /// /// GET request to the security.get_role API, read more about this API online: /// /// https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html /// - public Task GetRoleAsync(Name name = null, Func selector = null, CancellationToken ct = default) => GetRoleAsync(selector.InvokeOrDefault(new GetRoleDescriptor().Name(name: name)), ct); + public Task GetRoleAsync(Names name = null, Func selector = null, CancellationToken ct = default) => GetRoleAsync(selector.InvokeOrDefault(new GetRoleDescriptor().Name(name: name)), ct); /// /// GET request to the security.get_role API, read more about this API online: /// @@ -425,13 +425,13 @@ internal SecurityNamespace(ElasticClient client): base(client) /// /// https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role-mapping.html /// - public GetRoleMappingResponse GetRoleMapping(Name name = null, Func selector = null) => GetRoleMapping(selector.InvokeOrDefault(new GetRoleMappingDescriptor().Name(name: name))); + public GetRoleMappingResponse GetRoleMapping(Names name = null, Func selector = null) => GetRoleMapping(selector.InvokeOrDefault(new GetRoleMappingDescriptor().Name(name: name))); /// /// GET request to the security.get_role_mapping API, read more about this API online: /// /// https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role-mapping.html /// - public Task GetRoleMappingAsync(Name name = null, Func selector = null, CancellationToken ct = default) => GetRoleMappingAsync(selector.InvokeOrDefault(new GetRoleMappingDescriptor().Name(name: name)), ct); + public Task GetRoleMappingAsync(Names name = null, Func selector = null, CancellationToken ct = default) => GetRoleMappingAsync(selector.InvokeOrDefault(new GetRoleMappingDescriptor().Name(name: name)), ct); /// /// GET request to the security.get_role_mapping API, read more about this API online: /// diff --git a/src/Nest/Requests.Security.cs b/src/Nest/Requests.Security.cs index 34100058e21..f8165668306 100644 --- a/src/Nest/Requests.Security.cs +++ b/src/Nest/Requests.Security.cs @@ -588,7 +588,7 @@ public GetPrivilegesRequest(Name application, Name name): base(r => r.Optional(" public partial interface IGetRoleRequest : IRequest { [IgnoreDataMember] - Name Name + Names Name { get; } @@ -601,7 +601,7 @@ public partial class GetRoleRequest : PlainRequestBase internal override ApiUrls ApiUrls => ApiUrlsLookups.SecurityGetRole; ////_security/role/{name} ///Optional, accepts null - public GetRoleRequest(Name name): base(r => r.Optional("name", name)) + public GetRoleRequest(Names name): base(r => r.Optional("name", name)) { } @@ -612,7 +612,7 @@ public GetRoleRequest(): base() // values part of the url path [IgnoreDataMember] - Name IGetRoleRequest.Name => Self.RouteValues.Get("name"); + Names IGetRoleRequest.Name => Self.RouteValues.Get("name"); // Request parameters } @@ -620,7 +620,7 @@ public GetRoleRequest(): base() public partial interface IGetRoleMappingRequest : IRequest { [IgnoreDataMember] - Name Name + Names Name { get; } @@ -633,7 +633,7 @@ public partial class GetRoleMappingRequest : PlainRequestBase ApiUrlsLookups.SecurityGetRoleMapping; ////_security/role_mapping/{name} ///Optional, accepts null - public GetRoleMappingRequest(Name name): base(r => r.Optional("name", name)) + public GetRoleMappingRequest(Names name): base(r => r.Optional("name", name)) { } @@ -644,7 +644,7 @@ public GetRoleMappingRequest(): base() // values part of the url path [IgnoreDataMember] - Name IGetRoleMappingRequest.Name => Self.RouteValues.Get("name"); + Names IGetRoleMappingRequest.Name => Self.RouteValues.Get("name"); // Request parameters }