Check job groups on update

Author: davidkyle

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

@@ -437,6 +437,35 @@ public void onFailure(Exception e) {
 
     public void updateJob(UpdateJobAction.Request request, ActionListener<PutJobAction.Response> actionListener) {
         MlMetadata mlMetadata = MlMetadata.getMlMetadata(clusterService.state());
+
+        if (request.getJobUpdate().getGroups() != null && request.getJobUpdate().getGroups().isEmpty() == false) {
+
+            // check the new groups are not job Ids
+            for (String group : request.getJobUpdate().getGroups()) {
+                if (mlMetadata.getJobs().containsKey(group)) {
+                    actionListener.onFailure(new ResourceAlreadyExistsException(
+                            Messages.getMessage(Messages.JOB_AND_GROUP_NAMES_MUST_BE_UNIQUE, group)));
+                }
+            }
+
+            jobConfigProvider.jobIdMatches(request.getJobUpdate().getGroups(), ActionListener.wrap(
+                    matchingIds -> {
+                        if (matchingIds.isEmpty()) {
+                            updateJobPostInitialChecks(request, mlMetadata, actionListener);
+                        } else {
+                            actionListener.onFailure(new ResourceAlreadyExistsException(
+                                    Messages.getMessage(Messages.JOB_AND_GROUP_NAMES_MUST_BE_UNIQUE, matchingIds.get(0))));
+                        }
+                    },
+                    actionListener::onFailure
+            ));
+        } else {
+            updateJobPostInitialChecks(request, mlMetadata, actionListener);
+        }
+    }
+
+    private void updateJobPostInitialChecks(UpdateJobAction.Request request, MlMetadata mlMetadata,
+                           ActionListener<PutJobAction.Response> actionListener) {
         if (ClusterStateJobUpdate.jobIsInMlMetadata(mlMetadata, request.getJobId())) {
             updateJobClusterState(request, actionListener);
         } else {

x-pack/plugin/src/test/resources/rest-api-spec/test/ml/jobs_crud.yml

@@ -397,6 +397,28 @@
             "description":"Can't update all description"
           }
 
+  - do:
+      xpack.ml.put_job:
+        job_id: job-crud-update-group-name-clash
+        body:  >
+          {
+            "analysis_config" : {
+                "bucket_span": "1h",
+                "detectors" :[{"function":"metric","field_name":"responsetime","by_field_name":"airline"}]
+            },
+            "data_description" : {
+            }
+          }
+
+  - do:
+      catch: "/job and group names must be unique/"
+      xpack.ml.update_job:
+        job_id: jobs-crud-update-job
+        body:  >
+          {
+            "groups": ["job-crud-update-group-name-clash"]
+          }
+
 ---
 "Test cannot decrease model_memory_limit below current usage":
   - skip: