Check new job’s groups are not job Ids

Author: davidkyle

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

@@ -348,6 +348,15 @@ public void putJob(PutJobAction.Request request, AnalysisRegistry analysisRegist
             return;
         }
 
+        // and that the new job's groups are not job Ids
+        for (String group : job.getGroups()) {
+            if (currentMlMetadata.getJobs().containsKey(group)) {
+                actionListener.onFailure(new
+                        ResourceAlreadyExistsException(Messages.getMessage(Messages.JOB_AND_GROUP_NAMES_MUST_BE_UNIQUE, group)));
+                return;
+            }
+        }
+
         ActionListener<Boolean> putJobListener = new ActionListener<Boolean>() {
             @Override
             public void onResponse(Boolean indicesCreated) {

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java

@@ -653,7 +653,6 @@ public void testPutJob_ThrowsIfIdIsTheSameAsAGroup() throws IOException {
         MockClientBuilder mockClientBuilder = new MockClientBuilder("jobmanager-test");
         JobManager jobManager = createJobManager(mockClientBuilder.build());
 
-        PutJobAction.Request putJobRequest = new PutJobAction.Request(createJobFoo());
 
         MlMetadata.Builder mlMetadata = new MlMetadata.Builder();
         Job.Builder jobBuilder = buildJobBuilder("job-with-group-foo");
@@ -662,6 +661,8 @@ public void testPutJob_ThrowsIfIdIsTheSameAsAGroup() throws IOException {
         ClusterState clusterState = ClusterState.builder(new ClusterName("name"))
                 .metaData(MetaData.builder().putCustom(MlMetadata.TYPE, mlMetadata.build())).build();
 
+        // job id cannot be a group
+        PutJobAction.Request putJobRequest = new PutJobAction.Request(createJobFoo());
         jobManager.putJob(putJobRequest, analysisRegistry, clusterState, new ActionListener<PutJobAction.Response>() {
             @Override
             public void onResponse(PutJobAction.Response response) {
@@ -674,6 +675,26 @@ public void onFailure(Exception e) {
                 assertEquals("job and group names must be unique but job [foo] and group [foo] have the same name", e.getMessage());
             }
         });
+
+        // the job's groups cannot be job Ids
+        jobBuilder = buildJobBuilder("job-with-clashing-group-name");
+        jobBuilder.setCreateTime(null);
+        jobBuilder.setGroups(Collections.singletonList("job-with-group-foo"));
+        putJobRequest = new PutJobAction.Request(jobBuilder);
+
+        jobManager.putJob(putJobRequest, analysisRegistry, clusterState, new ActionListener<PutJobAction.Response>() {
+            @Override
+            public void onResponse(PutJobAction.Response response) {
+                fail("should have got an error");
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                assertTrue(e instanceof ResourceAlreadyExistsException);
+                assertEquals("job and group names must be unique but job [job-with-group-foo] and " +
+                        "group [job-with-group-foo] have the same name", e.getMessage());
+            }
+        });
     }
 
     public void testNotifyFilterChangedGivenNoop() {