Skip to content

Commit 8368eac

Browse files
pquentinpquentin
authored
Merge branch '8.19' into backport-5052-to-8.19
2 parents 0e734ad + 17e5777 commit 8368eac

File tree

12 files changed

+214
-112
lines changed

12 files changed

+214
-112
lines changed

‎compiler/src/steps/validate-model.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,13 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
186186
apiModel.endpoints.filter(ep => readyForValidation(ep)).forEach(validateEndpoint)
187187
apiModel.endpoints.filter(ep => !readyForValidation(ep)).forEach(validateEndpoint)
188188

189+
// Check types are used
190+
for (const type of apiModel.types) {
191+
if (!typesSeen.has(fqn(type.name))) {
192+
errors.addGeneralError(`Dangling type '${fqn(type.name)}'`)
193+
}
194+
}
195+
189196
// Removes types that we've not seen
190197
apiModel.types = apiModel.types.filter(type => typesSeen.has(fqn(type.name)))
191198

‎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: 4 additions & 4 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: 69 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎output/schema/validation-errors.json‎

Lines changed: 96 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,98 @@
11
{
2-
"endpointErrors": {
3-
"bulk": {
4-
"request": [
5-
"Request: missing json spec query parameter 'type'"
6-
],
7-
"response": []
8-
},
9-
"ml.stop_datafeed": {
10-
"request": [
11-
"Request: missing json spec query parameter 'allow_no_datafeeds'"
12-
],
13-
"response": []
14-
}
15-
},
16-
"generalErrors": []
2+
"endpointErrors": {},
3+
"generalErrors": [
4+
"Dangling type '_global.scripts_painless_execute:PainlessExecutionPosition'",
5+
"Dangling type '_global.scripts_painless_execute:PainlessScript'",
6+
"Dangling type '_global.search._types:HitMetadata'",
7+
"Dangling type '_global.search._types:SmoothingModel'",
8+
"Dangling type '_spec_utils:Setting'",
9+
"Dangling type '_types:ActionIds'",
10+
"Dangling type '_types:CustomResponseBuilderBase'",
11+
"Dangling type '_types:DistanceParsed'",
12+
"Dangling type '_types:DynamicResponseBase'",
13+
"Dangling type '_types:ElasticsearchResponseBase'",
14+
"Dangling type '_types:ElasticsearchUrlFormatter'",
15+
"Dangling type '_types:HttpMethod'",
16+
"Dangling type '_types:IndexMetrics'",
17+
"Dangling type '_types:LatLon'",
18+
"Dangling type '_types:LogLevel'",
19+
"Dangling type '_types:LongId'",
20+
"Dangling type '_types:ScriptBase'",
21+
"Dangling type '_types:Transform'",
22+
"Dangling type '_types:UnitFloatSeconds'",
23+
"Dangling type '_types:Uri'",
24+
"Dangling type '_types:UrlParameter'",
25+
"Dangling type '_types:VersionNumbers'",
26+
"Dangling type '_types:VersionStrings'",
27+
"Dangling type '_types.aggregations:AggregationVisitorScope'",
28+
"Dangling type '_types.mapping:GeoTree'",
29+
"Dangling type '_types.mapping:PropertyWithClrOrigin'",
30+
"Dangling type '_types.query_dsl:CharacterType'",
31+
"Dangling type '_types.query_dsl:FieldNameQuery'",
32+
"Dangling type '_types.query_dsl:GeoFormat'",
33+
"Dangling type '_types.query_dsl:Intervals'",
34+
"Dangling type '_types.query_dsl:RewriteMultiTerm'",
35+
"Dangling type '_types.query_dsl:SpanSubQuery'",
36+
"Dangling type '_types.query_dsl:TokenType'",
37+
"Dangling type '_types.query_dsl:VisitorScope'",
38+
"Dangling type 'cat.transforms:TransformState'",
39+
"Dangling type 'cat.transforms:TransformType'",
40+
"Dangling type 'cluster.allocation_explain:StoreCopy'",
41+
"Dangling type 'cluster.reroute:CommandAction'",
42+
"Dangling type 'esql._types:DataPartitioning'",
43+
"Dangling type 'ilm._types:Configurations'",
44+
"Dangling type 'ilm._types:ForceMergeConfiguration'",
45+
"Dangling type 'ilm._types:ShrinkConfiguration'",
46+
"Dangling type 'indices._types:Fielddata'",
47+
"Dangling type 'indices._types:FielddataFilter'",
48+
"Dangling type 'indices._types:FielddataLoading'",
49+
"Dangling type 'indices._types:FielddataRegexFilter'",
50+
"Dangling type 'indices._types:FielddataSettings'",
51+
"Dangling type 'indices._types:GeoPointFielddataFormat'",
52+
"Dangling type 'indices._types:IndicesCircuitBreakerSettings'",
53+
"Dangling type 'indices._types:IndicesModuleSettings'",
54+
"Dangling type 'indices._types:IndicesRecoverySettings'",
55+
"Dangling type 'indices._types:OverlappingIndexTemplate'",
56+
"Dangling type 'indices._types:StringFielddata'",
57+
"Dangling type 'indices._types:StringFielddataFormat'",
58+
"Dangling type 'indices.stats:ShardFielddata'",
59+
"Dangling type 'inference._types:AmazonSageMakerElasticServiceSettings'",
60+
"Dangling type 'inference._types:AmazonSageMakerElasticTaskSettings'",
61+
"Dangling type 'inference._types:AmazonSageMakerElementType'",
62+
"Dangling type 'inference._types:AmazonSageMakerOpenAiTaskSettings'",
63+
"Dangling type 'inference._types:AmazonSageMakerSimilarity'",
64+
"Dangling type 'ingest._types:PipelineFailure'",
65+
"Dangling type 'ml._types:CountFunction'",
66+
"Dangling type 'ml._types:DistinctCountFunction'",
67+
"Dangling type 'ml._types:GeographicFunction'",
68+
"Dangling type 'ml._types:InfoContentFunction'",
69+
"Dangling type 'ml._types:MetricFunction'",
70+
"Dangling type 'ml._types:ModelPlotConfigEnabled'",
71+
"Dangling type 'ml._types:NlpInferenceConfigUpdateContainer'",
72+
"Dangling type 'ml._types:NlpTokenizationUpdateContainer'",
73+
"Dangling type 'ml._types:NonNullSumFunction'",
74+
"Dangling type 'ml._types:NonZeroCountFunction'",
75+
"Dangling type 'ml._types:RareFunction'",
76+
"Dangling type 'ml._types:SumFunction'",
77+
"Dangling type 'search_application._types:AnalyticsEvent'",
78+
"Dangling type 'transform._types:Sync'",
79+
"Dangling type 'watcher._types:Interval'",
80+
"Dangling type 'watcher._types:IntervalUnit'",
81+
"Dangling type 'watcher._types:JiraAction'",
82+
"Dangling type 'watcher._types:JiraIssueAssignee'",
83+
"Dangling type 'watcher._types:JiraIssueFields'",
84+
"Dangling type 'watcher._types:JiraIssuePriority'",
85+
"Dangling type 'watcher._types:JiraIssueProject'",
86+
"Dangling type 'watcher._types:JiraIssueReporter'",
87+
"Dangling type 'watcher._types:JiraIssueType'",
88+
"Dangling type 'watcher._types:PagerDutySentEvent'",
89+
"Dangling type 'watcher._types:SimpleInput'",
90+
"Dangling type 'watcher._types:SlackActionMessageResult'",
91+
"Dangling type 'watcher._types:TriggerEvent'",
92+
"Dangling type 'xpack.usage:Alerting'",
93+
"Dangling type 'xpack.usage:AlertingExecution'",
94+
"Dangling type 'xpack.usage:AlertingInput'",
95+
"Dangling type 'xpack.usage:ExecutionAction'",
96+
"Dangling type 'xpack.usage:ForecastStatistics'"
97+
]
1798
}

