Skip to content

Commit 2808dfb

Browse files
authored
Merge branch 'main' into szabosteve/put-eis
2 parents 255a42f + 797e97e commit 2808dfb

File tree

19 files changed

+282
-43
lines changed

19 files changed

+282
-43
lines changed

.github/workflows/update-rest-api-json.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Update rest-api-spec
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: '0 4 * * *' # At 04:00.
6+
- cron: '0 4 * * *' # At 04:00.
77

88
jobs:
99
update-rest-api:
@@ -49,7 +49,7 @@ jobs:
4949
title: Update rest-api-spec ${{ matrix.branch }}
5050
body: 'As titled.'
5151
commit-message: 'Update rest-api-spec'
52-
labels: specification
52+
labels: specification,skip-backport
5353
delete-branch: true
5454
reviewers: Anaethelion,ezimuel,flobernd,JoshMock,l-trotta,miguelgrinberg,picandocodigo,pquentin,swallez,technige
5555
branch: automated/rest-api-spec-update-${{ matrix.branch }}
@@ -62,4 +62,3 @@ jobs:
6262
token: ${{ secrets.GITHUB_TOKEN }}
6363
labels: bug
6464
body: The rest-api-spec action is currently failing, see [here](https://github.com/elastic/elasticsearch-specification/actions/workflows/update-rest-api-json.yml).
65-

compiler/src/model/build-model.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,18 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
383383
if (property.valueOf.kind === 'instance_of' && property.valueOf.type.name === 'Void') {
384384
type.body = { kind: 'no_body' }
385385
} else {
386-
type.body = { kind: 'value', value: property.valueOf }
386+
const tags = parseJsDocTags((member as PropertySignature).getJsDocs())
387+
// TODO: Enable this after adding the missing codegen names.
388+
// assert(
389+
// member as Node,
390+
// tags.codegen_name != null,
391+
// 'You should configure a body @codegen_name'
392+
// )
393+
type.body = {
394+
kind: 'value',
395+
value: property.valueOf,
396+
codegenName: tags.codegen_name
397+
}
387398
}
388399
} else {
389400
type.body = { kind: 'properties', properties: property.properties }

output/openapi/elasticsearch-openapi.json

Lines changed: 34 additions & 2 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: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)