diff options
Diffstat (limited to 'mod2/helm-generator/helmchartgenerator-core')
3 files changed, 26 insertions, 3 deletions
diff --git a/mod2/helm-generator/helmchartgenerator-core/pom.xml b/mod2/helm-generator/helmchartgenerator-core/pom.xml index 4dbbd3b..0ced9dd 100644 --- a/mod2/helm-generator/helmchartgenerator-core/pom.xml +++ b/mod2/helm-generator/helmchartgenerator-core/pom.xml @@ -5,10 +5,10 @@ <parent> <groupId>org.onap.dcaegen2.platform</groupId> <artifactId>helmchartgenerator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>helmchartgenerator-core</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <name>helmchartgenerator-core</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java index b0830d1..9a9f8f1 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java +++ b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java @@ -18,6 +18,9 @@ package org.onap.dcaegen2.platform.helmchartgenerator.chartbuilder; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.onap.dcaegen2.platform.helmchartgenerator.Utils; import org.onap.dcaegen2.platform.helmchartgenerator.models.chartinfo.ChartInfo; import org.onap.dcaegen2.platform.helmchartgenerator.models.chartinfo.Metadata; @@ -39,6 +42,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; @@ -48,6 +52,7 @@ import java.util.Map; * ComponentSpecParser reads a componentspec file and collects useful data for helm chart generation. * @author Dhrumin Desai */ +@Slf4j @Component public class ComponentSpecParser { @@ -117,11 +122,28 @@ public class ComponentSpecParser { Map<String, Object> applicationConfig = new LinkedHashMap<>(); Parameters[] parameters = cs.getParameters(); for(Parameters param : parameters){ - applicationConfig.put(param.getName(), param.getValue()); + if (Arrays.asList("streams_publishes", "streams_subscribes").contains(param.getName())){ + applicationConfig.put(param.getName(), parseStringToMap(param.getValue())); + }else + { + applicationConfig.put(param.getName(), param.getValue()); + } } utils.putIfNotNull(outerValues,"applicationConfig", applicationConfig); } + private Object parseStringToMap(Object value) { + if (value instanceof String){ + try { + return new ObjectMapper().readValue((String)value, Map.class); + } catch (JsonProcessingException e) { + log.error(e.getMessage(), e); + log.warn("could not parse streams_publishes / streams_subscribes. Default value will be used."); + } + } + return value; + } + private void populateReadinessSection(Map<String, Object> outerValues, ComponentSpec cs) { if (!healthCheckExists(cs)) return; diff --git a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java index 0f157d3..f29ea1b 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java +++ b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ComponentSpecParserTest.java @@ -69,6 +69,7 @@ class ComponentSpecParserTest { private void assertApplicationConfigSection(ChartInfo chartInfo) { Map<String, Object> applicationConfig = (Map<String, Object>) chartInfo.getValues().get("applicationConfig"); + assertThat(((Map<String,Object>) applicationConfig.get("streams_publishes"))).isInstanceOf(Map.class); assertThat(applicationConfig.size()).isEqualTo(20); } |