Merge pull request #688 from brendandburns/rev

Upgrade js-yaml to 4.1.0

Author: k8s-ci-robot

package-lock.json

@@ -54,7 +54,7 @@
   "author": "Kubernetes Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@types/js-yaml": "^3.12.1",
+    "@types/js-yaml": "^4.0.1",
     "@types/node": "^10.12.0",
     "@types/request": "^2.47.1",
     "@types/stream-buffers": "^3.0.3",
@@ -64,7 +64,7 @@
     "byline": "^5.0.0",
     "execa": "5.0.0",
     "isomorphic-ws": "^4.0.1",
-    "js-yaml": "^3.13.1",
+    "js-yaml": "^4.1.0",
     "jsonpath-plus": "^0.19.0",
     "openid-client": "^4.1.1",
     "request": "^2.88.0",

package.json

@@ -1,10 +1,10 @@
 import execa = require('execa');
 import fs = require('fs');
 import https = require('https');
+import yaml = require('js-yaml');
 import net = require('net');
 import path = require('path');
 
-import yaml = require('js-yaml');
 import request = require('request');
 import shelljs = require('shelljs');
 
@@ -157,7 +157,7 @@ export class KubeConfig {
     }
 
     public loadFromString(config: string, opts?: Partial<ConfigOptions>): void {
-        const obj = yaml.safeLoad(config);
+        const obj = yaml.load(config) as any;
         this.clusters = newClusters(obj.clusters, opts);
         this.contexts = newContexts(obj.contexts, opts);
         this.users = newUsers(obj.users, opts);

src/config.ts

@@ -1,13 +1,13 @@
 import * as yaml from 'js-yaml';
 
 export function loadYaml<T>(data: string, opts?: yaml.LoadOptions): T {
-    return yaml.safeLoad(data, opts) as T;
+    return (yaml.load(data, opts) as any) as T;
 }
 
 export function loadAllYaml(data: string, opts?: yaml.LoadOptions): any[] {
-    return yaml.safeLoadAll(data, undefined, opts);
+    return yaml.loadAll(data, undefined, opts);
 }
 
 export function dumpYaml(object: any, opts?: yaml.DumpOptions): string {
-    return yaml.safeDump(object, opts);
+    return yaml.dump(object, opts);
 }