Autoscaling role validation 7x (#66116)

While transport client is not supported for autoscaling in 7.x, some
tests rely on it and this commit ensures that the validation of roles
happen server side and not client side.

Relates #65775 and #66082

Author: henningandersen

x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/PutAutoscalingPolicyAction.java

@@ -11,7 +11,6 @@
 import org.elasticsearch.action.ValidateActions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -23,15 +22,13 @@
 import java.io.IOException;
 import java.util.AbstractMap;
 import java.util.Collections;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class PutAutoscalingPolicyAction extends ActionType<AcknowledgedResponse> {
@@ -142,15 +139,7 @@ public SortedMap<String, Settings> deciders() {
         @Override
         public ActionRequestValidationException validate() {
             ActionRequestValidationException exception = null;
-            if (roles != null) {
-                List<String> errors = roles.stream()
-                    .filter(not(DiscoveryNode.getPossibleRoleNames()::contains))
-                    .collect(Collectors.toList());
-                if (errors.isEmpty() == false) {
-                    exception = new ActionRequestValidationException();
-                    exception.addValidationErrors(errors);
-                }
-            }
+            // roles validation done in transport action in 7.x to be compatible with transport client.
 
             if (Strings.validFileName(name) == false) {
                 exception = ValidateActions.addValidationError(
@@ -175,9 +164,4 @@ public int hashCode() {
             return Objects.hash(name, roles, deciders);
         }
     }
-
-    // java 11 forward compatibility
-    private static <T> Predicate<T> not(Predicate<T> predicate) {
-        return predicate.negate();
-    }
 }

x-pack/plugin/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyAction.java

@@ -9,6 +9,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.action.support.master.AcknowledgedTransportMasterNodeAction;
@@ -18,6 +19,7 @@
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -28,8 +30,12 @@
 import org.elasticsearch.xpack.autoscaling.policy.AutoscalingPolicyMetadata;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.SortedMap;
+import java.util.SortedSet;
 import java.util.TreeMap;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public class TransportPutAutoscalingPolicyAction extends AcknowledgedTransportMasterNodeAction<PutAutoscalingPolicyAction.Request> {
 
@@ -76,6 +82,17 @@ protected void masterOperation(
         final ClusterState state,
         ActionListener<AcknowledgedResponse> listener
     ) {
+        SortedSet<String> roles = request.roles();
+        if (roles != null) {
+            List<String> errors = roles.stream().filter(not(DiscoveryNode.getPossibleRoleNames()::contains)).collect(Collectors.toList());
+            if (errors.isEmpty() == false) {
+                ActionRequestValidationException exception = new ActionRequestValidationException();
+                exception.addValidationErrors(errors);
+                listener.onFailure(exception);
+                return;
+            }
+        }
+
         clusterService.submitStateUpdateTask("put-autoscaling-policy", new AckedClusterStateUpdateTask(request, listener) {
             @Override
             public ClusterState execute(final ClusterState currentState) {
@@ -144,4 +161,9 @@ static ClusterState putAutoscalingPolicy(
         builder.metadata(Metadata.builder(currentState.getMetadata()).putCustom(AutoscalingMetadata.NAME, newMetadata).build());
         return builder.build();
     }
+
+    // java 11 forward compatibility
+    private static <T> Predicate<T> not(Predicate<T> predicate) {
+        return predicate.negate();
+    }
 }

x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/AutoscalingIT.java

@@ -51,7 +51,7 @@ public void testMLAutoscalingCapacity() {
             Settings.builder().put(MlAutoscalingDeciderService.DOWN_SCALE_DELAY.getKey(), TimeValue.ZERO).build());
         final PutAutoscalingPolicyAction.Request request = new PutAutoscalingPolicyAction.Request(
             "ml_test",
-            new TreeSet<>(),
+            new TreeSet<>(org.elasticsearch.common.collect.Set.of("ml")),
             deciders
         );
         assertAcked(client().execute(PutAutoscalingPolicyAction.INSTANCE, request).actionGet());