updated dependencies to 9.x-0 and added ServiceAccount.nameOverride substitution check in hemlchart generator

Issue-ID: DCAEGEN2-2960
Change-Id: I8d0db7a5ad404df241ca01acbd419a9f10a84792
Signed-off-by: Dhrumin Desai <dd303q@att.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java
index 4082170..102e4f1 100644
--- a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java
+++ b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java
@@ -19,6 +19,7 @@
 package org.onap.dcaegen2.platform.helmchartgenerator;
 
 import org.apache.commons.io.FileUtils;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,6 +38,7 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -68,6 +70,29 @@ class KeyValueMergerTest {
         Mockito.verify(yamlHelper, Mockito.times(2)).dump(any(HashMap.class), any(PrintWriter.class));
     }
 
+    @Test
+    void testServiceAccountNameOverrride() throws Exception{
+        ChartInfo chartInfo = prepareChartInfo();
+        chartDir = prepareChartDir();
+        HashMap<String, Object> valuesKvWithSA = getValuesKvWithSA();
+        Mockito.when(yamlHelper.load(any(InputStream.class))).thenReturn(valuesKvWithSA);
+
+        merger.mergeValuesToChart(chartInfo, chartDir);
+
+        Map<String, Object> serviceAccountKv = (Map<String, Object>) valuesKvWithSA.get("serviceAccount");
+        Assertions.assertThat(serviceAccountKv.get("nameOverride")).isEqualTo("someComponent");
+    }
+
+    private HashMap<String, Object> getValuesKvWithSA() {
+        HashMap<String, Object> innerKV = new HashMap<>();
+        innerKV.put("nameOverride", "TBD");
+        innerKV.put("roles", Arrays.asList("read"));
+
+        HashMap<String, Object> KV = new HashMap<>();
+        KV.put("serviceAccount", innerKV);
+        return KV;
+    }
+
     @AfterEach
     void tearDown(){
         FileUtils.deleteQuietly(chartDir);