Add deprecated accept_enterprise param to /_xpack

This change introduces support for the "accept_enterprise" parameter
to the /_xpack endpoint, to match the parameter on the /_license
endpoint.

This parameter is deprecated, it does nothing, and may not be set to
any value other than true. It exists solely to support upgrades from
7.x versions where the parameter does have meaning.

Relates: elastic#58217

Author: tvernum

x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java

@@ -5,10 +5,12 @@
  */
 package org.elasticsearch.protocol.xpack;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.license.License;
 
 import java.io.IOException;
 import java.util.EnumSet;
@@ -40,8 +42,10 @@ public static EnumSet<Category> toSet(String... categories) {
 
     private boolean verbose;
     private EnumSet<Category> categories = EnumSet.noneOf(Category.class);
+    private int licenseVersion = License.VERSION_CURRENT;
 
-    public XPackInfoRequest() {}
+    public XPackInfoRequest() {
+    }
 
     public XPackInfoRequest(StreamInput in) throws IOException {
         // NOTE: this does *not* call super, THIS IS A BUG
@@ -52,6 +56,9 @@ public XPackInfoRequest(StreamInput in) throws IOException {
             categories.add(Category.valueOf(in.readString()));
         }
         this.categories = categories;
+        if (in.getVersion().after(Version.V_7_8_0)) {
+            this.licenseVersion = in.readVInt();
+        }
     }
 
     public void setVerbose(boolean verbose) {
@@ -70,6 +77,14 @@ public EnumSet<Category> getCategories() {
         return categories;
     }
 
+    public int getLicenseVersion() {
+        return licenseVersion;
+    }
+
+    public void setLicenseVersion(int licenseVersion) {
+        this.licenseVersion = licenseVersion;
+    }
+
     @Override
     public ActionRequestValidationException validate() {
         return null;
@@ -82,5 +97,8 @@ public void writeTo(StreamOutput out) throws IOException {
         for (Category category : categories) {
             out.writeString(category.name());
         }
+        if (out.getVersion().after(Version.V_7_8_0)) {
+            out.writeVInt(this.licenseVersion);
+        }
     }
 }

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

@@ -33,4 +33,8 @@ public XPackInfoRequestBuilder setCategories(EnumSet<XPackInfoRequest.Category>
         return this;
     }
 
+    public XPackInfoRequestBuilder setLicenseVersion(int licenseVersion) {
+        request.setLicenseVersion(licenseVersion);
+        return this;
+    }
 }

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

@@ -5,7 +5,10 @@
  */
 package org.elasticsearch.xpack.core.rest.action;
 
+import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.logging.DeprecationLogger;
+import org.elasticsearch.license.RestGetLicenseAction;
 import org.elasticsearch.protocol.xpack.XPackInfoRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -21,6 +24,8 @@
 
 public class RestXPackInfoAction extends BaseRestHandler {
 
+    private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(RestXPackInfoAction.class));
+
     @Override
     public List<Route> routes() {
         return List.of(
@@ -39,6 +44,17 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
         // we piggyback verbosity on "human" output
         boolean verbose = request.paramAsBoolean("human", true);
 
+        // In 7.x, there was an opt-in flag to show "enterprise" licenses. In 8.0 the flag is deprecated and can only be true
+        // TODO Remove this from 9.0
+        if (request.hasParam("accept_enterprise")) {
+            deprecationLogger.deprecate("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) {
+                throw new IllegalArgumentException("The [accept_enterprise] parameters may not be false");
+            }
+        }
+
         EnumSet<XPackInfoRequest.Category> categories = XPackInfoRequest.Category
                 .toSet(request.paramAsStringArray("categories", new String[] { "_all" }));
         return channel ->

x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.info.json

@@ -19,6 +19,11 @@
       "categories":{
         "type":"list",
         "description":"Comma-separated list of info categories. Can be any of: build, license, features"
+      },
+      "accept_enterprise":{
+        "type":"boolean",
+        "description":"Supported for backwards compatibility with 7.x. If this param is used it must be set to true",
+        "deprecated":true
       }
     }
   }

x-pack/plugin/src/test/resources/rest-api-spec/test/license/30_enterprise_license.yml

@@ -30,6 +30,13 @@ teardown:
   - match: { license.max_resource_units: 50 }
   - match: { license.max_nodes: null }
 
+  ## Check the xpack info API as well
+  - do:
+      xpack.info: {}
+  - match: { license.type: "enterprise" }
+  - match: { license.mode: "enterprise" }
+
+  ## Check the opt-in v5 license type
   - do:
       warnings:
         - "Including [accept_enterprise] in get license requests is deprecated. The parameter will be removed in the next major version"
@@ -42,6 +49,15 @@ teardown:
   ## Always returns real type
   - match: { license.type: "enterprise" }
 
+  ## Check the xpack info API as well
+  - do:
+      warnings:
+        - "Including [accept_enterprise] in get license requests is deprecated. The parameter will be removed in the next major version"
+      xpack.info:
+        accept_enterprise: true
+  - match: { license.type: "enterprise" }
+  - match: { license.mode: "enterprise" }
+
   ## "false" is rejected
   - do:
       catch: bad_request
@@ -50,3 +66,10 @@ teardown:
       license.get:
         accept_enterprise: false
 
+  - do:
+      catch: bad_request
+      warnings:
+        - "Including [accept_enterprise] in get license requests is deprecated. The parameter will be removed in the next major version"
+      xpack.info:
+        accept_enterprise: false
+

x-pack/plugin/src/test/resources/rest-api-spec/test/xpack/20_info.yml

@@ -0,0 +1,9 @@
+"XPack Info API":
+    - do:
+        xpack.info: {}
+
+    - match: { license.type: "trial" }
+    - match: { license.mode: "trial" }
+    - match: { license.status: "active" }
+
+