Abstract version features checking to work with non-semantic versions

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java

@@ -28,7 +28,7 @@
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.FeatureFlag;
 import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider;
-import org.elasticsearch.test.rest.ESRestTestCase;
+import org.elasticsearch.test.rest.ESRestTestFeatureService;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.elasticsearch.test.rest.TestFeatureService;
 import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi;
@@ -50,7 +50,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -315,13 +314,10 @@ protected ClientYamlTestExecutionContext createRestTestExecutionContext(
                 // Reconcile and provide unified features, os, version(s), based on both clientYamlTestClient and searchYamlTestClient
                 var searchOs = readOsFromNodesInfo(adminSearchClient);
                 var searchNodeVersions = readVersionsFromNodesInfo(adminSearchClient);
-                var semanticNodeVersions = searchNodeVersions.stream()
-                    .map(ESRestTestCase::parseLegacyVersion)
-                    .flatMap(Optional::stream)
-                    .collect(Collectors.toSet());
+
                 final TestFeatureService searchTestFeatureService = createTestFeatureService(
                     getClusterStateFeatures(adminSearchClient),
-                    semanticNodeVersions
+                    ESRestTestFeatureService.fromSemanticVersions(searchNodeVersions)
                 );
                 final TestFeatureService combinedTestFeatureService = (featureId, any) -> {
                     boolean adminFeature = testFeatureService.clusterHasFeature(featureId, any);

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java

@@ -30,7 +30,7 @@
 import org.elasticsearch.test.cluster.FeatureFlag;
 import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider;
 import org.elasticsearch.test.cluster.util.resource.Resource;
-import org.elasticsearch.test.rest.ESRestTestCase;
+import org.elasticsearch.test.rest.ESRestTestFeatureService;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.elasticsearch.test.rest.TestFeatureService;
 import org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT.TestCandidateAwareClient;
@@ -45,7 +45,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -298,14 +297,9 @@ protected ClientYamlTestExecutionContext createRestTestExecutionContext(
                 var searchOs = readOsFromNodesInfo(adminSearchClient);
                 var searchNodeVersions = readVersionsFromNodesInfo(adminSearchClient);
 
-                var semanticNodeVersions = searchNodeVersions.stream()
-                    .map(ESRestTestCase::parseLegacyVersion)
-                    .flatMap(Optional::stream)
-                    .collect(Collectors.toSet());
-
                 final TestFeatureService searchTestFeatureService = createTestFeatureService(
                     getClusterStateFeatures(adminSearchClient),
-                    semanticNodeVersions
+                    ESRestTestFeatureService.fromSemanticVersions(searchNodeVersions)
                 );
 
                 final TestFeatureService combinedTestFeatureService = (featureId, any) -> {

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -446,13 +446,10 @@ public void initClient() throws IOException {
                 }
             }
             nodesVersions = Collections.unmodifiableSet(versions);
-
-            var semanticNodeVersions = nodesVersions.stream()
-                .map(ESRestTestCase::parseLegacyVersion)
-                .flatMap(Optional::stream)
-                .collect(Collectors.toSet());
-            assert semanticNodeVersions.isEmpty() == false || serverless;
-            testFeatureService = createTestFeatureService(getClusterStateFeatures(adminClient), semanticNodeVersions);
+            testFeatureService = createTestFeatureService(
+                getClusterStateFeatures(adminClient),
+                ESRestTestFeatureService.fromSemanticVersions(nodesVersions)
+            );
 
             configureProjects();
         }
@@ -467,9 +464,9 @@ public void initClient() throws IOException {
 
     protected final TestFeatureService createTestFeatureService(
         Map<String, Set<String>> clusterStateFeatures,
-        Set<Version> semanticNodeVersions
+        ESRestTestFeatureService.VersionFeaturesPredicate versionFeaturesPredicate
     ) {
-        return new ESRestTestFeatureService(semanticNodeVersions, clusterStateFeatures.values());
+        return new ESRestTestFeatureService(versionFeaturesPredicate, clusterStateFeatures.values());
     }
 
     protected static boolean has(ProductFeature feature) {

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java

@@ -26,27 +26,47 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static java.util.Collections.emptySet;
 
-class ESRestTestFeatureService implements TestFeatureService {
+public class ESRestTestFeatureService implements TestFeatureService {
 
     /**
      * In order to migrate from version checks to cluster feature checks,
      * we provide synthetic features derived from versions, e.g. "gte_v8.0.0".
      */
     private static final Pattern VERSION_FEATURE_PATTERN = Pattern.compile("gte_v(\\d+\\.\\d+\\.\\d+)");
 
-    private final Collection<Version> nodeVersions;
+    public interface VersionFeaturesPredicate {
+        boolean test(Version featureVersion, boolean any);
+    }
+
+    public static VersionFeaturesPredicate fromSemanticVersions(Set<String> nodesVersions) {
+        Set<Version> semanticNodeVersions = nodesVersions.stream()
+            .map(ESRestTestCase::parseLegacyVersion)
+            .flatMap(Optional::stream)
+            .collect(Collectors.toSet());
+        if (semanticNodeVersions.isEmpty()) {
+            // Nodes do not have a semantic version (e.g. serverless).
+            // We assume the cluster is on the "latest version", and all is supported.
+            return ((featureVersion, any) -> true);
+        }
+
+        return (featureVersion, any) -> checkCollection(semanticNodeVersions, nodeVersion -> nodeVersion.onOrAfter(featureVersion), any);
+    }
+
+    private final VersionFeaturesPredicate versionFeaturesPredicate;
     private final Collection<Set<String>> nodeFeatures;
 
-    ESRestTestFeatureService(Set<Version> nodeVersions, Collection<Set<String>> nodeFeatures) {
-        this.nodeVersions = nodeVersions;
+    ESRestTestFeatureService(VersionFeaturesPredicate versionFeaturesPredicate, Collection<Set<String>> nodeFeatures) {
+        this.versionFeaturesPredicate = versionFeaturesPredicate;
         this.nodeFeatures = nodeFeatures;
     }
 
@@ -88,7 +108,7 @@ public boolean clusterHasFeature(String featureId, boolean any) {
                 );
             }
 
-            return checkCollection(nodeVersions, v -> v.onOrAfter(extractedVersion), any);
+            return versionFeaturesPredicate.test(extractedVersion, any);
         }
 
         if (hasFeatureMetadata()) {

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

@@ -27,6 +27,7 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.test.ClasspathUtils;
 import org.elasticsearch.test.rest.ESRestTestCase;
+import org.elasticsearch.test.rest.ESRestTestFeatureService;
 import org.elasticsearch.test.rest.TestFeatureService;
 import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi;
 import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec;
@@ -54,7 +55,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 /**
  * Runs a suite of yaml tests shared with all the official Elasticsearch
@@ -127,13 +127,9 @@ public void initAndResetContext() throws Exception {
 
             logger.info("initializing client, node versions [{}], hosts {}, os [{}]", nodesVersions, hosts, os);
 
-            var semanticNodeVersions = nodesVersions.stream()
-                .map(ESRestTestCase::parseLegacyVersion)
-                .flatMap(Optional::stream)
-                .collect(Collectors.toSet());
             final TestFeatureService testFeatureService = createTestFeatureService(
                 getClusterStateFeatures(adminClient()),
-                semanticNodeVersions
+                ESRestTestFeatureService.fromSemanticVersions(nodesVersions)
             );
 
             logger.info("initializing client, node versions [{}], hosts {}, os [{}]", nodesVersions, hosts, os);

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

@@ -20,7 +20,7 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.test.TestClustersThreadFilter;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
-import org.elasticsearch.test.rest.ESRestTestCase;
+import org.elasticsearch.test.rest.ESRestTestFeatureService;
 import org.elasticsearch.test.rest.TestFeatureService;
 import org.elasticsearch.xpack.esql.CsvSpecReader;
 import org.elasticsearch.xpack.esql.CsvSpecReader.CsvTestCase;
@@ -38,7 +38,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -179,11 +178,10 @@ protected void shouldSkipTest(String testName) throws IOException {
     private TestFeatureService remoteFeaturesService() throws IOException {
         if (remoteFeaturesService == null) {
             var remoteNodeVersions = readVersionsFromNodesInfo(remoteClusterClient());
-            var semanticNodeVersions = remoteNodeVersions.stream()
-                .map(ESRestTestCase::parseLegacyVersion)
-                .flatMap(Optional::stream)
-                .collect(Collectors.toSet());
-            remoteFeaturesService = createTestFeatureService(getClusterStateFeatures(remoteClusterClient()), semanticNodeVersions);
+            remoteFeaturesService = createTestFeatureService(
+                getClusterStateFeatures(remoteClusterClient()),
+                ESRestTestFeatureService.fromSemanticVersions(remoteNodeVersions)
+            );
         }
         return remoteFeaturesService;
     }