[Transform] Ensure transform updates only modify the expected transfo…

…rm task (#102934)
elastic · Dec 4, 2023 · 67ab4b4 · 67ab4b4
1 parent c54ce68
commit 67ab4b4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/docs/changelog/102934.yaml b/docs/changelog/102934.yaml
@@ -0,0 +1,6 @@
+pr: 102934
+summary: Ensure transform updates only modify the expected transform task
+area: Transform
+type: bug
+issues:
+ - 102933
diff --git a/...re/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java b/...re/src/main/java/org/elasticsearch/xpack/core/transform/action/UpdateTransformAction.java
@@ -15,6 +15,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.tasks.Task;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
@@ -186,6 +187,15 @@ public boolean equals(Object obj) {
                 && Objects.equals(authState, other.authState)
                 && getTimeout().equals(other.getTimeout());
         }
+
+        @Override
+        public boolean match(Task task) {
+            if (task.getDescription().startsWith(TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX)) {
+                String taskId = task.getDescription().substring(TransformField.PERSISTENT_TASK_DESCRIPTION_PREFIX.length());
+                return taskId.equals(this.id);
+            }
+            return false;
+        }
     }
 
     public static class Response extends BaseTasksResponse implements ToXContentObject {

diff --git a/...java/org/elasticsearch/xpack/core/transform/action/UpdateTransformActionRequestTests.java b/...java/org/elasticsearch/xpack/core/transform/action/UpdateTransformActionRequestTests.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.persistent.AllocatedPersistentTask;
 import org.elasticsearch.xpack.core.transform.action.UpdateTransformAction.Request;
 import org.elasticsearch.xpack.core.transform.transforms.AuthorizationStateTests;
 import org.elasticsearch.xpack.core.transform.transforms.TransformConfigTests;
@@ -74,4 +75,12 @@ protected Request mutateInstance(Request instance) {
 
         return new Request(update, id, deferValidation, timeout);
     }
+
+    public void testMatch() {
+        Request request = new Request(randomTransformConfigUpdate(), "my-transform-7", false, null);
+        assertTrue(request.match(new AllocatedPersistentTask(123, "", "", "data_frame_my-transform-7", null, null)));
+        assertFalse(request.match(new AllocatedPersistentTask(123, "", "", "data_frame_my-transform-", null, null)));
+        assertFalse(request.match(new AllocatedPersistentTask(123, "", "", "data_frame_my-transform-77", null, null)));
+        assertFalse(request.match(new AllocatedPersistentTask(123, "", "", "my-transform-7", null, null)));
+    }
 }