Fix - Previous transform is not deleted

Author: Chris Wiechmann

api-builder-plugin-fn-elasticsearch/CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.2.0] 2022-03-11
+## [2.2.1] 2022-03-11
+### Fixed
+- Previous transform was not deleted as requested
+
+## [2.2.1] 2022-03-11
 ### Changed
 - When updating an existing transform, the last checkpoint of the existing transform is taken over as a query limitation to the new transform
   - to avoid re-indexing the same documents again

api-builder-plugin-fn-elasticsearch/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway-api-builder-ext/api-builder-plugin-fn-elasticsearch",
-	"version": "2.2.0",
+	"version": "2.2.1",
 	"description": "Integrate Elasticsearch into your API-Builder flow to combine search data for instance with other data available in your flow.",
 	"author": "Chris Wiechmann <cwiechmann@axway.com> (http://www.axway.com)",
 	"license": "Apache-2.0",

api-builder-plugin-fn-elasticsearch/src/actions/transform.js

@@ -130,9 +130,9 @@ async function putTransform(params, options) {
 			options.logger.info(`Starting created transform with ID: ${params.transformId}`);
 			await client.transform.startTransform( {transformId: params.transformId}, { ignore: [404], maxRetries: 3 });
 		}
-		if(deletePreviousTransform && actualTransformId) {
-			options.logger.info(`Deleting previous transform with ID: ${actualTransformId}`);
-			await client.transform.deleteTransform( {transformId: actualTransformId}, { ignore: [404], maxRetries: 3 });
+		if(deletePreviousTransform && runningTransforms.length == 1) {
+			options.logger.info(`Deleting previous transform with ID: ${runningTransforms[0].id}`);
+			await client.transform.deleteTransform( {transformId: runningTransforms[0].id}, { ignore: [404], maxRetries: 3 });
 		}
 		return putTransformResult;
 	} catch (e) {

api-builder-plugin-fn-elasticsearch/test/transform/Transform-Tests.js

@@ -83,6 +83,30 @@ describe('Transform tests', () => {
 			expect(mockedStopTransform.callCount).to.equals(1); // There is nothing to stop
 		});
 
+		it('should pass - 1 running transform (is the actual transform) - Created & Started new transform - Old deleted - Checkpoint taken over as query limition to new transform', async () => {
+			const mockedGetTransformStats = setupElasticsearchMock(client, 'transform.getTransformStats', './test/mock/transform/getTransformStatsResponseOneStarted.json', false);
+			const mockedPutTransform = setupElasticsearchMock(client, 'transform.putTransform', './test/mock/transform/putTransformResponse.json', false);
+			const mockedDeleteTransform = setupElasticsearchMock(client, 'transform.deleteTransform', './test/mock/transform/stopTransformResponse.json', false);
+			const mockedStartTransform = setupElasticsearchMock(client, 'transform.startTransform', './test/mock/transform/startTransformResponse.json', false);
+			const mockedStopTransform = setupElasticsearchMock(client, 'transform.stopTransform', './test/mock/transform/stopTransformResponse.json', false);
+
+			const inputParameter = { 
+				transformId: 'traffic-summary-hourly', 
+				idSuffix: "v1",
+				deletePreviousTransform: true,
+				body: JSON.parse(fs.readFileSync('./test/mock/transform/putTransformRequestBody.json')) };
+			const { value, output } = await flowNode.putTransform(inputParameter);
+
+			expect(output).to.equal('next');
+			expect(mockedGetTransformStats.callCount).to.equals(1); // should be called once to get all transforms
+			expect(mockedPutTransform.callCount).to.equals(1); // a new transform should be created
+			// Transform body should have been extended about a query limitation
+			expect(mockedPutTransform.lastCall.arg.body.source.query).to.deep.equals({ "bool": { "should": [ { "range": { "@timestamp": { "gt": 1646913600000 } } } ],"minimum_should_match": 1 } });
+			expect(mockedStartTransform.callCount).to.equals(1); // and started
+			expect(mockedDeleteTransform.callCount).to.equals(1); // Previous transform should be deleted
+			expect(mockedStopTransform.callCount).to.equals(1); // There is nothing to stop
+		});
+
 		it('should return with noUpdate as the actual transform is still indexing', async () => {
 			const mockedGetTransformStats = setupElasticsearchMock(client, 'transform.getTransformStats', './test/mock/transform/getTransformStatsResponseOneIndexing.json', false);
 			const mockedPutTransform = setupElasticsearchMock(client, 'transform.putTransform', './test/mock/transform/putTransformResponse.json', false);