Merge branch 'main' into security-examples

Author: lcawl

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

@@ -48,8 +48,8 @@ jobs:
 
           echo "::endgroup::"
 
+          has_backport_label=false
           has_skip_backport_label=false
-          has_exact_backport_label=false
           declare -A pr_exact_majors=()
           declare -A pr_floating_majors=()
 
@@ -66,12 +66,13 @@ jobs:
               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
-                has_exact_backport_label=true
               else
                 pr_floating_majors["${major}"]=1
               fi
@@ -82,15 +83,15 @@ jobs:
 
           echo "::endgroup::"
 
-          if [ "${has_skip_backport_label}" = true ] && [ "${has_exact_backport_label}" = true ]; then
+          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_exact_backport_label}" != true ]; then
-            echo "::error::No exact backport label found. Please add at least one of the"\
-                  "'backport {major}.{minor}' labels or use 'skip-backport',"\
+          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
@@ -115,19 +116,3 @@ jobs:
           if [ "${has_required_floating_labels}" != true ]; then
             exit 1
           fi
-
-          # Validate that an exact backport label exists for each floating backport label major
-          # version.
-
-          has_required_exact_labels=true
-
-          for pr_floating_major in "${!pr_floating_majors[@]}"; do
-            if [ -z "${pr_exact_majors[${pr_floating_major}]}" ]; then
-              has_required_exact_labels=false
-              echo "::error::Missing exact backport label for '${pr_floating_major}.x'"
-            fi
-          done
-
-          if [ "${has_required_exact_labels}" != true ]; then
-            exit 1
-          fi

compiler/src/model/utils.ts

@@ -668,7 +668,7 @@ export function hoistRequestAnnotations (
       const privileges = [
         'all', 'cancel_task', 'create_snapshot', 'grant_api_key', 'manage', 'manage_api_key', 'manage_ccr',
         'manage_enrich', 'manage_ilm', 'manage_index_templates', 'manage_inference', 'manage_ingest_pipelines', 'manage_logstash_pipelines',
-        'manage_ml', 'manage_oidc', 'manage_own_api_key', 'manage_pipeline', 'manage_rollup', 'manage_saml', 'manage_search_application', 'manage_search_query_rules',
+        'manage_ml', 'manage_oidc', 'manage_own_api_key', 'manage_pipeline', 'manage_rollup', 'manage_saml', 'manage_search_application', 'manage_search_query_rules', 'manage_search_synonyms',
         'manage_security', 'manage_service_account', 'manage_slm', 'manage_token', 'manage_transform', 'manage_user_profile',
         'manage_watcher', 'monitor', 'monitor_ml', 'monitor_rollup', 'monitor_snapshot', 'monitor_text_structure',
         'monitor_transform', 'monitor_watcher', 'read_ccr', 'read_ilm', 'read_pipeline', 'read_security', 'read_slm', 'transport_client'

docs/overlays/elasticsearch-openapi-overlays.yaml

@@ -546,3 +546,24 @@ actions:
               examples:
                 delegatePkiResponseExample1:
                   $ref: "../../specification/security/delegate_pki/examples/200_response/SecurityDelegatePkiResponseExample1.yaml"
+## Examples for watcher
+  - target: "$.paths['/_watcher/settings']['put']"
+    description: "Add request example for update watcher settings"
+    update:
+      requestBody: 
+        content: 
+          application/json: 
+            examples:
+              updateWatcherSettingsRequestExample1: 
+                $ref: "../../specification/watcher/update_settings/examples/request/WatcherUpdateSettingsRequestExample1.yaml"
+  - target: "$.paths['/_watcher/settings']['get']"
+    description: "Add response example for get watcher settings"
+    update:
+      responses:
+        200:
+          content: 
+            application/json: 
+              examples:
+                updateWatcherSettingsRequestExample1: 
+                  $ref: "../../specification/watcher/get_settings/examples/200_response/WatcherGetSettingsResponseExample1.yaml"
+