Skip to content

Commit fced5ed

Browse files
pquentinpquentin
authored
Merge branch '9.0' into backport-5031-to-9.0
2 parents b271a96 + 1bac578 commit fced5ed

File tree

7 files changed

+182
-104
lines changed

7 files changed

+182
-104
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: 15 additions & 11 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: 13 additions & 9 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: 55 additions & 60 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: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,92 @@
11
{
22
"endpointErrors": {},
3-
"generalErrors": []
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:Transform'",
21+
"Dangling type '_types:UnitFloatSeconds'",
22+
"Dangling type '_types:Uri'",
23+
"Dangling type '_types:UrlParameter'",
24+
"Dangling type '_types:VersionNumbers'",
25+
"Dangling type '_types:VersionStrings'",
26+
"Dangling type '_types.aggregations:AggregationVisitorScope'",
27+
"Dangling type '_types.mapping:GeoTree'",
28+
"Dangling type '_types.mapping:PropertyWithClrOrigin'",
29+
"Dangling type '_types.query_dsl:CharacterType'",
30+
"Dangling type '_types.query_dsl:FieldNameQuery'",
31+
"Dangling type '_types.query_dsl:GeoFormat'",
32+
"Dangling type '_types.query_dsl:Intervals'",
33+
"Dangling type '_types.query_dsl:RewriteMultiTerm'",
34+
"Dangling type '_types.query_dsl:SpanSubQuery'",
35+
"Dangling type '_types.query_dsl:TokenType'",
36+
"Dangling type '_types.query_dsl:VisitorScope'",
37+
"Dangling type 'cat.transforms:TransformState'",
38+
"Dangling type 'cat.transforms:TransformType'",
39+
"Dangling type 'cluster.allocation_explain:StoreCopy'",
40+
"Dangling type 'cluster.reroute:CommandAction'",
41+
"Dangling type 'esql._types:DataPartitioning'",
42+
"Dangling type 'ilm._types:Configurations'",
43+
"Dangling type 'ilm._types:ForceMergeConfiguration'",
44+
"Dangling type 'ilm._types:ShrinkConfiguration'",
45+
"Dangling type 'indices._types:Fielddata'",
46+
"Dangling type 'indices._types:FielddataFilter'",
47+
"Dangling type 'indices._types:FielddataLoading'",
48+
"Dangling type 'indices._types:FielddataRegexFilter'",
49+
"Dangling type 'indices._types:FielddataSettings'",
50+
"Dangling type 'indices._types:GeoPointFielddataFormat'",
51+
"Dangling type 'indices._types:IndicesCircuitBreakerSettings'",
52+
"Dangling type 'indices._types:IndicesModuleSettings'",
53+
"Dangling type 'indices._types:IndicesRecoverySettings'",
54+
"Dangling type 'indices._types:OverlappingIndexTemplate'",
55+
"Dangling type 'indices._types:StringFielddata'",
56+
"Dangling type 'indices._types:StringFielddataFormat'",
57+
"Dangling type 'indices.stats:ShardFielddata'",
58+
"Dangling type 'ingest._types:PipelineFailure'",
59+
"Dangling type 'ml._types:CountFunction'",
60+
"Dangling type 'ml._types:DistinctCountFunction'",
61+
"Dangling type 'ml._types:GeographicFunction'",
62+
"Dangling type 'ml._types:InfoContentFunction'",
63+
"Dangling type 'ml._types:MetricFunction'",
64+
"Dangling type 'ml._types:ModelPlotConfigEnabled'",
65+
"Dangling type 'ml._types:NlpInferenceConfigUpdateContainer'",
66+
"Dangling type 'ml._types:NlpTokenizationUpdateContainer'",
67+
"Dangling type 'ml._types:NonNullSumFunction'",
68+
"Dangling type 'ml._types:NonZeroCountFunction'",
69+
"Dangling type 'ml._types:RareFunction'",
70+
"Dangling type 'ml._types:SumFunction'",
71+
"Dangling type 'search_application._types:AnalyticsEvent'",
72+
"Dangling type 'transform._types:Sync'",
73+
"Dangling type 'watcher._types:Interval'",
74+
"Dangling type 'watcher._types:IntervalUnit'",
75+
"Dangling type 'watcher._types:JiraAction'",
76+
"Dangling type 'watcher._types:JiraIssueAssignee'",
77+
"Dangling type 'watcher._types:JiraIssueFields'",
78+
"Dangling type 'watcher._types:JiraIssuePriority'",
79+
"Dangling type 'watcher._types:JiraIssueProject'",
80+
"Dangling type 'watcher._types:JiraIssueReporter'",
81+
"Dangling type 'watcher._types:JiraIssueType'",
82+
"Dangling type 'watcher._types:PagerDutySentEvent'",
83+
"Dangling type 'watcher._types:SimpleInput'",
84+
"Dangling type 'watcher._types:SlackActionMessageResult'",
85+
"Dangling type 'watcher._types:TriggerEvent'",
86+
"Dangling type 'xpack.usage:Alerting'",
87+
"Dangling type 'xpack.usage:AlertingExecution'",
88+
"Dangling type 'xpack.usage:AlertingInput'",
89+
"Dangling type 'xpack.usage:ExecutionAction'",
90+
"Dangling type 'xpack.usage:ForecastStatistics'"
91+
]
492
}

‎output/typescript/types.ts

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

‎specification/inference/_types/CommonTypes.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -754,26 +754,6 @@ export class CohereTaskSettings {
754754
truncate?: CohereTruncateType
755755
}
756756

757-
export class EisServiceSettings {
758-
/**
759-
* The name of the model to use for the inference task.
760-
*/
761-
model_id: string
762-
/**
763-
* This setting helps to minimize the number of rate limit errors returned.
764-
* By default, the `elastic` service sets the number of requests allowed per minute to `240` in case of `chat_completion`.
765-
*/
766-
rate_limit?: RateLimitSetting
767-
}
768-
769-
export enum EisTaskType {
770-
chat_completion
771-
}
772-
773-
export enum EisServiceType {
774-
elastic
775-
}
776-
777757
export class ElasticsearchServiceSettings {
778758
/**
779759
* Adaptive allocations configuration details.

0 commit comments

Comments
 (0)