Skip to content

Commit 71ec0ff

Browse files
lcawllcawl
authored
Merge branch 'main' into inference-specs
2 parents 1c57cd2 + eac5ecf commit 71ec0ff

File tree

396 files changed

+13690
-4292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+13690
-4292
lines changed

‎.github/workflows/check-backport-labels.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
4949
echo "::endgroup::"
5050
51+
has_backport_label=false
5152
has_skip_backport_label=false
52-
has_exact_backport_label=false
5353
declare -A pr_exact_majors=()
5454
declare -A pr_floating_majors=()
5555
@@ -66,12 +66,13 @@ jobs:
6666
continue
6767
fi
6868
69+
has_backport_label=true
70+
6971
if [[ "${pr_label}" =~ ${backport_regex} ]]; then
7072
major="${BASH_REMATCH[1]}"
7173
minor="${BASH_REMATCH[2]}"
7274
if [ "${minor}" != "x" ]; then
7375
pr_exact_majors["${major}"]=1
74-
has_exact_backport_label=true
7576
else
7677
pr_floating_majors["${major}"]=1
7778
fi
@@ -82,15 +83,15 @@ jobs:
8283
8384
echo "::endgroup::"
8485
85-
if [ "${has_skip_backport_label}" = true ] && [ "${has_exact_backport_label}" = true ]; then
86+
if [ "${has_skip_backport_label}" = true ] && [ "${has_backport_label}" = true ]; then
8687
echo "::error::The 'skip-backport' not be used in combination with another backport"\
8788
"label."
8889
exit 1
8990
fi
9091
91-
if [ "${has_skip_backport_label}" != true ] && [ "${has_exact_backport_label}" != true ]; then
92-
echo "::error::No exact backport label found. Please add at least one of the"\
93-
"'backport {major}.{minor}' labels or use 'skip-backport',"\
92+
if [ "${has_skip_backport_label}" != true ] && [ "${has_backport_label}" != true ]; then
93+
echo "::error::No backport label found. Please add at least one of the"\
94+
"'backport {major}.{minor|x}' labels or use 'skip-backport',"\
9495
"if this PR should not be backported."
9596
exit 1
9697
fi
@@ -115,19 +116,3 @@ jobs:
115116
if [ "${has_required_floating_labels}" != true ]; then
116117
exit 1
117118
fi
118-
119-
# Validate that an exact backport label exists for each floating backport label major
120-
# version.
121-
122-
has_required_exact_labels=true
123-
124-
for pr_floating_major in "${!pr_floating_majors[@]}"; do
125-
if [ -z "${pr_exact_majors[${pr_floating_major}]}" ]; then
126-
has_required_exact_labels=false
127-
echo "::error::Missing exact backport label for '${pr_floating_major}.x'"
128-
fi
129-
done
130-
131-
if [ "${has_required_exact_labels}" != true ]; then
132-
exit 1
133-
fi

