From e6d668c9700c252a6427ea649b3906adc168af92 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Tue, 22 Jul 2025 13:10:24 +0400 Subject: [PATCH] [8.19] Remove unsupported master_timeout from cat.aliases API (#5007) * [8.19] Remove unsupported master_timeout from cat.aliases API * Run make contrib (cherry picked from commit 7f49f22aa59aa4e835105619b25694bed6d215ac) --- output/openapi/elasticsearch-openapi.json | 16 ---------------- .../elasticsearch-serverless-openapi.json | 16 ---------------- output/schema/schema.json | 15 +-------------- output/schema/validation-errors.json | 6 ------ output/typescript/types.ts | 1 - specification/cat/aliases/CatAliasesRequest.ts | 8 -------- 6 files changed, 1 insertion(+), 61 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index 18b8ca8062..7bc42f4ae9 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -991,9 +991,6 @@ }, { "$ref": "#/components/parameters/cat.aliases-local" - }, - { - "$ref": "#/components/parameters/cat.aliases-master_timeout" } ], "responses": { @@ -1027,9 +1024,6 @@ }, { "$ref": "#/components/parameters/cat.aliases-local" - }, - { - "$ref": "#/components/parameters/cat.aliases-master_timeout" } ], "responses": { @@ -108731,16 +108725,6 @@ }, "style": "form" }, - "cat.aliases-master_timeout": { - "in": "query", - "name": "master_timeout", - "description": "The period to wait for a connection to the master node.\nIf the master node is not available before the timeout expires, the request fails and returns an error.\nTo indicated that the request should never timeout, you can set it to `-1`.", - "deprecated": false, - "schema": { - "$ref": "#/components/schemas/_types.Duration" - }, - "style": "form" - }, "cat.allocation-node_id": { "in": "path", "name": "node_id", diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 4d02336d74..9c52ba02f8 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -731,9 +731,6 @@ }, { "$ref": "#/components/parameters/cat.aliases-local" - }, - { - "$ref": "#/components/parameters/cat.aliases-master_timeout" } ], "responses": { @@ -767,9 +764,6 @@ }, { "$ref": "#/components/parameters/cat.aliases-local" - }, - { - "$ref": "#/components/parameters/cat.aliases-master_timeout" } ], "responses": { @@ -65505,16 +65499,6 @@ }, "style": "form" }, - "cat.aliases-master_timeout": { - "in": "query", - "name": "master_timeout", - "description": "The period to wait for a connection to the master node.\nIf the master node is not available before the timeout expires, the request fails and returns an error.\nTo indicated that the request should never timeout, you can set it to `-1`.", - "deprecated": false, - "schema": { - "$ref": "#/components/schemas/_types.Duration" - }, - "style": "form" - }, "cat.component_templates-name": { "in": "path", "name": "name", diff --git a/output/schema/schema.json b/output/schema/schema.json index b0cc295f5d..5c978f538a 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -101639,22 +101639,9 @@ "namespace": "_builtins" } } - }, - { - "description": "The period to wait for a connection to the master node.\nIf the master node is not available before the timeout expires, the request fails and returns an error.\nTo indicated that the request should never timeout, you can set it to `-1`.", - "name": "master_timeout", - "required": false, - "serverDefault": "30s", - "type": { - "kind": "instance_of", - "type": { - "name": "Duration", - "namespace": "_types" - } - } } ], - "specLocation": "cat/aliases/CatAliasesRequest.ts#L24-L85" + "specLocation": "cat/aliases/CatAliasesRequest.ts#L24-L78" }, { "kind": "response", diff --git a/output/schema/validation-errors.json b/output/schema/validation-errors.json index eba22ddd5c..127b19c115 100644 --- a/output/schema/validation-errors.json +++ b/output/schema/validation-errors.json @@ -6,12 +6,6 @@ ], "response": [] }, - "cat.aliases": { - "request": [ - "Request: query parameter 'master_timeout' does not exist in the json spec" - ], - "response": [] - }, "esql.async_query_get": { "request": [ "Request: query parameter 'format' does not exist in the json spec" diff --git a/output/typescript/types.ts b/output/typescript/types.ts index b8983e67ee..14f85ae79f 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -7221,7 +7221,6 @@ export interface CatAliasesRequest extends CatCatRequestBase { s?: Names expand_wildcards?: ExpandWildcards local?: boolean - master_timeout?: Duration } export type CatAliasesResponse = CatAliasesAliasesRecord[] diff --git a/specification/cat/aliases/CatAliasesRequest.ts b/specification/cat/aliases/CatAliasesRequest.ts index 8a6d12e580..58770488a6 100644 --- a/specification/cat/aliases/CatAliasesRequest.ts +++ b/specification/cat/aliases/CatAliasesRequest.ts @@ -18,7 +18,6 @@ */ import { ExpandWildcards, Names } from '@_types/common' -import { Duration } from '@_types/Time' import { CatRequestBase } from '@cat/_types/CatBase' /** @@ -74,12 +73,5 @@ export interface Request extends CatRequestBase { * @server_default false */ local?: boolean - /** - * The period to wait for a connection to the master node. - * If the master node is not available before the timeout expires, the request fails and returns an error. - * To indicated that the request should never timeout, you can set it to `-1`. - * @server_default 30s - */ - master_timeout?: Duration } }