Remove legacy node selector from tests (ES-9378) (#119095)

Part of addressing and removing all occurrences of the Java annotation @UpdateForV9

Author: alexey-ivanov-es

rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java

@@ -14,7 +14,6 @@
 import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
 
 import org.apache.lucene.tests.util.TimeUnits;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.FeatureFlag;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
@@ -43,15 +42,9 @@ public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate
         super(testCandidate);
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remove restCompat check
     @ParametersFactory
     public static Iterable<Object[]> parameters() throws Exception {
-        String restCompatProperty = System.getProperty("tests.restCompat");
-        if ("true".equals(restCompatProperty)) {
-            return createParametersWithLegacyNodeSelectorSupport();
-        } else {
-            return createParameters();
-        }
+        return createParameters();
     }
 
     @Override

test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java

@@ -25,18 +25,15 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.core.IOUtils;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.ClasspathUtils;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.TestFeatureService;
 import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi;
 import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec;
 import org.elasticsearch.test.rest.yaml.section.ClientYamlTestSection;
 import org.elasticsearch.test.rest.yaml.section.ClientYamlTestSuite;
-import org.elasticsearch.test.rest.yaml.section.DoSection;
 import org.elasticsearch.test.rest.yaml.section.ExecutableSection;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
-import org.elasticsearch.xcontent.ParseField;
 import org.junit.AfterClass;
 import org.junit.Before;
 
@@ -58,7 +55,6 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Runs a suite of yaml tests shared with all the official Elasticsearch
@@ -217,28 +213,6 @@ public static void closeClient() throws IOException {
         }
     }
 
