Ported fabric8io/fabric8-maven-plugin#1636

rohanKanojia · Jun 5, 2019 · bec108b · bec108b
1 parent c9ff74f
commit bec108b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/config/resource/src/main/java/io/jshift/kit/config/resource/ConfigMap.java b/config/resource/src/main/java/io/jshift/kit/config/resource/ConfigMap.java
@@ -5,6 +5,7 @@
 
 public class ConfigMap {
 
+    private String name;
     private List<ConfigMapEntry> entries = new ArrayList<>();
 
     public void addEntry(ConfigMapEntry configMapEntry) {
@@ -14,5 +15,22 @@ public void addEntry(ConfigMapEntry configMapEntry) {
     public List<ConfigMapEntry> getEntries() {
         return entries;
     }
+
+    /**
+     * Set the name of ConfigMap.
+     * @param name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Return the name of ConfigMap.
+     * @return
+     */
+    public String getName() {
+        return name;
+    }
 }
 
+
diff --git a/enricher/generic/src/main/java/io/jshift/enricher/generic/ConfigMapEnricher.java b/enricher/generic/src/main/java/io/jshift/enricher/generic/ConfigMapEnricher.java
@@ -89,13 +89,16 @@ private String getOutput(String key) {
     }
 
     private void addConfigMapFromXmlConfigurations(KubernetesListBuilder builder) {
-        ConfigMap configMap = getConfigMapFromXmlConfiguration();
+        io.jshift.kit.config.resource.ConfigMap configMap = getConfigMapFromXmlConfiguration();
         final Map<String, String> configMapFromConfiguration;
         try {
             configMapFromConfiguration = createConfigMapFromConfiguration(configMap);
-            if(!configMapFromConfiguration.isEmpty() && !checkIfItemExists(builder, "xmlconfig")) {
+            String configMapName = (configMap == null || configMap.getName() == null || configMap.getName().trim().isEmpty()) ? "xmlconfig" : configMap.getName().trim();
+            log.debug("configMapName :: ".concat(configMapName));
+
+            if(!configMapFromConfiguration.isEmpty() && !checkIfItemExists(builder, configMapName)) {
                 ConfigMapBuilder element = new ConfigMapBuilder();
-                element.withNewMetadata().withName("xmlconfig").endMetadata();
+                element.withNewMetadata().withName(configMapName).endMetadata();
                 element.addToData(configMapFromConfiguration);
 
                 builder.addToConfigMapItems(element.build());
@@ -106,7 +109,7 @@ private void addConfigMapFromXmlConfigurations(KubernetesListBuilder builder) {
     }
 
     private boolean checkIfItemExists(KubernetesListBuilder builder, String name) {
-        return builder.buildItems().stream().anyMatch(item -> item.getMetadata().getName().equals(name));
+        return builder.buildItems().stream().filter(item -> item.getKind().equals("ConfigMap")).anyMatch(item -> item.getMetadata().getName().equals(name));
     }
 
     private ConfigMap getConfigMapFromXmlConfiguration() {
@@ -117,7 +120,7 @@ private ConfigMap getConfigMapFromXmlConfiguration() {
         return null;
     }
 
-    private Map<String, String> createConfigMapFromConfiguration(ConfigMap configMap) throws IOException {
+    private Map<String, String> createConfigMapFromConfiguration(io.jshift.kit.config.resource.ConfigMap configMap) throws IOException {
         final Map<String, String> configMapData = new HashMap<>();
 
         if (configMap != null) {