Correctly load base64-encoded strings from Secret Yaml files.

Author: John Daniels

util/src/main/java/io/kubernetes/client/util/Yaml.java

@@ -19,11 +19,8 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import okio.ByteString;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
@@ -269,6 +266,9 @@ protected Object constructObject(Node node) {
       if (node.getType() == IntOrString.class) {
         return constructIntOrString((ScalarNode) node);
       }
+      if (node.getType() == byte[].class) {
+        return constructByteArray((ScalarNode) node);
+      }
       return super.constructObject(node);
     }
 
@@ -279,6 +279,10 @@ private IntOrString constructIntOrString(ScalarNode node) {
         return new IntOrString(node.getValue());
       }
     }
+
+    private byte[] constructByteArray(ScalarNode node) {
+      return ByteString.decodeBase64(node.getValue()).toByteArray();
+    }
   }
 
   /** @return An instantiated SnakeYaml Object. */

util/src/test/java/io/kubernetes/client/util/YamlTest.java

@@ -15,14 +15,12 @@
 import static org.junit.Assert.*;
 
 import com.google.common.io.Resources;
-import io.kubernetes.client.models.AppsV1beta1Deployment;
-import io.kubernetes.client.models.V1ObjectMeta;
-import io.kubernetes.client.models.V1Service;
-import io.kubernetes.client.models.V1ServicePort;
+import io.kubernetes.client.models.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import org.junit.Test;
 
@@ -123,6 +121,13 @@ public void testLoadAllFile() throws Exception {
         assertEquals("apps/v1beta1", deploy.getApiVersion());
         assertEquals("Deployment", deploy.getKind());
         assertEquals("helloworld", deploy.getMetadata().getName());
+      } else if (type.equals("V1Secret")) {
+        V1Secret secret = (V1Secret) object;
+        assertEquals("Secret", secret.getKind());
+        assertEquals("secret", secret.getMetadata().getName());
+        assertEquals("Opaque", secret.getType());
+        assertEquals(
+            "hello", new String(secret.getData().get("secret-data"), StandardCharsets.UTF_8));
       } else {
         throw new Exception("some thing wrong happened");
       }
@@ -149,4 +154,21 @@ public void testLoadIntOrString() {
       assertNull("Unexpected exception: " + ex.toString(), ex);
     }
   }
+
+  @Test
+  public void testLoadBytes() {
+    try {
+      String strInput = "data:\n  hello: aGVsbG8=";
+
+      V1Secret secret = Yaml.loadAs(strInput, V1Secret.class);
+
+      assertEquals(
+          "Incorrect value loaded for Base64 encoded secret",
+          "hello",
+          new String(secret.getData().get("hello"), StandardCharsets.UTF_8));
+
+    } catch (Exception ex) {
+      assertNull("Unexpected exception: " + ex.toString(), ex);
+    }
+  }
 }

util/src/test/resources/test.yaml

@@ -32,4 +32,15 @@ spec:
           imagePullPolicy: Always
           args:
             - "-http=127.0.0.1:8080"
+---
+apiVersion: v1
+kind: Secret
+
+metadata:
+  name: secret
+
+type: Opaque
+
+data:
+  secret-data: aGVsbG8=