‎compiler/src/model/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ export function hoistRequestAnnotations (
668668
const privileges = [
669669
'all', 'cancel_task', 'create_snapshot', 'grant_api_key', 'manage', 'manage_api_key', 'manage_ccr',
670670
'manage_enrich', 'manage_ilm', 'manage_index_templates', 'manage_inference', 'manage_ingest_pipelines', 'manage_logstash_pipelines',
671-
'manage_ml', 'manage_oidc', 'manage_own_api_key', 'manage_pipeline', 'manage_rollup', 'manage_saml', 'manage_search_application', 'manage_search_query_rules',
671+
'manage_ml', 'manage_oidc', 'manage_own_api_key', 'manage_pipeline', 'manage_rollup', 'manage_saml', 'manage_search_application', 'manage_search_query_rules', 'manage_search_synonyms',
672672
'manage_security', 'manage_service_account', 'manage_slm', 'manage_token', 'manage_transform', 'manage_user_profile',
673673
'manage_watcher', 'monitor', 'monitor_inference', 'monitor_ml', 'monitor_rollup', 'monitor_snapshot', 'monitor_text_structure',
674674
'monitor_transform', 'monitor_watcher', 'read_ccr', 'read_ilm', 'read_pipeline', 'read_security', 'read_slm', 'transport_client'

‎docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 119 additions & 24 deletions
Large diffs are not rendered by default.

‎docs/overlays/elasticsearch-shared-overlays.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,15 +1077,15 @@ actions:
10771077
application/json:
10781078
examples:
10791079
asyncSearchSubmitRequestExample1:
1080-
$ref: "../../specification/async_search/submit/AsyncSearchSubmitRequestExample1.json"
1080+
$ref: "../../specification/async_search/submit/examples/request/AsyncSearchSubmitRequestExample1.yaml"
10811081
- target: "$.components['responses']['async_search.submit#200']"
10821082
description: "Add example for asynch search submit response"
10831083
update:
10841084
content:
10851085
application/json:
10861086
examples:
10871087
asyncSearchSubmitResponseExample1:
1088-
$ref: "../../specification/async_search/submit/AsyncSearchSubmitResponseExample1.json"
1088+
$ref: "../../specification/async_search/submit/examples/response/AsyncSearchSubmitResponseExample1.yaml"
10891089
- target: "$.paths['/_transform/{transform_id}']['put']"
10901090
description: "Add examples for create transform operation"
10911091
update:
@@ -1094,32 +1094,32 @@ actions:
10941094
application/json:
10951095
examples:
10961096
createTransformRequestExample1:
1097-
$ref: "../../specification/transform/put_transform/PutTransformRequestExample1.json"
1097+
$ref: "../../specification/transform/put_transform/examples/request/PutTransformRequestExample1.yaml"
10981098
createTransformRequestExample2:
1099-
$ref: "../../specification/transform/put_transform/PutTransformRequestExample2.json"
1099+
$ref: "../../specification/transform/put_transform/examples/request/PutTransformRequestExample2.yaml"
11001100
responses:
11011101
200:
11021102
content:
11031103
application/json:
11041104
examples:
11051105
createTransformResponseExample1:
1106-
$ref: "../../specification/transform/put_transform/PutTransformResponseExample1.json"
1106+
$ref: "../../specification/transform/put_transform/examples/response/PutTransformResponseExample1.yaml"
11071107
- target: "$.components['requestBodies']['transform.preview_transform']"
11081108
description: "Add examples for preview transform operation"
11091109
update:
11101110
content:
11111111
application/json:
11121112
examples:
11131113
previewTransformRequestExample1:
1114-
$ref: "../../specification/transform/preview_transform/PreviewTransformRequestExample1.json"
1114+
$ref: "../../specification/transform/preview_transform/examples/request/PreviewTransformRequestExample1.yaml"
11151115
- target: "$.components['responses']['transform.preview_transform#200']"
11161116
description: "Add examples for preview transform operation"
11171117
update:
11181118
content:
11191119
application/json:
11201120
examples:
11211121
previewTransformResponseExample1:
1122-
$ref: "../../specification/transform/preview_transform/PreviewTransformResponseExample1.json"
1122+
$ref: "../../specification/transform/preview_transform/examples/response/PreviewTransformResponseExample1.yaml"
11231123
- target: "$.paths['/_transform/{transform_id}/_update']['post']"
11241124
description: "Add examples for update transform operation"
11251125
update:
@@ -1128,14 +1128,14 @@ actions:
11281128
application/json:
11291129
examples:
11301130
updateTransformRequestExample1:
1131-
$ref: "../../specification/transform/update_transform/UpdateTransformRequestExample1.json"
1131+
$ref: "../../specification/transform/update_transform/examples/request/UpdateTransformRequestExample1.yaml"
11321132
responses:
11331133
200:
11341134
content:
11351135
application/json:
11361136
examples:
11371137
updateTransformResponseExample1:
1138-
$ref: "../../specification/transform/update_transform/UpdateTransformResponseExample1.json"
1138+
$ref: "../../specification/transform/update_transform/examples/response/UpdateTransformResponseExample1.yaml"
11391139
- target: "$.paths['/_eql/search/status/{id}']['get']"
11401140
description: "Add examples for get async EQL status operation"
11411141
update:
@@ -1145,25 +1145,25 @@ actions:
11451145
application/json:
11461146
examples:
11471147
eqlGetStatusResponseExample1:
1148-
$ref: "../../specification/eql/get_status/EqlGetStatusResponseExample1.json"
1148+
$ref: "../../specification/eql/get_status/examples/response/EqlGetStatusResponseExample1.yaml"
11491149
- target: "$.components['requestBodies']['eql.search']"
11501150
description: "Add examples for EQL search operation"
11511151
update:
11521152
content:
11531153
application/json:
11541154
examples:
11551155
eqlSearchRequestExample1:
1156-
$ref: "../../specification/eql/search/EqlSearchRequestExample1.json"
1156+
$ref: "../../specification/eql/search/examples/request/EqlSearchRequestExample1.yaml"
11571157
eqlSearchRequestExample2:
1158-
$ref: "../../specification/eql/search/EqlSearchRequestExample2.json"
1158+
$ref: "../../specification/eql/search/examples/request/EqlSearchRequestExample2.yaml"
11591159
- target: "$.components['reponses']['eql.search#200']"
11601160
description: "Add examples for EQL search operation"
11611161
update:
11621162
content:
11631163
application/json:
11641164
examples:
11651165
eqlSearchResponseExample2:
1166-
$ref: "../../specification/eql/search/EqlSearchResponseExample2.json"
1166+
$ref: "../../specification/eql/search/examples/response/EqlSearchResponseExample2.yaml"
11671167
- target: "$.paths['/_query']['post']"
11681168
description: "Add examples for ES|QL query operation"
11691169
update:
@@ -1172,15 +1172,15 @@ actions:
11721172
application/json:
11731173
examples:
11741174
esqlQueryRequestExample1:
1175-
$ref: "../../specification/esql/query/EsqlQueryApiRequestExample1.json"
1175+
$ref: "../../specification/esql/query/examples/request/QueryRequestExample1.yaml"
11761176
- target: "$.components['requestBodies']['graph.explore']"
11771177
description: "Add example for graph explore request"
11781178
update:
11791179
content:
11801180
application/json:
11811181
examples:
11821182
graphExploreRequestExample1:
1183-
$ref: "../../specification/graph/explore/graphExploreRequestExample1.json"
1183+
$ref: "../../specification/graph/explore/examples/request/GraphExploreRequestExample1.yaml"
11841184
- target: "$.paths['/{index}/_block/{block}']['put']"
11851185
description: "Add examples for add index block operation"
11861186
update:
@@ -1292,15 +1292,15 @@ actions:
12921292
application/json:
12931293
examples:
12941294
simulatePipelineRequestExample1:
1295-
$ref: "../../specification/ingest/simulate/SimulatePipelineRequestExample1.yaml"
1295+
$ref: "../../specification/ingest/simulate/examples/request/SimulatePipelineRequestExample1.yaml"
12961296
- target: "$.components['responses']['ingest.simulate#200']"
12971297
description: "Add example for simulate pipeline response"
12981298
update:
12991299
content:
13001300
application/json:
13011301
examples:
13021302
simulatePipelineResponseExample1:
1303-
$ref: "../../specification/ingest/simulate/SimulatePipelineResponseExample1.yaml"
1303+
$ref: "../../specification/ingest/simulate/examples/response/SimulatePipelineResponseExample1.yaml"
13041304
- target: "$.components['requestBodies']['indices.put_index_template']"
13051305
description: "Add example for create index template request"
13061306
update:
@@ -1334,7 +1334,7 @@ actions:
13341334
application/json:
13351335
examples:
13361336
indicesResolveResponseExample1:
1337-
$ref: "../../specification/indices/resolve_index/indicesResolveResponseExample1.yaml"
1337+
$ref: "../../specification/indices/resolve_index/examples/response/ResolveIndexResponseExample1.yaml"
13381338
- target: "$.components['requestBodies']['indices.rollover']"
13391339
description: "Add example for rollover index request"
13401340
update:

0 commit comments

Comments
 (0)