Create initial helm operator tests

Author: russgold

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesOptionalFeaturesDisabledTest.java

@@ -5,6 +5,7 @@
 
 public class CreateOperatorGeneratedFilesOptionalFeaturesDisabledTest
     extends CreateOperatorGeneratedFilesOptionalFeaturesDisabledTestBase {
+
   @BeforeClass
   public static void setup() throws Exception {
     defineOperatorYamlFactory(new ScriptedOperatorYamlFactory());

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesOptionalFeaturesEnabledTest.java

@@ -5,6 +5,7 @@
 
 public class CreateOperatorGeneratedFilesOptionalFeaturesEnabledTest
     extends CreateOperatorGeneratedFilesOptionalFeaturesEnabledTestBase {
+
   @BeforeClass
   public static void setup() throws Exception {
     defineOperatorYamlFactory(new ScriptedOperatorYamlFactory());

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

@@ -0,0 +1,17 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import oracle.kubernetes.operator.create.CreateOperatorGeneratedFilesDebugEnabledTestBase;
+import org.junit.BeforeClass;
+
+public class CreateOperatorGeneratedFilesDebugEnabledIT
+    extends CreateOperatorGeneratedFilesDebugEnabledTestBase {
+
+  @BeforeClass
+  public static void setup() throws Exception {
+    defineOperatorYamlFactory(new HelmOperatorYamlFactory());
+  }
+}

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

@@ -0,0 +1,17 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import oracle.kubernetes.operator.create.CreateOperatorGeneratedFilesExtRestCustomTestBase;
+import org.junit.BeforeClass;
+
+public class CreateOperatorGeneratedFilesExtRestCustomIT
+    extends CreateOperatorGeneratedFilesExtRestCustomTestBase {
+
+  @BeforeClass
+  public static void setup() throws Exception {
+    defineOperatorYamlFactory(new HelmOperatorYamlFactory());
+  }
+}

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

@@ -0,0 +1,17 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import oracle.kubernetes.operator.create.CreateOperatorGeneratedFilesOptionalFeaturesDisabledTestBase;
+import org.junit.BeforeClass;
+
+public class CreateOperatorGeneratedFilesOptionalFeaturesDisabledIT
+    extends CreateOperatorGeneratedFilesOptionalFeaturesDisabledTestBase {
+
+  @BeforeClass
+  public static void setup() throws Exception {
+    defineOperatorYamlFactory(new HelmOperatorYamlFactory());
+  }
+}

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

@@ -0,0 +1,17 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import oracle.kubernetes.operator.create.CreateOperatorGeneratedFilesOptionalFeaturesEnabledTestBase;
+import org.junit.BeforeClass;
+
+public class CreateOperatorGeneratedFilesOptionalFeaturesEnabledIT
+    extends CreateOperatorGeneratedFilesOptionalFeaturesEnabledTestBase {
+
+  @BeforeClass
+  public static void setup() throws Exception {
+    defineOperatorYamlFactory(new HelmOperatorYamlFactory());
+  }
+}

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

@@ -0,0 +1,78 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import oracle.kubernetes.operator.utils.OperatorValues;
+
+class HelmOperatorValues extends OperatorValues {
+  HelmOperatorValues() {}
+
+  HelmOperatorValues(Map<String, Object> mappedValues) {
+    for (Map.Entry<String, Object> entry : mappedValues.entrySet()) {
+      assignToField(entry.getKey(), entry.getValue());
+    }
+  }
+
+  private void assignToField(String key, Object value) {
+    try {
+      Field field = getClass().getSuperclass().getDeclaredField(key);
+      setFieldValue(field, value);
+    } catch (NoSuchFieldException | IllegalAccessException ignored) {
+    }
+  }
+
+  private void setFieldValue(Field field, Object value) throws IllegalAccessException {
+    boolean wasAccessible = field.isAccessible();
+    try {
+      field.setAccessible(true);
+      field.set(this, value.toString());
+    } finally {
+      field.setAccessible(wasAccessible);
+    }
+  }
+
+  Map<String, Object> createMap() {
+    HashMap<String, Object> map = new HashMap<>();
+    map.put("internalOperatorCert", "test-cert");
+    map.put("internalOperatorKey", "test-key");
+
+    for (Field field : getClass().getSuperclass().getDeclaredFields()) {
+      addToMapIfNeeded(map, field);
+    }
+    return map;
+  }
+
+  private void addToMapIfNeeded(HashMap<String, Object> map, Field field) {
+    try {
+      Object value = getValue(field);
+      if (includeInMap(field, value)) {
+        map.put(field.getName(), value);
+      }
+    } catch (IllegalAccessException ignored) {
+    }
+  }
+
+  private boolean includeInMap(Field field, Object value) {
+    return !Modifier.isStatic(field.getModifiers()) && !isEmptyString(value);
+  }
+
+  private boolean isEmptyString(Object value) {
+    return value instanceof String && ((String) value).length() == 0;
+  }
+
+  private Object getValue(Field field) throws IllegalAccessException {
+    boolean wasAccessible = field.isAccessible();
+    try {
+      field.setAccessible(true);
+      return field.get(this);
+    } finally {
+      field.setAccessible(wasAccessible);
+    }
+  }
+}

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

@@ -0,0 +1,58 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import static oracle.kubernetes.operator.utils.OperatorValues.EXTERNAL_REST_OPTION_CUSTOM_CERT;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasKey;
+import static org.junit.Assert.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+
+public class HelmOperatorValuesTest {
+  @Test
+  public void whenNothingSet_createsMapWithInternalCerts() {
+    assertThat(
+        new HelmOperatorValues().createMap(),
+        both(hasKey("internalOperatorCert")).and(hasKey("internalOperatorKey")));
+  }
+
+  @Test
+  public void whenValuesSet_createMapWithSetValues() {
+    HelmOperatorValues operatorValues = new HelmOperatorValues();
+    operatorValues.setupExternalRestCustomCert();
+
+    assertThat(operatorValues.createMap(), hasExpectedEntries());
+  }
+
+  private Matcher<? super Map<?, ?>> hasExpectedEntries() {
+    return allOf(
+        hasEntry("externalRestHttpsPort", "30070"),
+        hasEntry("externalRestOption", EXTERNAL_REST_OPTION_CUSTOM_CERT),
+        hasKey("externalOperatorCert"),
+        hasKey("externalOperatorKey"));
+  }
+
+  @Test
+  public void whenCreatedFromMap_hasSpecifiedValues() {
+    HelmOperatorValues values =
+        new HelmOperatorValues(
+            new ImmutableMap.Builder<String, Object>()
+                .put("serviceAccount", "test-account")
+                .put("weblogicOperatorImage", "test-image")
+                .put("javaLoggingLevel", "FINE")
+                .build());
+
+    assertThat(values.getServiceAccount(), equalTo("test-account"));
+    assertThat(values.getWeblogicOperatorImage(), equalTo("test-image"));
+    assertThat(values.getJavaLoggingLevel(), equalTo("FINE"));
+  }
+}

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

@@ -0,0 +1,35 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at
+// http://oss.oracle.com/licenses/upl.
+
+package oracle.kubernetes.operator.helm;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyOrNullString;
+
+import java.util.Map;
+import oracle.kubernetes.operator.utils.GeneratedOperatorObjects;
+import oracle.kubernetes.operator.utils.OperatorValues;
+import oracle.kubernetes.operator.utils.OperatorYamlFactory;
+import oracle.kubernetes.operator.utils.ParsedWeblogicOperatorSecurityYaml;
+import oracle.kubernetes.operator.utils.ParsedWeblogicOperatorYaml;
+
+public class HelmOperatorYamlFactory extends OperatorYamlFactory {
+  @Override
+  public OperatorValues createDefaultValues() {
+    return new HelmOperatorValues().withTestDefaults();
+  }
+
+  @Override
+  public GeneratedOperatorObjects generate(OperatorValues inputValues) throws Exception {
+    Map<String, Object> overrides = ((HelmOperatorValues) inputValues).createMap();
+    ProcessedChart chart = new ProcessedChart("weblogic-operator", overrides);
+
+    assertThat(chart.getError(), emptyOrNullString());
+
+    OperatorValues effectiveValues = new HelmOperatorValues(chart.getValues());
+    return new GeneratedOperatorObjects(
+        new ParsedWeblogicOperatorYaml(chart, effectiveValues),
+        new ParsedWeblogicOperatorSecurityYaml(chart, effectiveValues));
+  }
+}

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

@@ -21,17 +21,18 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import oracle.kubernetes.operator.utils.YamlReader;
 import org.yaml.snakeyaml.Yaml;
 
 /**
  * An encapsulation of a helm chart, along with the processing that must be done to make it usable.
  */
 @SuppressWarnings({"unchecked", "SameParameterValue"})
-public class ProcessedChart {
+public class ProcessedChart implements YamlReader {
   private final String chartName;
   private Map<String, Object> valueOverrides;
   private String error;
-  private List<Map<String, String>> documents;
+  private List<Object> documents;
   private Process process;
   private Map<String, Object> values;
 
@@ -79,7 +80,8 @@ private String dump(InputStream in) throws IOException {
    */
   List<Map<String, String>> getDocuments(String kind) throws Exception {
     List<Map<String, String>> matches = new ArrayList<>();
-    for (Map<String, String> document : getDocuments()) {
+    for (Object object : getYamlDocuments()) {
+      Map document = (Map) object;
       if (document.get("kind").equals(kind)) {
         matches.add(document);
       }
@@ -94,14 +96,14 @@ List<Map<String, String>> getDocuments(String kind) throws Exception {
    * @return a list of yaml documents
    * @throws Exception if an error occurs
    */
-  public List<Map<String, String>> getDocuments() throws Exception {
+  public Iterable<Object> getYamlDocuments() throws Exception {
     if (documents == null) {
-      List<Map<String, String>> documents = new ArrayList<>();
+      List<Object> documents = new ArrayList<>();
       new Yaml()
           .loadAll(getProcess().getInputStream())
           .forEach(
               (document) -> {
-                if (document != null) documents.add((Map<String, String>) document);
+                if (document != null) documents.add(document);
               });
 
       this.documents = documents;
@@ -115,8 +117,8 @@ public List<Map<String, String>> getDocuments() throws Exception {
    *
    * @return a map of values
    */
-  public Map<String, Object> getValues() {
-    assert documents != null : "Must get the documents first";
+  public Map<String, Object> getValues() throws Exception {
+    getYamlDocuments();
 
     return values;
   }