[Rest Api Compatibility] Licence accept_enterprise and response changes

in elastic#50067 the accept_enterprise = false was no longer supported. This
commit allows it under rest compatibility and ignores.

in elastic#5073 there were changes when max_nodes and max_resource_units can
exist. This does not require compatible changes as it feels to be
behaviour change. Requires some testing transformation though

relates elastic#51816

Author: pgomulka

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/YamlRestCompatTestPluginFuncTest.groovy

@@ -212,7 +212,8 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
               task.replaceKeyInMatch("match_.some.key_to_replace", "match_.some.key_that_was_replaced")
               task.replaceKeyInLength("key.in_length_to_replace", "key.in_length_that_was_replaced")
               task.replaceValueTextByKeyValue("keyvalue", "toreplace", "replacedkeyvalue")
-              task.replaceValueTextByKeyValue("index", "test", "test2", "two")
+              task.replaceValueTextByKeyValue("index", "ll", "test2", "two")
+              task.replaceValueInLength("something", 2, "one")
             })
             // can't actually spin up test cluster from this test
            tasks.withType(Test).configureEach{ enabled = false }
@@ -239,6 +240,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
           - is_true: "value_not_to_replace"
           - is_false: "value_not_to_replace"
           - length: { key.in_length_to_replace: 1 }
+          - length: { "something": 1 }
         ---
         "two":
           - do:
@@ -284,10 +286,6 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
         ---
         one:
         - do:
-            do_.some.key_that_was_replaced:
-              index: "test"
-              id: 1
-              keyvalue : replacedkeyvalue
             warnings:
             - "warning1"
             - "warning2"
@@ -298,6 +296,10 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
             - "added allowed warning"
             allowed_warnings_regex:
             - "added allowed warning regex .* [0-9]"
+            do_.some.key_that_was_replaced:
+              index: "test"
+              id: 1
+              keyvalue: "replacedkeyvalue"
         - match:
             _source.values:
             - "z"
@@ -314,17 +316,19 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
         - is_false: "replaced_value"
         - is_true: "value_not_to_replace"
         - is_false: "value_not_to_replace"
-        - length: { key.in_length_that_was_replaced: 1 }
+        - length:
+            key.in_length_that_was_replaced: 1
+        - length:
+            something: 2
         - match:
             _source.added:
               name: "jake"
               likes: "cheese"
-
         ---
         two:
         - do:
             get:
-              index: "test2"
+              index: "test"
               id: 1
             headers:
               Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
@@ -347,15 +351,14 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
         - is_true: "value_not_to_replace"
         - is_false: "value_not_to_replace"
         ---
