Merge remote-tracking branch 'origin/main' into mark-role-apis-serverless-available

Author: pquentin

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

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['main', '8.14', '8.15', '7.17']
+        branch: ['main', '8.x', '8.15', '7.17']
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/validate-pr.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
     branches:
       - main
+      - 8.x
+      - '[0-9]+.[0-9]+'
 
 jobs:
   validate-pr:

.gitignore

@@ -64,3 +64,9 @@ output/schema/schema
 
 # Test suite outputs
 compiler/test/**/output/
+
+# Temporary openAPI files
+output/openapi/elasticsearch-serverless-openapi.tmp*.json
+output/openapi/elasticsearch-serverless-openapi.examples.json
+output/openapi/elasticsearch-openapi.tmp*.json
+output/openapi/elasticsearch-openapi.examples.json

Makefile

@@ -60,13 +60,21 @@ dump-routes: ## Create a new schema with all generics expanded
 contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless ## Pre contribution target
 
 overlay-docs: ## Apply overlays to OpenAPI documents
-	@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.json" "docs/overlays/elasticsearch-serverless-openapi-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp.json"
-	@npx @redocly/cli bundle output/openapi/elasticsearch-serverless-openapi.tmp.json --ext json -o output/openapi/elasticsearch-serverless-openapi.examples.json
-	rm output/openapi/elasticsearch-serverless-openapi.tmp.json
+	@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.json" "docs/overlays/elasticsearch-serverless-openapi-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp1.json"
+	@npx bump overlay "output/openapi/elasticsearch-serverless-openapi.tmp1.json" "docs/overlays/elasticsearch-shared-overlays.yaml" > "output/openapi/elasticsearch-serverless-openapi.tmp2.json"
+	@npx @redocly/cli bundle output/openapi/elasticsearch-serverless-openapi.tmp2.json --ext json -o output/openapi/elasticsearch-serverless-openapi.examples.json
+	@npx bump overlay "output/openapi/elasticsearch-openapi.json" "docs/overlays/elasticsearch-openapi-overlays.yaml" > "output/openapi/elasticsearch-openapi.tmp1.json"
+	@npx bump overlay "output/openapi/elasticsearch-openapi.tmp1.json" "docs/overlays/elasticsearch-shared-overlays.yaml" > "output/openapi/elasticsearch-openapi.tmp2.json"
+	@npx @redocly/cli bundle output/openapi/elasticsearch-openapi.tmp2.json --ext json -o output/openapi/elasticsearch-openapi.examples.json
+	rm output/openapi/elasticsearch-serverless-openapi.tmp*.json
+	rm output/openapi/elasticsearch-openapi.tmp*.json
 
 lint-docs: ## Lint the OpenAPI documents
 	@npx @stoplight/spectral-cli lint output/openapi/*.json --ruleset .spectral.yaml
 
+lint-docs-errs: ## Lint the OpenAPI documents and return only errors
+	@npx @stoplight/spectral-cli lint output/openapi/*.json --ruleset .spectral.yaml -D
+
 lint-docs-serverless: ## Lint only the serverless OpenAPI document
 	@npx @stoplight/spectral-cli lint output/openapi/elasticsearch-serverless-openapi.json --ruleset .spectral.yaml