Fixed the way custom properties with a parent are created

Author: Chris Wiechmann

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/src/customProperties.js

@@ -66,17 +66,9 @@ async function mergeCustomProperties(params, options) {
 				desiredTemplate.mappings.properties[customPropertiesSettings.parent] = {};
 			}
 			if(type == "custom") {
-				if(customPropertiesSettings.parent) {
-					desiredTemplate.mappings.properties[customPropertiesSettings.parent][`customProperties.${customPropertyName}`] = { type: "text", norms: false, fields: { "keyword":  { type: "keyword"} } }; 
-				} else {
-					desiredTemplate.mappings.properties[`customProperties.${customPropertyName}`] = { type: "text", norms: false, fields: { "keyword":  { type: "keyword"} } };
-				}
+				desiredTemplate.mappings.properties[`${customPropertiesSettings.parent}customProperties.${customPropertyName}`] = { type: "text", norms: false, fields: { "keyword":  { type: "keyword"} } }; 
 			} else {
-				if(customPropertiesSettings.parent) {
-					desiredTemplate.mappings.properties[customPropertiesSettings.parent][`customProperties.${customPropertyName}`] = { type: "keyword"};
-				} else {
-					desiredTemplate.mappings.properties[`customProperties.${customPropertyName}`] = { type: "keyword"};
-				}
+				desiredTemplate.mappings.properties[`${customPropertiesSettings.parent}customProperties.${customPropertyName}`] = { type: "keyword"};
 			}
 			return true;
 		}

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/test/test-customProperties-MappingMerge.js

@@ -125,16 +125,16 @@ describe('Merge custom properties tests', () => {
 				customProperties: JSON.parse(fs.readFileSync('./test/testInput/customPropertiesConfig.json'), null), 
 				desiredIndexTemplate: JSON.parse(fs.readFileSync('./test/testInput/desiredIndexTemplate.json'), null),
 				actualIndexTemplate: JSON.parse(fs.readFileSync('./test/testInput/actualIndexTemplate.json'), null), 
-				customPropertiesSettings: { merge: true, parent: "transactionSummary" }
+				customPropertiesSettings: { merge: true, parent: "transactionSummary." }
 			});
 
 			expect(output).to.equal('next');
-			expect(value.mappings.properties.transactionSummary['customProperties.customProperty1']).to.be.an('Object');
-			expect(value.mappings.properties.transactionSummary['customProperties.customProperty1']).to.deep.equal({type: "text", norms: false, fields: {keyword: { type: "keyword"}}});
-			expect(value.mappings.properties.transactionSummary['customProperties.customProperty2']).to.be.an('Object');
-			expect(value.mappings.properties.transactionSummary['customProperties.customProperty2'].type).to.equal('keyword');
-			expect(value.mappings.properties.transactionSummary['customProperties.customProperty3']).to.be.an('Object');
-			expect(value.mappings.properties.transactionSummary['customProperties.customProperty3'].type).to.equal('keyword');
+			expect(value.mappings.properties['transactionSummary.customProperties.customProperty1']).to.be.an('Object');
+			expect(value.mappings.properties['transactionSummary.customProperties.customProperty1']).to.deep.equal({type: "text", norms: false, fields: {keyword: { type: "keyword"}}});
+			expect(value.mappings.properties['transactionSummary.customProperties.customProperty2']).to.be.an('Object');
+			expect(value.mappings.properties['transactionSummary.customProperties.customProperty2'].type).to.equal('keyword');
+			expect(value.mappings.properties['transactionSummary.customProperties.customProperty3']).to.be.an('Object');
+			expect(value.mappings.properties['transactionSummary.customProperties.customProperty3'].type).to.equal('keyword');
 		});
 	});
 });

apibuilder4elastic/elasticsearch_config/index_config.json

@@ -22,7 +22,7 @@
             "name": "traffic-details", 
             "customProperties": {
                 "merge": true,
-                "parent": "transactionSummary"
+                "parent": "transactionSummary."
             }
         }, 
         "ilm" : {