diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/TransformSingleNodeTestCase.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/TransformSingleNodeTestCase.java index 0b654d696bc3a..562830d9bb060 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/TransformSingleNodeTestCase.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/TransformSingleNodeTestCase.java @@ -23,8 +23,10 @@ import org.elasticsearch.reindex.ReindexPlugin; import org.elasticsearch.search.SearchHit; import org.elasticsearch.test.ESSingleNodeTestCase; +import org.elasticsearch.xpack.core.transform.action.DeleteTransformAction; import org.elasticsearch.xpack.core.transform.action.GetTransformAction; import org.elasticsearch.xpack.core.transform.action.PutTransformAction; +import org.elasticsearch.xpack.core.transform.action.StopTransformAction; import org.elasticsearch.xpack.core.transform.action.UpdateTransformAction; import org.elasticsearch.xpack.core.transform.transforms.DestConfig; import org.elasticsearch.xpack.core.transform.transforms.QueryConfig; @@ -137,6 +139,16 @@ protected TransformConfig getTransform(String transformId) { return configs.getFirst(); } + protected void stopTransform(String transformId) { + var request = new StopTransformAction.Request(transformId, true, false, TimeValue.THIRTY_SECONDS, false, false); + assertTrue(client().execute(StopTransformAction.INSTANCE, request).actionGet(TimeValue.THIRTY_SECONDS).isAcknowledged()); + } + + protected void deleteTransform(String transformId) { + var request = new DeleteTransformAction.Request(transformId, true, false, TimeValue.THIRTY_SECONDS); + client().execute(DeleteTransformAction.INSTANCE, request).actionGet(TimeValue.THIRTY_SECONDS); + } + protected void updateTransform(String transformId, TransformConfigUpdate transformConfigUpdate) { var request = new UpdateTransformAction.Request(transformConfigUpdate, transformId, false, TimeValue.THIRTY_SECONDS); client().execute(UpdateTransformAction.INSTANCE, request).actionGet(TimeValue.THIRTY_SECONDS); diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformCrossProjectIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformCrossProjectIT.java index 2b6fb812480bc..ab42ea5dda410 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformCrossProjectIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformCrossProjectIT.java @@ -64,6 +64,8 @@ public void testGetTransformWithProjectRouting() { var transformConfig = getTransform(transformId); assertThat(transformConfig.getSource().getProjectRouting(), equalTo(expectedProjectRouting)); + + deleteTransform(transformId); } public void testUpdateTransformWithProjectRouting() throws Exception { @@ -112,6 +114,8 @@ public void testUpdateTransformWithProjectRouting() throws Exception { ) ) ); + + deleteTransform(transformId); } } diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformInternalIndexIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformInternalIndexIT.java index 4f9296ae27c17..178a6424900e7 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformInternalIndexIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformInternalIndexIT.java @@ -129,5 +129,7 @@ public void testUpdateDeletesOldTransformConfig() throws Exception { GetResponse getResponse = client().get(getRequest).actionGet(); assertThat(getResponse.isExists(), is(true)); } + + deleteTransform(transformId); } } diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoRemoteClusterClientNodeIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoRemoteClusterClientNodeIT.java index 295204c03e975..86d59addea77d 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoRemoteClusterClientNodeIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoRemoteClusterClientNodeIT.java @@ -60,6 +60,8 @@ public void testPutTransformWithRemoteIndex_DeferValidation() { TransformConfig config = randomConfig(transformId, "remote_cluster:my-index"); PutTransformAction.Request request = new PutTransformAction.Request(config, true, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT); client().execute(PutTransformAction.INSTANCE, request).actionGet(); + + deleteTransform(transformId); } public void testPutTransformWithRemoteIndex_NoDeferValidation() { @@ -105,6 +107,8 @@ public void testUpdateTransformWithRemoteIndex_DeferValidation() { AcknowledgedRequest.DEFAULT_ACK_TIMEOUT ); client().execute(UpdateTransformAction.INSTANCE, request).actionGet(); + + deleteTransform(transformId); } public void testUpdateTransformWithRemoteIndex_NoDeferValidation() { @@ -143,6 +147,8 @@ public void testUpdateTransformWithRemoteIndex_NoDeferValidation() { containsString("transform requires a remote connection but the node does not have the remote_cluster_client role") ) ); + + deleteTransform(transformId); } private static TransformConfig randomConfig(String transformId, String sourceIndex) { diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoTransformNodeIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoTransformNodeIT.java index 170dcb3e38123..286d079ff99cb 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoTransformNodeIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformNoTransformNodeIT.java @@ -79,6 +79,8 @@ public void testPutTransform_DeferValidation() { assertThat(response.isAcknowledged(), is(true)); assertCriticalWarnings("Transform requires the transform node role for at least 1 node, found no transform nodes"); + + deleteTransform(transformId); } public void testPutTransform_NoDeferValidation() { @@ -120,6 +122,8 @@ public void testUpdateTransform_DeferValidation() { client().execute(UpdateTransformAction.INSTANCE, request).actionGet(); assertCriticalWarnings("Transform requires the transform node role for at least 1 node, found no transform nodes"); + + deleteTransform(transformId); } public void testUpdateTransform_NoDeferValidation() { @@ -153,6 +157,8 @@ public void testUpdateTransform_NoDeferValidation() { () -> client().execute(UpdateTransformAction.INSTANCE, request).actionGet() ); assertThat(e.getMessage(), is(equalTo("Transform requires the transform node role for at least 1 node, found no transform nodes"))); + + deleteTransform(transformId); } private static TransformConfig randomConfig(String transformId) { diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformOldTransformsIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformOldTransformsIT.java index df5974905146b..ce2b62d1e0c54 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformOldTransformsIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/integration/TransformOldTransformsIT.java @@ -29,7 +29,6 @@ import org.elasticsearch.xpack.core.transform.action.GetTransformAction; import org.elasticsearch.xpack.core.transform.action.PutTransformAction; import org.elasticsearch.xpack.core.transform.action.StartTransformAction; -import org.elasticsearch.xpack.core.transform.action.StopTransformAction; import org.elasticsearch.xpack.core.transform.action.UpdateTransformAction; import org.elasticsearch.xpack.core.transform.transforms.DestConfig; import org.elasticsearch.xpack.core.transform.transforms.SourceConfig; @@ -141,11 +140,8 @@ public void testStopThrowsForDeprecatedTransformConfig() throws Exception { assertTrue(startTransformActionResponse.isAcknowledged()); - StopTransformAction.Response stopTransformActionResponse = client().execute( - StopTransformAction.INSTANCE, - new StopTransformAction.Request(transformId, true, false, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, false, false) - ).actionGet(); - assertTrue(stopTransformActionResponse.isAcknowledged()); + stopTransform(transformId); + deleteTransform(transformId); } private void createTransformIndex() throws Exception { @@ -179,6 +175,8 @@ public void testUpdateReplacesDeprecatedTransformSettings() throws Exception { client().execute(UpdateTransformAction.INSTANCE, updateRequest).actionGet(); assertMaxPageSearchSizeInSettings(transformId, expectedMaxPageSearchSize); + + deleteTransform(transformId); } private String createTransformWithDeprecatedMaxPageSearchSize(int maxPageSearchSize) throws Exception { @@ -252,6 +250,9 @@ public void testStartReplacesDeprecatedTransformSettings() throws Exception { assertTrue(startTransformActionResponse.isAcknowledged()); assertMaxPageSearchSizeInSettings(transformId, expectedMaxPageSearchSize); + + stopTransform(transformId); + deleteTransform(transformId); } public void testMigratedTransformIndex() { @@ -313,6 +314,8 @@ public void testMigratedTransformIndex() { var getTransformResponse = client().execute(GetTransformAction.INSTANCE, getTransformRequest).actionGet(); var transformConfig = getTransformResponse.getTransformConfigurations().get(0); assertThat(transformConfig.getDestination().getIndex(), equalTo("some-new-dest-index")); + + deleteTransform(transformId); } }