-        "use cat with no header":
-          - do:
-              cat.indices:
-                {}
-              allowed_warnings:
-                - "added allowed warning"
-              allowed_warnings_regex:
-                - "added allowed warning regex .* [0-9]"
-          - match: {}
+        use cat with no header:
+        - do:
+            cat.indices: {}
+            allowed_warnings:
+            - "added allowed warning"
+            allowed_warnings_regex:
+            - "added allowed warning regex .* [0-9]"
+        - match: {}
         """.stripIndent()).readAll()
 
         expectedAll.eachWithIndex{ ObjectNode expected, int i ->

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/rest/compat/RestCompatTestTransformTask.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SequenceWriter;
+import com.fasterxml.jackson.databind.node.IntNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
@@ -24,6 +25,7 @@
 import org.elasticsearch.gradle.internal.test.rest.transform.do_.ReplaceKeyInDo;
 import org.elasticsearch.gradle.internal.test.rest.transform.headers.InjectHeaders;
 import org.elasticsearch.gradle.internal.test.rest.transform.length.ReplaceKeyInLength;
+import org.elasticsearch.gradle.internal.test.rest.transform.length.ReplaceValueInLength;
 import org.elasticsearch.gradle.internal.test.rest.transform.match.AddMatch;
 import org.elasticsearch.gradle.internal.test.rest.transform.match.RemoveMatch;
 import org.elasticsearch.gradle.internal.test.rest.transform.match.ReplaceKeyInMatch;
@@ -152,6 +154,10 @@ public void replaceKeyInLength(String oldKeyName, String newKeyName) {
         transformations.add(new ReplaceKeyInLength(oldKeyName, newKeyName, null));
     }
 
+    public void replaceValueInLength(String oldKeyName, int newValue, String testName) {
+        transformations.add(new ReplaceValueInLength(oldKeyName, MAPPER.convertValue(newValue, IntNode.class), testName));
+    }
+
     /**
      * A transformation to replace the key in a match assertion.
      * @see ReplaceKeyInMatch
@@ -162,6 +168,8 @@ public void replaceKeyInMatch(String oldKeyName, String newKeyName) {
         transformations.add(new ReplaceKeyInMatch(oldKeyName, newKeyName, null));
     }
 
+
+
     /**
      * Replaces all the values of a is_true assertion for all project REST tests.
      * For example "is_true": "value_to_replace" to "is_true": "value_replaced"

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/length/ReplaceValueInLength.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.gradle.internal.test.rest.transform.length;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.elasticsearch.gradle.internal.test.rest.transform.ReplaceByKey;
+import org.gradle.api.tasks.Internal;
+
+/**
+ * A transformation to replace the value in a length assertion.
+ * For example, change from "length":{"index._type": 1} to "length":{"index._type": 2}
+ */
+public class ReplaceValueInLength extends ReplaceByKey {
+
+    public ReplaceValueInLength(String replaceKey, JsonNode replacementNode, String testName) {
+        super(replaceKey, replaceKey, replacementNode, testName);
+    }
+
+    @Override
+    @Internal
+    public String getKeyToFind() {
+        return "length";
+    }
+
+    @Override
+    public void transformTest(ObjectNode lengthParent) {
+        ObjectNode lengthNode = (ObjectNode) lengthParent.get(getKeyToFind());
+        lengthNode.remove(requiredChildKey());
+        lengthNode.set(getNewChildKey(), getReplacementNode());
+    }
+}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextual.java

@@ -18,7 +18,7 @@
 import org.gradle.api.tasks.Optional;
 
 /**
- * A transformation to replace a key/value combination. 
+ * A transformation to replace a key/value combination.
  */
 public class ReplaceTextual implements RestTestTransformByParentObject {
     private final String keyToReplaceName;

modules/parent-join/build.gradle

@@ -22,6 +22,6 @@ restResources {
 
 tasks.named("yamlRestCompatTest").configure {
   systemProperty 'tests.rest.blacklist', [
-    '/30_inner_hits/Test two sub-queries with only one having inner_hits'
+//    '/30_inner_hits/Test two sub-queries with only one having inner_hits'
   ].join(',')
 }

x-pack/plugin/build.gradle

@@ -139,6 +139,19 @@ def v7compatibilityNotSupportedTests = {
     'ml/datafeeds_crud/Test update datafeed to point to missing job',
     'ml/datafeeds_crud/Test update datafeed to point to different job',
     'ml/datafeeds_crud/Test update datafeed to point to job already attached to another datafeed',
+    //rollup was an experimental feature
+    //https://github.com/elastic/elasticsearch/pull/41227.
+    'rollup/delete_job/Test basic delete_job',
+    'rollup/delete_job/Test delete job twice',
+    'rollup/delete_job/Test delete running job',
+    'rollup/get_jobs/Test basic get_jobs',
+    'rollup/put_job/Test basic put_job',
+    //https://github.com/elastic/elasticsearch/pull/41502
+    'rollup/start_job/Test start job twice',
+
+    // a type field was added to cat.ml_trained_models #73660, this is a backwards compatible change.
+    // still this is a cat api, and we don't support them with rest api compatibility. (the test would be very hard to transform too)
+    'ml/trained_model_cat_apis/Test cat trained models'
   ]
 }
 
@@ -151,17 +164,7 @@ tasks.named("yamlRestCompatTest").configure {
 
   //TODO: blacklist specific to REST API compatibility
   restTestBlacklist.addAll([
-    'license/30_enterprise_license/Installing enterprise license',
-    //https://github.com/elastic/elasticsearch/pull/41227.
-    'rollup/delete_job/Test basic delete_job',
-    'rollup/delete_job/Test delete job twice',
-    'rollup/delete_job/Test delete running job',
-    'rollup/get_jobs/Test basic get_jobs',
-    'rollup/put_job/Test basic put_job',
-    //https://github.com/elastic/elasticsearch/pull/41502
-    'rollup/start_job/Test start job twice',
-    // a type field was added to cat.ml_trained_models #73660, this might need some work
-    'ml/trained_model_cat_apis/Test cat trained models'
+//    'license/30_enterprise_license/Installing enterprise license',
     ] + v7compatibilityNotSupportedTests())
 
 
@@ -220,4 +223,9 @@ tasks.named("precommit").configure {
 tasks.named("transformV7RestTests").configure({ task ->
   task.replaceValueInMatch("_type", "_doc")
   task.addAllowedWarningRegex("\\[types removal\\].*")
+  task.replaceValueInLength("license", 12, "Installing enterprise license")
+  task.replaceValueInMatch("license.type", "enterprise", "Installing enterprise license")
+  task.replaceValueInMatch("license.mode", "enterprise", "Installing enterprise license")
+  task.addAllowedWarningRegexForTest("Including \\[accept_enterprise\\] in get license.*", "Installing enterprise license")
+  task.replaceValueInMatch("license.max_nodes", null, "Installing enterprise license")
 })

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java

@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.elasticsearch.core.RestApiVersion.onOrAfter;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestStatus.NOT_FOUND;
 import static org.elasticsearch.rest.RestStatus.OK;
@@ -66,7 +67,8 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
             deprecationLogger.deprecate(DeprecationCategory.API, "get_license_accept_enterprise",
                 "Including [accept_enterprise] in get license requests is deprecated." +
                         " The parameter will be removed in the next major version");
-            if (request.paramAsBoolean("accept_enterprise", true) == false) {
+            if (request.paramAsBoolean("accept_enterprise", true) == false
+                && request.getRestApiVersion().matches(onOrAfter(RestApiVersion.V_8))) {
                 throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
             }
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rest/action/RestXPackInfoAction.java

@@ -9,6 +9,7 @@
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.logging.DeprecationCategory;
 import org.elasticsearch.common.logging.DeprecationLogger;
+import org.elasticsearch.core.RestApiVersion;
 import org.elasticsearch.protocol.xpack.XPackInfoRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -19,6 +20,7 @@
 import java.util.EnumSet;
 import java.util.List;
 
+import static org.elasticsearch.core.RestApiVersion.onOrAfter;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.HEAD;
 
@@ -50,7 +52,8 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
             deprecationLogger.deprecate(DeprecationCategory.API, "get_license_accept_enterprise",
                 "Including [accept_enterprise] in get license requests is deprecated." +
                     " The parameter will be removed in the next major version");
-            if (request.paramAsBoolean("accept_enterprise", true) == false) {
+            if (request.paramAsBoolean("accept_enterprise", true) == false
+                && request.getRestApiVersion().matches(onOrAfter(RestApiVersion.V_8))) {
                 throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
             }
         }