Merge branch 'main' into feature/synthtic-source-recovery-default

Author: salvatore-campagna

.github/workflows/comment-on-asciidoc-changes.yml

@@ -0,0 +1,21 @@
+---
+name: Comment on PR for .asciidoc changes
+
+on:
+  # We need to use pull_request_target to be able to comment on PRs from forks
+  pull_request_target:
+    types:
+      - synchronize
+      - opened
+      - reopened
+    branches:
+      - main
+      - master
+      - "9.0"
+
+jobs:
+  comment-on-asciidoc-change:
+    permissions:
+      contents: read
+      pull-requests: write
+    uses: elastic/docs-builder/.github/workflows/comment-on-asciidoc-changes.yml@main

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationInfoAction.java

@@ -353,7 +353,7 @@ public static DeprecationInfoAction.Response from(
     }
 
     /**
-     *
+     * Removes the skipped settings from the selected indices and the component and index templates.
      * @param state The cluster state to modify
      * @param indexNames The names of the indexes whose settings need to be filtered
      * @param skipTheseDeprecatedSettings The settings that will be removed from cluster metadata and the index metadata of all the
@@ -405,7 +405,7 @@ private static ClusterState removeSkippedSettings(ClusterState state, String[] i
             String templateName = entry.getKey();
             ComposableIndexTemplate indexTemplate = entry.getValue();
             Template template = indexTemplate.template();
-            if (templateName == null || template.settings() == null || template.settings().isEmpty()) {
+            if (template == null || template.settings() == null || template.settings().isEmpty()) {
                 return Tuple.tuple(templateName, indexTemplate);
             }
             return Tuple.tuple(

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/DeprecationInfoActionResponseTests.java

@@ -362,7 +362,14 @@ public void testRemoveSkippedSettings() {
             .put(IndexMetadata.builder("test").settings(inputSettings).numberOfShards(1).numberOfReplicas(0))
             .put(dataStreamIndexMetadata, true)
             .put(DataStream.builder("ds-test", List.of(dataStreamIndexMetadata.getIndex())).build())
-            .indexTemplates(Map.of("my-index-template", indexTemplate))
+            .indexTemplates(
+                Map.of(
+                    "my-index-template",
+                    indexTemplate,
+                    "empty-template",
+                    ComposableIndexTemplate.builder().indexPatterns(List.of("random")).build()
+                )
+            )
             .componentTemplates(Map.of("my-component-template", componentTemplate))
             .persistentSettings(inputSettings)
             .build();
@@ -391,7 +398,11 @@ public void testRemoveSkippedSettings() {
                 .componentTemplates()
                 .values()
                 .forEach(template -> visibleComponentTemplateSettings.set(template.template().settings()));
-            cs.metadata().templatesV2().values().forEach(template -> visibleIndexTemplateSettings.set(template.template().settings()));
+            cs.metadata().templatesV2().values().forEach(template -> {
+                if (template.template() != null && template.template().settings() != null) {
+                    visibleIndexTemplateSettings.set(template.template().settings());
+                }
+            });
             return Map.of();
         }));