Skip to content

Commit 00af9ce

Browse files
authored
Merge branch 'main' into ccr-examples
2 parents b1e97f1 + 94e5ff9 commit 00af9ce

File tree

9 files changed

+34
-32
lines changed

9 files changed

+34
-32
lines changed

docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -561,16 +561,17 @@ actions:
561561
examples:
562562
getIndicesRecoveryResponseExample1:
563563
$ref: "../../specification/indices/recovery/examples/200_response/indicesRecoveryResponseExample1.yaml"
564-
- target: "$.paths['/_resolve/cluster/{name}']['get']"
564+
- target: "$.components['responses']['indices.resolve_cluster#200']"
565565
description: "Add examples for resolve cluster operation"
566566
update:
567567
responses:
568-
200:
569-
content:
570-
application/json:
571-
examples:
572-
resolveClusterResponseExample1:
573-
$ref: "../../specification/indices/resolve_cluster/examples/200_response/ResolveClusterResponseExample1.yaml"
568+
content:
569+
application/json:
570+
examples:
571+
resolveClusterResponseExample1:
572+
$ref: "../../specification/indices/resolve_cluster/examples/200_response/ResolveClusterResponseExample1.yaml"
573+
resolveClusterResponseExample2:
574+
$ref: "../../specification/indices/resolve_cluster/examples/200_response/ResolveClusterResponseExample2.yaml"
574575
- target: "$.components['requestBodies']['indices.shrink']"
575576
description: "Add example for shrink index request"
576577
update:

output/openapi/elasticsearch-openapi.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema-serverless.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/typescript/types.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/_global/msearch_template/MultiSearchTemplateRequest.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export interface Request extends RequestBase {
9292
typed_keys?: boolean
9393
}
9494
/**
95-
* @codegen_name search_templates
9695
* The request body must be newline-delimited JSON (NDJSON) in the following format:
9796
*
9897
* ```
@@ -110,6 +109,8 @@ export interface Request extends RequestBase {
110109
* It is required for each search body but can be empty `({})` or a blank line.
111110
*
112111
* The `<body>` contains the parameters for the search.
112+
*
113+
* @codegen_name search_templates
113114
*/
114115
body: Array<RequestItem>
115116
}

specification/cluster/remote_info/ClusterRemoteInfoResponse.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ export class ClusterRemoteProxyInfo {
7878
num_proxy_sockets_connected: integer
7979
/** The maximum number of socket connections to the remote cluster when proxy mode is configured. */
8080
max_proxy_socket_connections: integer
81-
/** This field presents and has value of ::es_redacted:: only when the remote cluster is configured with the API key based model. Otherwise, the field is not present. */
81+
/** This field is present and has a value of `::es_redacted::` only when the remote cluster is configured with the API key based model. Otherwise, the field is not present. */
8282
cluster_credentials?: string
8383
}

specification/indices/_types/IndexSettings.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,9 +499,9 @@ export class MappingLimitSettingsSourceFields {
499499
}
500500

501501
export enum SourceMode {
502-
disabled,
503-
stored,
504-
synthetic
502+
DISABLED,
503+
STORED,
504+
SYNTHETIC
505505
}
506506

507507
export class SlowlogSettings {

0 commit comments

Comments
 (0)