Skip to content

Commit 78ce8a1

Browse files
Merge branch 'main' of github.com:elastic/elasticsearch-specification into ml-inference-task-type-separation
2 parents 05864d4 + abca59a commit 78ce8a1

File tree

524 files changed

+16106
-4907
lines changed

Some content is hidden

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

524 files changed

+16106
-4907
lines changed

.github/validate-pr/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async function run () {
5353
per_page: 100
5454
})
5555
if (data.length > 0) {
56-
files.push(...data.map(entry => entry.filename))
56+
files.push(...data.filter(entry => entry.status !== 'deleted').map(entry => entry.filename))
5757
page += 1
5858
} else {
5959
break

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ filter-for-serverless: ## Generate the serverless version from the compiled sche
5757
dump-routes: ## Create a new schema with all generics expanded
5858
@npm run dump-routes --prefix compiler
5959

60-
contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless ## Pre contribution target
61-
6260
overlay-docs: ## Apply overlays to OpenAPI documents
6361
@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.json" "docs/overlays/elasticsearch-serverless-openapi-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp1.json"
6462
@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.tmp1.json" "docs/overlays/elasticsearch-shared-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp2.json"
@@ -78,6 +76,8 @@ lint-docs-errs: ## Lint the OpenAPI documents after overlays and return only err
7876
lint-docs-serverless: ## Lint only the serverless OpenAPI document after overlays
7977
@npx @stoplight/spectral-cli lint output/openapi/elasticsearch-serverless-openapi.examples.json --ruleset .spectral.yaml
8078

79+
contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless lint-docs-errs ## Pre contribution target
80+
8181
help: ## Display help
8282
@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
8383
#------------- <https://suva.sh/posts/well-documented-makefiles> --------------

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ If you are using MacOS, run the following command to fix the issue:
305305
brew install coreutils
306306
```
307307

308-
### I need to modify che compiler, help!
308+
### I need to modify the compiler, help!
309309

310310
Take a look at the [compiler documentation](./docs/compiler.md).
311311

docs/modeling-guide.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ class Foo {
577577
578578
The server side default value if the property is not specified.
579579
Default values can only be specified on optional properties.
580+
They appear in the generated documentation and do not affect clients.
580581
581582
```ts
582583
class Foo {

docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 188 additions & 89 deletions
Large diffs are not rendered by default.

docs/overlays/elasticsearch-shared-overlays.yaml

Lines changed: 936 additions & 176 deletions
Large diffs are not rendered by default.

output/openapi/elasticsearch-openapi.json

Lines changed: 1600 additions & 678 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: 735 additions & 411 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: 1758 additions & 934 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: 3932 additions & 1688 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)