‎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/bulk/BulkRequest.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ import { OperationContainer, UpdateAction } from './types'
9696
* * JavaScript: Check out `client.helpers.*`
9797
* * .NET: Check out `BulkAllObservable`
9898
* * PHP: Check out bulk indexing.
99+
* * Ruby: Check out `Elasticsearch::Helpers::BulkHelper`
99100
*
100101
* **Submitting bulk requests with cURL**
101102
*

‎specification/_json_spec/bulk.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
"type": "time",
4747
"description": "Explicit operation timeout"
4848
},
49-
"type": {
50-
"type": "string",
51-
"description": "Default document type for items which don't provide one"
52-
},
5349
"_source": {
5450
"type": "list",
5551
"description": "True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request"

‎specification/_json_spec/ml.stop_datafeed.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
"required": false,
3131
"description": "Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)"
3232
},
33-
"allow_no_datafeeds": {
34-
"type": "boolean",
35-
"required": false,
36-
"description": "Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)",
37-
"deprecated": true
38-
},
3933
"force": {
4034
"type": "boolean",
4135
"required": false,

‎specification/_json_spec/transform.set_upgrade_mode.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"transform.set_upgrade_mode": {
3+
"documentation": {
4+
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-set-upgrade-mode.html",
5+
"description": "Sets a cluster wide upgrade_mode setting that prepares transform indices for an upgrade."
6+
},
7+
"stability": "stable",
8+
"visibility": "public",
9+
"headers": {
10+
"accept": ["application/json"]
11+
},
12+
"url": {
13+
"paths": [
14+
{
15+
"path": "/_transform/set_upgrade_mode",
16+
"methods": ["POST"]
17+
}
18+
]
19+
},
20+
"params": {
21+
"enabled": {
22+
"type": "boolean",
23+
"description": "Whether to enable upgrade_mode Transform setting or not. Defaults to false."
24+
},
25+
"timeout": {
26+
"type": "time",
27+
"description": "Controls the time to wait before action times out. Defaults to 30 seconds"
28+
}
29+
}
30+
}
31+
}

0 commit comments

Comments
 (0)