Skip to content

Commit 76ffa10

Browse files
authored
Merge branch '8.x' into backport-3589-to-8.x
2 parents a010b49 + 6375abc commit 76ffa10

File tree

237 files changed

+4340
-1298
lines changed

Some content is hidden

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

237 files changed

+4340
-1298
lines changed

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-openapi.json" "docs/overlays/elasticsearch-openapi-overlays.yaml" > "output/openapi/elasticsearch-openapi.tmp1.json"
6462
@npx bump overlay "output/openapi/elasticsearch-openapi.tmp1.json" "docs/overlays/elasticsearch-shared-overlays.yaml" > "output/openapi/elasticsearch-openapi.tmp2.json"
@@ -71,6 +69,8 @@ lint-docs: ## Lint the OpenAPI documents after overlays
7169
lint-docs-errs: ## Lint the OpenAPI documents after overlays and return only errors
7270
@npx @stoplight/spectral-cli lint output/openapi/elasticsearch-*.examples.json --ruleset .spectral.yaml -D
7371

72+
contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless lint-docs-errs ## Pre contribution target
73+
7474
help: ## Display help
7575
@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)
7676
#------------- <https://suva.sh/posts/well-documented-makefiles> --------------

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-shared-overlays.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ actions:
170170
# S
171171
- name: script
172172
x-displayName: Script
173+
description: >
174+
Use the script support APIs to get a list of supported script contexts and languages.
175+
Use the stored script APIs to manage stored scripts and search templates.
176+
externalDocs:
177+
url: https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html
173178
- name: search
174179
x-displayName: Search
175180
- name: search_application

output/openapi/elasticsearch-openapi.json

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

0 commit comments

Comments
 (0)