Merge branch 'main' into watcher.put_watcher

Author: pquentin

.github/validate-pr/index.js

@@ -53,7 +53,7 @@ async function run () {
       per_page: 100
     })
     if (data.length > 0) {
-      files.push(...data.map(entry => entry.filename))
+      files.push(...data.filter(entry => entry.status !== 'deleted').map(entry => entry.filename))
       page += 1
     } else {
       break

.github/workflows/check-backport-labels.yml

@@ -0,0 +1,118 @@
+name: Check
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [labeled, unlabeled, opened, reopened, synchronize]
+
+permissions:
+  pull-requests: "read"
+
+jobs:
+  check-backport-label:
+    name: backport label 
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Check backport label"
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          json_pr_labels='${{ toJSON(github.event.pull_request.labels) }}'
+          readarray -t pr_labels < <(echo "${json_pr_labels}" | jq -r -c '.[].name')
+
+          json_all_labels="$(gh label list --repo ${{ github.repository }} --json name --search "backport" --limit 1000)"
+          readarray -t all_labels < <(echo "${json_all_labels}" | jq -r -c '.[].name')
+
+          declare -A all_backport_labels=()
+          declare -A all_floating_majors=()
+
+          backport_regex="^backport ([0-9])+\.([0-9]+|x)$"
+
+          echo "::group::Available Labels"
+          echo "skip-backport"
+
+          for label in "${all_labels[@]}"; do
+            if [[ "${label}" =~ ${backport_regex} ]]; then
+              major="${BASH_REMATCH[1]}"
+              minor="${BASH_REMATCH[2]}"
+              all_backport_labels["${label}"]=1
+              echo "${label}"
+
+              if [ "${minor}" = "x" ]; then
+                all_floating_majors["${major}"]=1
+              fi
+            fi
+          done
+
+          echo "::endgroup::"
+
+          has_backport_label=false
+          has_skip_backport_label=false
+          declare -A pr_exact_majors=()
+          declare -A pr_floating_majors=()
+
+          echo "::group::Detected Labels"
+
+          for pr_label in "${pr_labels[@]}"; do
+            if [ "${pr_label}" = "skip-backport" ]; then
+              has_skip_backport_label=true
+              echo "${pr_label}"
+              continue
+            fi
+
+            if [ -z "${all_backport_labels[${pr_label}]}" ]; then
+              continue
+            fi
+
+            has_backport_label=true
+
+            if [[ "${pr_label}" =~ ${backport_regex} ]]; then
+              major="${BASH_REMATCH[1]}"
+              minor="${BASH_REMATCH[2]}"
+              if [ "${minor}" != "x" ]; then
+                pr_exact_majors["${major}"]=1
+              else
+                pr_floating_majors["${major}"]=1
+              fi
+            fi
+
+            echo "${pr_label}"
+          done
+
+          echo "::endgroup::"
+
+          if [ "${has_skip_backport_label}" = true ] && [ "${has_backport_label}" = true ]; then
+            echo "::error::The 'skip-backport' not be used in combination with another backport"\
+                  "label."
+            exit 1
+          fi
+
+          if [ "${has_skip_backport_label}" != true ] && [ "${has_backport_label}" != true ]; then
+            echo "::error::No backport label found. Please add at least one of the"\
+                  "'backport {major}.{minor|x}' labels or use 'skip-backport',"\
+                  "if this PR should not be backported."
+            exit 1
+          fi
+
+          # Validate that a floating backport label exists for each exact backport label major
+          # version.
+
+          has_required_floating_labels=true
+
+          for pr_major in "${!pr_exact_majors[@]}"; do
+            if [ -z "${all_floating_majors[${pr_major}]}" ]; then
+              # There is no floating version branch for the given major version.
+              continue
+            fi
+
+            if [ -z "${pr_floating_majors[${pr_major}]}" ]; then
+              has_required_floating_labels=false
+              echo "::error::Missing floating backport label for '${pr_major}.x'"
+            fi
+          done
+
+          if [ "${has_required_floating_labels}" != true ]; then
+            exit 1
+          fi

.github/workflows/gh-pages-report.yml

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

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

@@ -57,8 +57,6 @@ filter-for-serverless: ## Generate the serverless version from the compiled sche
 dump-routes: ## Create a new schema with all generics expanded
 	@npm run dump-routes --prefix compiler
 
-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.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"
@@ -78,6 +76,8 @@ lint-docs-errs: ## Lint the OpenAPI documents after overlays and return only err
 lint-docs-serverless: ## Lint only the serverless OpenAPI document after overlays
 	@npx @stoplight/spectral-cli lint output/openapi/elasticsearch-serverless-openapi.examples.json --ruleset .spectral.yaml
 
+contrib: | generate license-check spec-format-fix transform-to-openapi filter-for-serverless lint-docs-errs ## Pre contribution target
+
 help:  ## Display help
 	@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)
 #------------- <https://suva.sh/posts/well-documented-makefiles> --------------

Makefile

@@ -305,7 +305,7 @@ If you are using MacOS, run the following command to fix the issue:
 brew install coreutils
 ```
 
-### I need to modify che compiler, help!
+### I need to modify the compiler, help!
 
 Take a look at the [compiler documentation](./docs/compiler.md).