Add code to skip ignored indices in the index deprecation checks

Author: lukewhiting

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

@@ -20,22 +20,23 @@
 import org.elasticsearch.xpack.core.deprecation.DeprecationIssue;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
+import static java.util.Map.entry;
+import static java.util.Map.ofEntries;
 import static org.elasticsearch.cluster.metadata.IndexMetadata.INDEX_IGNORE_DEPRECATION_WARNING_FOR_VERSION_KEY;
 
 /**
  * Index-specific deprecation checks
  */
 public class IndexDeprecationChecks {
 
-    private static final IndexVersion MINIMUM_VERSION = IndexVersions.V_8_0_0;
+    static final IndexVersion MINIMUM_VERSION = IndexVersions.V_8_0_0;
 
     static DeprecationIssue oldIndicesCheck(IndexMetadata indexMetadata, ClusterState clusterState) {
         // TODO: this check needs to be revised. It's trivially true right now.
@@ -50,7 +51,7 @@ && notIgnored(indexMetadata)) {
                 "https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-9.0.html",
                 "This index has version: " + currentCompatibilityVersion.toReleaseVersion(),
                 false,
-                Collections.singletonMap("reindex_required", true)
+                ofEntries(entry("reindex_required", true), entry("minimum_version_id_required", MINIMUM_VERSION.id()))
             );
         }
         return null;

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

@@ -29,8 +29,10 @@
 import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
+import static java.util.Map.entry;
+import static java.util.Map.ofEntries;
 import static org.elasticsearch.xpack.deprecation.DeprecationChecks.INDEX_SETTINGS_CHECKS;
+import static org.elasticsearch.xpack.deprecation.IndexDeprecationChecks.MINIMUM_VERSION;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
@@ -53,7 +55,7 @@ public void testOldIndicesCheck() {
             "https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-9.0.html",
             "This index has version: " + createdWith.toReleaseVersion(),
             false,
-            singletonMap("reindex_required", true)
+            ofEntries(entry("reindex_required", true), entry("minimum_version_id_required", MINIMUM_VERSION.id()))
         );
         List<DeprecationIssue> issues = DeprecationChecks.filterChecks(INDEX_SETTINGS_CHECKS, c -> c.apply(indexMetadata, clusterState));
         assertEquals(singletonList(expected), issues);
@@ -101,6 +103,21 @@ public void testOldIndicesCheckDataStreamIndex() {
         assertThat(issues.size(), equalTo(0));
     }
 
+    public void testOldIndicesIgnoredCheck() {
+        IndexVersion createdWith = IndexVersion.fromId(7170099);
+
+        Settings.Builder settings = settings(createdWith);
+        settings.put(IndexMetadata.INDEX_IGNORE_DEPRECATION_WARNING_FOR_VERSION_KEY, MINIMUM_VERSION.id());
+
+        IndexMetadata indexMetadata = IndexMetadata.builder("test").settings(settings).numberOfShards(1).numberOfReplicas(0).build();
+        ClusterState clusterState = ClusterState.builder(ClusterState.EMPTY_STATE)
+            .metadata(Metadata.builder().put(indexMetadata, true))
+            .build();
+
+        List<DeprecationIssue> issues = DeprecationChecks.filterChecks(INDEX_SETTINGS_CHECKS, c -> c.apply(indexMetadata, clusterState));
+        assertThat(issues, empty());
+    }
+
     public void testTranslogRetentionSettings() {
         Settings.Builder settings = settings(IndexVersion.current());
         settings.put(IndexSettings.INDEX_TRANSLOG_RETENTION_AGE_SETTING.getKey(), randomPositiveTimeValue());