Switch test to use value overrides

Author: russgold

kubernetes/pom.xml

@@ -81,6 +81,12 @@
       <version>1.19</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>22.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>

kubernetes/src/test/java/oracle/kubernetes/operator/helm/ChartITBase.java

@@ -5,20 +5,26 @@
 package oracle.kubernetes.operator.helm;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 @SuppressWarnings("SameParameterValue")
 class ChartITBase {
   private static List<ProcessedChart> charts = new ArrayList<>();
 
-  ProcessedChart getChart(String chartName, UpdateValues updater) {
+  ProcessedChart getChart(String chartName) {
+    return getChart(chartName, Collections.emptyMap());
+  }
+
+  ProcessedChart getChart(String chartName, Map<String, Object> valueOverrides) {
     for (ProcessedChart chart : charts) {
-      if (chart.matches(chartName, updater)) {
+      if (chart.matches(chartName, valueOverrides)) {
         return chart;
       }
     }
 
-    ProcessedChart chart = new ProcessedChart(chartName, updater);
+    ProcessedChart chart = new ProcessedChart(chartName, valueOverrides);
     charts.add(chart);
     return chart;
   }

kubernetes/src/test/java/oracle/kubernetes/operator/helm/OperatorChartIT.java

@@ -9,47 +9,39 @@
 import static org.hamcrest.Matchers.emptyOrNullString;
 import static org.hamcrest.Matchers.hasSize;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.Test;
 
 @SuppressWarnings("SameParameterValue")
 public class OperatorChartIT extends ChartITBase {
 
-  private static final NullUpdate NULL_UPDATE = new NullUpdate();
-  private static final AddCertificates ADD_CERTIFICATES = new AddCertificates();
   private static final String OPERATOR_CHART = "weblogic-operator";
+  private static final Map<String, Object> CERTIFICATES =
+      ImmutableMap.<String, Object>builder()
+          .put("internalOperatorCert", "dummy.cert")
+          .put("internalOperatorKey", "dummy.key")
+          .build();
 
   @Test
   public void whenNoCertificateSpecified_helmReportsFailure() throws Exception {
-    ProcessedChart chart = getChart(OPERATOR_CHART, NULL_UPDATE);
+    ProcessedChart chart = getChart(OPERATOR_CHART);
 
     assertThat(chart.getError(), containsString("property internalOperatorCert must be specified"));
   }
 
   @Test
   public void whenCertificateSpecified_noErrorOccurs() throws Exception {
-    ProcessedChart chart = getChart(OPERATOR_CHART, ADD_CERTIFICATES);
+    ProcessedChart chart = getChart(OPERATOR_CHART, CERTIFICATES);
 
     assertThat(chart.getError(), emptyOrNullString());
   }
 
   @Test
   public void whenChartsGenerated_haveOneRoleBinding() throws Exception {
-    ProcessedChart chart = getChart(OPERATOR_CHART, ADD_CERTIFICATES);
+    ProcessedChart chart = getChart(OPERATOR_CHART, CERTIFICATES);
 
     assertThat(chart.getDocuments("RoleBinding"), hasSize(1));
   }
 
-  private static class NullUpdate implements UpdateValues {
-    @Override
-    public void update(Map<String, String> values) {}
-  }
-
-  private static class AddCertificates implements UpdateValues {
-    @Override
-    public void update(Map<String, String> values) {
-      values.put("internalOperatorCert", "dummy.cert");
-      values.put("internalOperatorKey", "dummy.key");
-    }
-  }
 }

kubernetes/src/test/java/oracle/kubernetes/operator/helm/ProcessedChart.java

@@ -7,7 +7,6 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -20,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import org.yaml.snakeyaml.Yaml;
 
 /**
@@ -28,18 +28,18 @@
 @SuppressWarnings({"unchecked", "SameParameterValue"})
 class ProcessedChart {
   private final String chartName;
-  private final UpdateValues updateValues;
+  private Map<String, Object> valueOverrides;
   private String error;
   private List<Map<String, String>> documents;
   private Process process;
 
-  ProcessedChart(String chartName, UpdateValues updateValues) {
+  ProcessedChart(String chartName, Map<String, Object> valueOverrides) {
     this.chartName = chartName;
-    this.updateValues = updateValues;
+    this.valueOverrides = valueOverrides;
   }
 
-  boolean matches(String chartName, UpdateValues updater) {
-    return this.chartName.equals(chartName) && this.updateValues == updater;
+  boolean matches(String chartName, Map<String, Object> valueOverrides) {
+    return this.chartName.equals(chartName) && Objects.equals(valueOverrides, this.valueOverrides);
   }
 
   /**
@@ -104,17 +104,16 @@ private List<Map<String, String>> getDocuments() throws Exception {
 
   private Process getProcess() throws Exception {
     if (process == null) {
-      process = processChart(chartName, updateValues);
+      process = processChart(chartName, valueOverrides);
     }
     return process;
   }
 
-  private Process processChart(String chartName, UpdateValues updateValues) throws Exception {
+  private Process processChart(String chartName, Map<String, Object> valueOverrides)
+      throws Exception {
     File chartsDir = getChartDir(chartName);
-    File baseValuesFile = new File(chartsDir, "values.yaml");
-    Map<String, String> values = new Yaml().load(new FileReader(baseValuesFile));
 
-    Path valuesFile = createUpdatedValuesFile(updateValues, values);
+    Path valuesFile = writeValuesOverride(valueOverrides);
 
     ProcessBuilder pb = new ProcessBuilder(createCommandLine(chartsDir, valuesFile));
     return pb.start();
@@ -124,9 +123,7 @@ private String[] createCommandLine(File chart, Path valuesPath) {
     return new String[] {"helm", "template", chart.getAbsolutePath(), "-f", valuesPath.toString()};
   }
 
-  private Path createUpdatedValuesFile(UpdateValues updateValues, Map<String, String> values)
-      throws IOException {
-    updateValues.update(values);
+  private Path writeValuesOverride(Map<String, Object> values) throws IOException {
     Path valuesFile = Files.createTempFile("Value", ".yaml");
     try (BufferedWriter writer = Files.newBufferedWriter(valuesFile, Charset.forName("UTF-8"))) {
       new Yaml().dump(values, writer);