rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade jsyaml

This commit is contained in:
Vincent Fiduccia 2021-08-06 00:26:36 -07:00
parent 95504eb9d4
commit 96f53674d8
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
19 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chart/istio.vue
View File

@ -83,7 +83,7 @@ export default {
valuesYaml: { valuesYaml: {
get() { get() {
try { try {
const yaml = jsyaml.safeDump(this.value); const yaml = jsyaml.dump(this.value);
return yaml; return yaml;
} catch (e) { } catch (e) {
@ -92,7 +92,7 @@ export default {
}, },
set: debounce(function(neu) { set: debounce(function(neu) {
try { try {
const obj = jsyaml.safeLoad(neu); const obj = jsyaml.load(neu);
Object.assign(this.value, obj); Object.assign(this.value, obj);
} catch (e) { } catch (e) {
@ -111,7 +111,7 @@ export default {
valuesChanged(value) { valuesChanged(value) {
try { try {
jsyaml.safeLoad(value); jsyaml.load(value);
if (value === defaultOverlayFile) { if (value === defaultOverlayFile) {
value = ''; value = '';
} else { } else {

2
components/ResourceYaml.vue
View File

@ -154,7 +154,7 @@ export default {
} }
try { try {
const parsed = jsyaml.safeLoad(this.currentYaml); const parsed = jsyaml.load(this.currentYaml);
const annotations = Object.keys(parsed?.metadata?.annotations || {}); const annotations = Object.keys(parsed?.metadata?.annotations || {});
const regexes = ANNOTATIONS_TO_FOLD.map(x => ensureRegex(x)); const regexes = ANNOTATIONS_TO_FOLD.map(x => ensureRegex(x));

2
components/YamlEditor.vue
View File

@ -164,7 +164,7 @@ export default {
} }
try { try {
const parsed = jsyaml.safeLoad(value); const parsed = jsyaml.load(value);
if ( this.asObject ) { if ( this.asObject ) {
this.$emit('input', parsed); this.$emit('input', parsed);

2
detail/catalog.cattle.io.app.vue
View File

@ -38,7 +38,7 @@ export default {
valuesYaml() { valuesYaml() {
const combined = merge(merge({}, this.value?.spec?.chart?.values || {}), this.value?.spec?.values || {}); const combined = merge(merge({}, this.value?.spec?.chart?.values || {}), this.value?.spec?.values || {});
return jsyaml.safeDump(combined); return jsyaml.dump(combined);
}, },
}, },

2
edit/fleet.cattle.io.gitrepo.vue
View File

@ -260,7 +260,7 @@ export default {
]; ];
} else if ( kind === 'advanced' ) { } else if ( kind === 'advanced' ) {
try { try {
const parsed = jsyaml.safeLoad(this.targetAdvanced); const parsed = jsyaml.load(this.targetAdvanced);
spec.targets = parsed; spec.targets = parsed;
this.targetAdvancedErrors = null; this.targetAdvancedErrors = null;

4
edit/logging-flow/index.vue
View File

@ -76,7 +76,7 @@ export default {
set(this.value, 'spec', this.value.spec || {}); set(this.value, 'spec', this.value.spec || {});
if ( this.value.spec.filters?.length ) { if ( this.value.spec.filters?.length ) {
filtersYaml = jsyaml.safeDump(this.value.spec.filters); filtersYaml = jsyaml.dump(this.value.spec.filters);
} else { } else {
filtersYaml = createYaml(schemas, LOGGING.SPOOFED.FILTERS, []); filtersYaml = createYaml(schemas, LOGGING.SPOOFED.FILTERS, []);
// createYaml doesn't support passing reference types (array, map) as the first type. As such // createYaml doesn't support passing reference types (array, map) as the first type. As such
@ -199,7 +199,7 @@ export default {
filtersYaml: { filtersYaml: {
deep: true, deep: true,
handler() { handler() {
const filterJson = jsyaml.safeLoad(this.filtersYaml); const filterJson = jsyaml.load(this.filtersYaml);
if ( isArray(filterJson) ) { if ( isArray(filterJson) ) {
set(this.value.spec, 'filters', filterJson); set(this.value.spec, 'filters', filterJson);

4
edit/monitoring.coreos.com.receiver/index.vue
View File

@ -49,7 +49,7 @@ export default {
} }
}); });
let suffixYaml = jsyaml.safeDump(suffix); let suffixYaml = jsyaml.dump(suffix);
if (suffixYaml.trim() === '{}') { if (suffixYaml.trim() === '{}') {
suffixYaml = ''; suffixYaml = '';
@ -91,7 +91,7 @@ export default {
} }
}); });
const suffix = jsyaml.safeLoad(value); const suffix = jsyaml.load(value);
Object.assign(this.value.spec, suffix); Object.assign(this.value.spec, suffix);
this.yamlError = ''; this.yamlError = '';

2
edit/workload/storage/index.vue
View File

@ -207,7 +207,7 @@ export default {
yamlDisplay(volume) { yamlDisplay(volume) {
try { try {
return jsyaml.safeDump(volume); return jsyaml.dump(volume);
} catch { } catch {
return volume; return volume;
} }

2
models/constraints.gatekeeper.sh.constraint.js
View File

@ -35,7 +35,7 @@ export default {
saveYaml() { saveYaml() {
return (yaml) => { return (yaml) => {
const parsed = jsyaml.safeLoad(yaml); const parsed = jsyaml.load(yaml);
Object.assign(this, parsed); Object.assign(this, parsed);

2
models/fleet.cattle.io.gitrepo.js
View File

@ -211,7 +211,7 @@ export default {
const targets = this.spec.targets || []; const targets = this.spec.targets || [];
advanced = jsyaml.safeDump(targets); advanced = jsyaml.dump(targets);
if ( advanced === '[]\n' ) { if ( advanced === '[]\n' ) {
advanced = `# - name: advanced = `# - name:

4
models/management.cattle.io.cluster.js
View File

@ -280,7 +280,7 @@ export default {
await eachLimit(items, 10, (item, idx) => { await eachLimit(items, 10, (item, idx) => {
return item.generateKubeConfig().then((config) => { return item.generateKubeConfig().then((config) => {
const entry = jsyaml.safeLoad(config); const entry = jsyaml.load(config);
if ( first ) { if ( first ) {
obj = entry; obj = entry;
@ -295,7 +295,7 @@ export default {
delete obj['current-context']; delete obj['current-context'];
const out = jsyaml.safeDump(obj); const out = jsyaml.dump(obj);
downloadFile('kubeconfig.yaml', out, 'application/yaml'); downloadFile('kubeconfig.yaml', out, 'application/yaml');
}; };

2
models/monitoring.coreos.com.receiver.js
View File

@ -157,7 +157,7 @@ export default {
saveYaml() { saveYaml() {
return (yaml) => { return (yaml) => {
const parsed = jsyaml.safeLoad(yaml); const parsed = jsyaml.load(yaml);
Object.assign(this, parsed); Object.assign(this, parsed);

2
models/monitoring.coreos.com.route.js
View File

@ -147,7 +147,7 @@ export default {
saveYaml() { saveYaml() {
return (yaml) => { return (yaml) => {
const parsed = jsyaml.safeLoad(yaml); const parsed = jsyaml.load(yaml);
Object.assign(this, parsed); Object.assign(this, parsed);

2
package.json
View File

@ -54,7 +54,7 @@
"jexl": "^2.2.2", "jexl": "^2.2.2",
"jquery": "^3.5.0", "jquery": "^3.5.0",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"js-yaml": "^3.13.1", "js-yaml": "^4.1.0",
"js-yaml-loader": "^1.2.2", "js-yaml-loader": "^1.2.2",
"jsdiff": "^1.1.1", "jsdiff": "^1.1.1",
"jsdom-global": "^3.0.2", "jsdom-global": "^3.0.2",

10
pages/c/_cluster/apps/charts/install.vue
View File

@ -387,8 +387,8 @@ export default {
}, { }, {
labelKey: 'catalog.install.section.diff', labelKey: 'catalog.install.section.diff',
value: VALUES_STATE.DIFF, value: VALUES_STATE.DIFF,
// === quite obviously shouldn't work, but has been and still does. When the magic breaks address with heavier stringify/jsyaml.safeDump // === quite obviously shouldn't work, but has been and still does. When the magic breaks address with heavier stringify/jsyaml.dump
disabled: this.formYamlOption === VALUES_STATE.FORM ? this.originalYamlValues === jsyaml.safeDump(this.chartValues || {}) : this.originalYamlValues === this.valuesYaml, disabled: this.formYamlOption === VALUES_STATE.FORM ? this.originalYamlValues === jsyaml.dump(this.chartValues || {}) : this.originalYamlValues === this.valuesYaml,
}); });
return options; return options;
@ -522,7 +522,7 @@ export default {
case VALUES_STATE.YAML: case VALUES_STATE.YAML:
// Show the YAML preview // Show the YAML preview
if (old === VALUES_STATE.FORM) { if (old === VALUES_STATE.FORM) {
this.valuesYaml = jsyaml.safeDump(this.chartValues || {}); this.valuesYaml = jsyaml.dump(this.chartValues || {});
this.previousYamlValues = this.valuesYaml; this.previousYamlValues = this.valuesYaml;
} }
@ -534,7 +534,7 @@ export default {
case VALUES_STATE.DIFF: case VALUES_STATE.DIFF:
// Show the YAML diff // Show the YAML diff
if (old === VALUES_STATE.FORM) { if (old === VALUES_STATE.FORM) {
this.valuesYaml = jsyaml.safeDump(this.chartValues || {}); this.valuesYaml = jsyaml.dump(this.chartValues || {});
this.previousYamlValues = this.valuesYaml; this.previousYamlValues = this.valuesYaml;
} }
@ -805,7 +805,7 @@ export default {
applyYamlToValues() { applyYamlToValues() {
try { try {
this.chartValues = jsyaml.safeLoad(this.valuesYaml); this.chartValues = jsyaml.load(this.valuesYaml);
} catch (err) { } catch (err) {
return { errors: exceptionToErrorsArray(err) }; return { errors: exceptionToErrorsArray(err) };
} }

10
plugins/steve/resource-instance.js
View File

@ -1156,7 +1156,7 @@ export default {
cleanYaml() { cleanYaml() {
return (yaml, mode = 'edit') => { return (yaml, mode = 'edit') => {
try { try {
const obj = jsyaml.safeLoad(yaml); const obj = jsyaml.load(yaml);
if (mode !== 'edit') { if (mode !== 'edit') {
cleanForNew(obj); cleanForNew(obj);
@ -1166,7 +1166,7 @@ export default {
obj.type = obj._type; obj.type = obj._type;
delete obj._type; delete obj._type;
} }
const out = jsyaml.safeDump(obj, { skipInvalid: true }); const out = jsyaml.dump(obj, { skipInvalid: true });
return out; return out;
} catch (e) { } catch (e) {
@ -1184,14 +1184,14 @@ export default {
yamlForSave() { yamlForSave() {
return (yaml) => { return (yaml) => {
try { try {
const obj = jsyaml.safeLoad(yaml); const obj = jsyaml.load(yaml);
if (obj) { if (obj) {
if (this._type) { if (this._type) {
obj._type = obj.type; obj._type = obj.type;
} }
return jsyaml.safeDump(obj); return jsyaml.dump(obj);
} }
} catch (e) { } catch (e) {
return null; return null;
@ -1201,7 +1201,7 @@ export default {
saveYaml() { saveYaml() {
return async(yaml) => { return async(yaml) => {
const parsed = jsyaml.safeLoad(yaml); // will throw on invalid yaml const parsed = jsyaml.load(yaml); // will throw on invalid yaml
if ( this.schema?.attributes?.namespaced && !parsed.metadata.namespace ) { if ( this.schema?.attributes?.namespaced && !parsed.metadata.namespace ) {
const err = this.$rootGetters['i18n/t']('resourceYaml.errors.namespaceRequired'); const err = this.$rootGetters['i18n/t']('resourceYaml.errors.namespaceRequired');

4
utils/alertmanagerconfig.js
View File

@ -42,7 +42,7 @@ function extractConfig(secret) {
secret.data = secret.data || {}; secret.data = secret.data || {};
const file = secret.data[FILENAME]; const file = secret.data[FILENAME];
const decodedFile = file ? base64Decode(file) : '{}'; const decodedFile = file ? base64Decode(file) : '{}';
const config = jsyaml.safeLoad(decodedFile); const config = jsyaml.load(decodedFile);
config.receivers = config.receivers || []; config.receivers = config.receivers || [];
config.route = config.route || {}; config.route = config.route || {};
@ -86,7 +86,7 @@ export async function updateConfig(dispatch, path, type, updateFn) {
config.route = rootRoute; config.route = rootRoute;
} }
const newFile = jsyaml.safeDump(config); const newFile = jsyaml.dump(config);
const encodedFile = base64Encode(newFile); const encodedFile = base64Encode(newFile);
secret.data[FILENAME] = encodedFile; secret.data[FILENAME] = encodedFile;

12
utils/create-yaml.js
View File

@ -187,7 +187,7 @@ export function createYaml(schemas, type, data, processAlwaysAdd = true, depth =
if (data[key]) { if (data[key]) {
try { try {
const cleaned = cleanUp(data); const cleaned = cleanUp(data);
const parsedData = jsyaml.safeDump(cleaned[key]); const parsedData = jsyaml.dump(cleaned[key]);
if ( typeof data[key] === 'object' || Array.isArray(data[key]) ) { if ( typeof data[key] === 'object' || Array.isArray(data[key]) ) {
out += `\n${ indent(parsedData.trim()) }`; out += `\n${ indent(parsedData.trim()) }`;
@ -213,7 +213,7 @@ export function createYaml(schemas, type, data, processAlwaysAdd = true, depth =
if (data[key]) { if (data[key]) {
try { try {
const cleaned = cleanUp(data); const cleaned = cleanUp(data);
const parsedData = jsyaml.safeDump(cleaned[key]); const parsedData = jsyaml.dump(cleaned[key]);
out += `\n${ indent(parsedData.trim()) }`; out += `\n${ indent(parsedData.trim()) }`;
} catch (e) { } catch (e) {
@ -241,7 +241,7 @@ export function createYaml(schemas, type, data, processAlwaysAdd = true, depth =
const cleaned = cleanUp(data); const cleaned = cleanUp(data);
if ( cleaned?.[key] ) { if ( cleaned?.[key] ) {
const parsedData = jsyaml.safeDump(cleaned[key]); const parsedData = jsyaml.dump(cleaned[key]);
out += `\n${ indent(parsedData.trim()) }`; out += `\n${ indent(parsedData.trim()) }`;
} }
@ -288,7 +288,7 @@ export function createYaml(schemas, type, data, processAlwaysAdd = true, depth =
*/ */
if ( type === 'json' || type === '.spec') { if ( type === 'json' || type === '.spec') {
try { try {
const parsedData = jsyaml.safeDump(data[key]); const parsedData = jsyaml.dump(data[key]);
if (parsedData) { if (parsedData) {
out += `\n${ indent(parsedData.trim()) }`; out += `\n${ indent(parsedData.trim()) }`;
@ -324,7 +324,7 @@ function indent(lines, depth = 1) {
} }
function serializeSimpleValue(data) { function serializeSimpleValue(data) {
return jsyaml.safeDump(data).trim(); return jsyaml.dump(data).trim();
} }
export function typeRef(type, str) { export function typeRef(type, str) {
@ -349,7 +349,7 @@ export function typeMunge(type) {
} }
export function saferDump(obj) { export function saferDump(obj) {
const out = jsyaml.safeDump(obj || {}); const out = jsyaml.dump(obj || {});
if ( out === '{}\n' ) { if ( out === '{}\n' ) {
return ''; return '';

7
yarn.lock
View File

@ -9040,6 +9040,13 @@ js-yaml@^3.11.0:
argparse "^1.0.7" argparse "^1.0.7"
esprima "^4.0.0" esprima "^4.0.0"
js-yaml@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
dependencies:
argparse "^2.0.1"
jsbn@~0.1.0: jsbn@~0.1.0:
version "0.1.1" version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"