Merge pull request #2612 from ryanjbaxter/cherry-pick-snakeyaml-2.0

Cherry Pick For 17.x - Compensating changes for SnakeYAML 2.0
kubernetes-client · Apr 3, 2023 · 5acad5f · 5acad5f
2 parents eac8035 + 182a6fd
commit 5acad5f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -43,8 +43,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <javax.annotation.version>1.3.2</javax.annotation.version>
-    <snakeyaml.version>1.33</snakeyaml.version>
     <slf4j.version>2.0.5</slf4j.version>
+    <snakeyaml.version>2.0</snakeyaml.version>
     <caffeine.version>2.9.3</caffeine.version>
     <protobuf.version>3.21.10</protobuf.version>
     <junit.version>4.13</junit.version>

diff --git a/util/src/main/java/io/kubernetes/client/util/FilePersister.java b/util/src/main/java/io/kubernetes/client/util/FilePersister.java
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
@@ -51,7 +52,7 @@ public void save(
     // Note this is imperfect, should protect against other processes writing this file too...
     synchronized (configFile) {
       try (FileWriter fw = new FileWriter(configFile)) {
-        Yaml yaml = new Yaml(new SafeConstructor());
+        Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
         yaml.dump(config, fw);
         fw.flush();
       }

diff --git a/util/src/main/java/io/kubernetes/client/util/KubeConfig.java b/util/src/main/java/io/kubernetes/client/util/KubeConfig.java
@@ -37,6 +37,7 @@
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
@@ -83,7 +84,7 @@ public static void registerAuthenticator(Authenticator auth) {
 
   /** Load a Kubernetes config from a Reader */
   public static KubeConfig loadKubeConfig(Reader input) {
-    Yaml yaml = new Yaml(new SafeConstructor());
+    Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
     Object config = yaml.load(input);
     Map<String, Object> configMap = (Map<String, Object>) config;
 

diff --git a/util/src/main/java/io/kubernetes/client/util/Yaml.java b/util/src/main/java/io/kubernetes/client/util/Yaml.java
@@ -269,6 +269,7 @@ private Object constructDateTime(ScalarNode node) {
 
   public static class CustomRepresenter extends Representer {
     public CustomRepresenter() {
+      super(new DumperOptions());
       this.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
       this.representers.put(IntOrString.class, new RepresentIntOrString());
       this.representers.put(byte[].class, new RepresentByteArray());

diff --git a/util/src/main/java/io/kubernetes/client/util/generic/dynamic/Dynamics.java b/util/src/main/java/io/kubernetes/client/util/generic/dynamic/Dynamics.java
@@ -16,13 +16,14 @@
 import com.google.gson.JsonElement;
 import io.kubernetes.client.openapi.JSON;
 import java.util.Map;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
 public class Dynamics {
 
   static final JSON internalJSONCodec = new JSON();
-  static final Yaml internalYamlCodec = new Yaml(new SafeConstructor());
+  static final Yaml internalYamlCodec = new Yaml(new SafeConstructor(new LoaderOptions()));
 
   public static DynamicKubernetesObject newFromJson(String jsonContent) {
     return newFromJson(internalJSONCodec.getGson(), jsonContent);