-    /**
-     * Create parameters for this parameterized test.
-     * Enables support for parsing the legacy version-based node_selector format.
-     */
-    @Deprecated
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    public static Iterable<Object[]> createParametersWithLegacyNodeSelectorSupport() throws Exception {
-        var executableSectionRegistry = new NamedXContentRegistry(
-            Stream.concat(
-                ExecutableSection.DEFAULT_EXECUTABLE_CONTEXTS.stream().filter(entry -> entry.name.getPreferredName().equals("do") == false),
-                Stream.of(
-                    new NamedXContentRegistry.Entry(
-                        ExecutableSection.class,
-                        new ParseField("do"),
-                        DoSection::parseWithLegacyNodeSelectorSupport
-                    )
-                )
-            ).toList()
-        );
-        return createParameters(executableSectionRegistry, null);
-    }
-
     /**
      * Create parameters for this parameterized test. Uses the
      * {@link ExecutableSection#XCONTENT_REGISTRY list} of executable sections

test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.logging.HeaderWarning;
 import org.elasticsearch.core.Tuple;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.rest.action.admin.indices.RestPutIndexTemplateAction;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext;
@@ -84,16 +83,6 @@
  */
 public class DoSection implements ExecutableSection {
     public static DoSection parse(XContentParser parser) throws IOException {
-        return parse(parser, false);
-    }
-
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    @Deprecated
-    public static DoSection parseWithLegacyNodeSelectorSupport(XContentParser parser) throws IOException {
-        return parse(parser, true);
-    }
-
-    private static DoSection parse(XContentParser parser, boolean enableLegacyNodeSelectorSupport) throws IOException {
         String currentFieldName = null;
         XContentParser.Token token;
 
@@ -183,7 +172,7 @@ private static DoSection parse(XContentParser parser, boolean enableLegacyNodeSe
                         if (token == XContentParser.Token.FIELD_NAME) {
                             selectorName = parser.currentName();
                         } else {
-                            NodeSelector newSelector = buildNodeSelector(selectorName, parser, enableLegacyNodeSelectorSupport);
+                            NodeSelector newSelector = buildNodeSelector(selectorName, parser);
                             nodeSelector = nodeSelector == NodeSelector.ANY
                                 ? newSelector
                                 : new ComposeNodeSelector(nodeSelector, newSelector);
@@ -604,11 +593,10 @@ private String formatStatusCodeMessage(ClientYamlTestResponse restTestResponse,
         )
     );
 
-    private static NodeSelector buildNodeSelector(String name, XContentParser parser, boolean enableLegacyVersionSupport)
-        throws IOException {
+    private static NodeSelector buildNodeSelector(String name, XContentParser parser) throws IOException {
         return switch (name) {
             case "attribute" -> parseAttributeValuesSelector(parser);
-            case "version" -> parseVersionSelector(parser, enableLegacyVersionSupport);
+            case "version" -> parseVersionSelector(parser);
             default -> throw new XContentParseException(parser.getTokenLocation(), "unknown node_selector [" + name + "]");
         };
     }
@@ -673,7 +661,7 @@ private static boolean matchWithRange(
         }
     }
 
-    private static NodeSelector parseVersionSelector(XContentParser parser, boolean enableLegacyVersionSupport) throws IOException {
+    private static NodeSelector parseVersionSelector(XContentParser parser) throws IOException {
         if (false == parser.currentToken().isValue()) {
             throw new XContentParseException(parser.getTokenLocation(), "expected [version] to be a value");
         }
@@ -687,16 +675,10 @@ private static NodeSelector parseVersionSelector(XContentParser parser, boolean
             nodeMatcher = nodeVersion -> Build.current().version().equals(nodeVersion) == false;
             versionSelectorString = "version is not current (original)";
         } else {
-            if (enableLegacyVersionSupport) {
-                var acceptedVersionRange = VersionRange.parseVersionRanges(parser.text());
-                nodeMatcher = nodeVersion -> matchWithRange(nodeVersion, acceptedVersionRange, parser.getTokenLocation());
-                versionSelectorString = "version ranges " + acceptedVersionRange;
-            } else {
-                throw new XContentParseException(
-                    parser.getTokenLocation(),
-                    "unknown version selector [" + parser.text() + "]. Only [current] and [original] are allowed."
-                );
-            }
+            throw new XContentParseException(
+                parser.getTokenLocation(),
+                "unknown version selector [" + parser.text() + "]. Only [current] and [original] are allowed."
+            );
         }
 
         return new NodeSelector() {

test/yaml-rest-runner/src/main/java/org/elasticsearch/test/rest/yaml/section/PrerequisiteSection.java

@@ -12,7 +12,6 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.core.CheckedFunction;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext;
 import org.elasticsearch.test.rest.yaml.Features;
 import org.elasticsearch.xcontent.XContentLocation;
@@ -305,7 +304,6 @@ static void parseSkipSection(XContentParser parser, PrerequisiteSectionBuilder b
             boolean valid = false;
             if (parser.currentToken().isValue()) {
                 valid = switch (parser.currentName()) {
-                    case "version" -> parseRestCompatVersion(parser, builder);
                     case "reason" -> parseString(parser, builder::setSkipReason);
                     case "features" -> parseString(parser, f -> parseFeatureField(f, builder));
                     case "os" -> parseString(parser, builder::skipIfOs);
@@ -328,17 +326,6 @@ static void parseSkipSection(XContentParser parser, PrerequisiteSectionBuilder b
         parser.nextToken();
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    private static boolean parseRestCompatVersion(XContentParser parser, PrerequisiteSectionBuilder builder) throws IOException {
-        // allow skip version only for v7 REST compatibility tests, to be removed for V9
-        if ("true".equals(System.getProperty("tests.restCompat"))) return parseString(parser, builder::skipIfVersion);
-        throw new IllegalArgumentException(
-            "Skipping by version is no longer supported, please skip based on cluster features. Please check the docs: \n"
-                + "https://github.com/elastic/elasticsearch/tree/main"
-                + "/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test#skipping-tests"
-        );
-    }
-
     private static void throwUnexpectedField(String section, XContentParser parser) throws IOException {
         throw new ParsingException(
             parser.getTokenLocation(),

test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java

@@ -16,9 +16,6 @@
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.logging.HeaderWarning;
 import org.elasticsearch.core.Strings;
-import org.elasticsearch.core.UpdateForV9;
-import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext;
-import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse;
 import org.elasticsearch.xcontent.XContentLocation;
 import org.elasticsearch.xcontent.XContentParseException;
 import org.elasticsearch.xcontent.XContentParser;
@@ -31,21 +28,16 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 public class DoSectionTests extends AbstractClientYamlTestFragmentParserTestCase {
 
@@ -580,57 +572,6 @@ public void testParseDoSectionAllowedWarnings() throws Exception {
         assertThat(e.getMessage(), equalTo("the warning [foo] was both allowed and expected"));
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remove
-    public void testLegacyNodeSelectorByVersionRange() throws IOException {
-        parser = createParser(YamlXContent.yamlXContent, """
-            node_selector:
-                version: 5.2.0-6.0.0
-            indices.get_field_mapping:
-                index: test_index""");
-
-        DoSection doSection = DoSection.parseWithLegacyNodeSelectorSupport(parser);
-        assertNotSame(NodeSelector.ANY, doSection.getApiCallSection().getNodeSelector());
-        Node v170 = nodeWithVersion("1.7.0");
-        Node v521 = nodeWithVersion("5.2.1");
-        Node v550 = nodeWithVersion("5.5.0");
-        Node v612 = nodeWithVersion("6.1.2");
-        List<Node> nodes = new ArrayList<>();
-        nodes.add(v170);
-        nodes.add(v521);
-        nodes.add(v550);
-        nodes.add(v612);
-        doSection.getApiCallSection().getNodeSelector().select(nodes);
-        assertEquals(Arrays.asList(v521, v550), nodes);
-        ClientYamlTestExecutionContext context = mock(ClientYamlTestExecutionContext.class);
-        ClientYamlTestResponse mockResponse = mock(ClientYamlTestResponse.class);
-        when(
-            context.callApi(
-                "indices.get_field_mapping",
-                singletonMap("index", "test_index"),
-                emptyList(),
-                emptyMap(),
-                doSection.getApiCallSection().getNodeSelector()
-            )
-        ).thenReturn(mockResponse);
-        when(context.nodesVersions()).thenReturn(Set.of(randomAlphaOfLength(10)));
-        when(mockResponse.getHeaders("X-elastic-product")).thenReturn(List.of("Elasticsearch"));
-        doSection.execute(context);
-        verify(context).callApi(
-            "indices.get_field_mapping",
-            singletonMap("index", "test_index"),
-            emptyList(),
-            emptyMap(),
-            doSection.getApiCallSection().getNodeSelector()
-        );
-
-        {
-            List<Node> badNodes = new ArrayList<>();
-            badNodes.add(new Node(new HttpHost("dummy")));
-            Exception e = expectThrows(IllegalStateException.class, () -> doSection.getApiCallSection().getNodeSelector().select(badNodes));
-            assertEquals("expected [version] metadata to be set but got [host=http://dummy]", e.getMessage());
-        }
-    }
-
     public void testNodeSelectorByVersionRangeFails() throws IOException {
         parser = createParser(YamlXContent.yamlXContent, """
             node_selector: