replace yaml.safeLoad w/yaml.load to match update

Signed-off-by: David Huffman <dshuffma@us.ibm.com>
hyperledger-labs · Sep 26, 2023 · ea0c062 · ea0c062
1 parent a441dbb
commit ea0c062
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/packages/athena/app.js b/packages/athena/app.js
@@ -173,7 +173,7 @@ function _load_config(file_name) {
 		}
 	} else {
 		try {														// use yaml ib if its not json
-			return tools.yaml.safeLoad(tools.fs.readFileSync(file_name, 'utf8'));
+			return tools.yaml.load(tools.fs.readFileSync(file_name, 'utf8'));
 		} catch (e) {
 			console.error('Error - Unable to load yaml configuration file', file_name);
 			console.error(e);

diff --git a/packages/athena/json_docs/default_settings_doc.json b/packages/athena/json_docs/default_settings_doc.json
@@ -104,7 +104,8 @@
 		"mustgather_enabled": false,
 		"read_only_enabled": false,
 		"osnadmin_feats_enabled": true,
-		"migration_enabled": false
+		"migration_enabled": false,
+		"audit_logging_enabled": true
 	},
 	"file_logging": {
 		"client": {

diff --git a/packages/athena/libs/other_apis_lib.js b/packages/athena/libs/other_apis_lib.js
@@ -608,7 +608,7 @@ module.exports = function (logger, ev, t) {
 								config_file = JSON.parse(config_file);
 
 							} else {
-								config_file = t.yaml.safeLoad(config_file);							// if its yaml, load it with the yaml lib
+								config_file = t.yaml.load(config_file);							// if its yaml, load it with the yaml lib
 							}
 						} catch (e) {
 							logger.error('[other] could not parse config file', e);
@@ -727,7 +727,7 @@ module.exports = function (logger, ev, t) {
 							if (process.env.CONFIGURE_FILE.indexOf('.json') >= 0) {			// json config file
 								config_file = JSON.parse(config_file);
 							} else {
-								config_file = t.yaml.safeLoad(config_file);					// yaml config file
+								config_file = t.yaml.load(config_file);					// yaml config file
 							}
 						} catch (e) {
 							logger.error('[settings edit] could not parse config file', e);
@@ -833,7 +833,7 @@ module.exports = function (logger, ev, t) {
 	exports.store_swagger_file = (req, cb) => {
 		let json = null;
 		try {
-			json = t.yaml.safeLoad(req.body);
+			json = t.yaml.load(req.body);
 		} catch (e) {
 			logger.error('[openapi] unable to covert yaml to json:', e);
 		}

diff --git a/packages/athena/libs/validation_lib.js b/packages/athena/libs/validation_lib.js
@@ -159,7 +159,7 @@ module.exports = (logger, ev, t, opts) => {
 			return thing;
 		} else {
 			try {
-				return t.yaml.safeLoad(thing);
+				return t.yaml.load(thing);
 			} catch (e) {
 				logger.error('[validate] unable to convert yaml to json. e:', e);
 			}

diff --git a/packages/athena/scripts/create_databases.js b/packages/athena/scripts/create_databases.js
@@ -114,7 +114,7 @@ module.exports = (logger, t) => {
 			} else {
 				try {
 					const temp = t.fs.readFileSync(t.path.join(__dirname, doc), 'utf8');
-					fs_doc = t.yaml.safeLoad(temp);
+					fs_doc = t.yaml.load(temp);
 				} catch (e) {
 					logger.error('[db startup] unable to read yaml file. cannot add to database.', doc, e);
 					return cb_createDocs();

diff --git a/packages/athena/test/openapi/init_examples.js b/packages/athena/test/openapi/init_examples.js
@@ -105,7 +105,7 @@ function parse_to_json(thing) {
 		return thing;
 	} else {
 		try {
-			return yaml.safeLoad(thing);
+			return yaml.load(thing);
 		} catch (e) {
 			console.error('unable to convert yaml to json. e:', e);
 		}

diff --git a/packages/athena/test/openapi/make-openapi.js b/packages/athena/test/openapi/make-openapi.js
@@ -83,7 +83,7 @@ function parse_to_json(thing) {
 		return thing;
 	} else {
 		try {
-			return yaml.safeLoad(thing);
+			return yaml.load(thing);
 		} catch (e) {
 			console.error('unable to convert yaml to json. e:', e);
 		}

diff --git a/packages/athena/test/openapi/response_inspection.js b/packages/athena/test/openapi/response_inspection.js
@@ -88,7 +88,7 @@ function parse_to_json(thing) {
 		return thing;
 	} else {
 		try {
-			return yaml.safeLoad(thing);
+			return yaml.load(thing);
 		} catch (e) {
 			console.error('unable to convert yaml to json. e:', e);
 		}

diff --git a/packages/athena/test/openapi/same_same.js b/packages/athena/test/openapi/same_same.js
@@ -100,7 +100,7 @@ function parse_to_json(thing) {
 		return thing;
 	} else {
 		try {
-			return yaml.safeLoad(thing);
+			return yaml.load(thing);
 		} catch (e) {
 			console.error('unable to convert yaml to json. e:', e);
 		}

diff --git a/packages/athena/test/openapi/unused.js b/packages/athena/test/openapi/unused.js
@@ -66,7 +66,7 @@ function parse_to_json(thing) {
 		return thing;
 	} else {
 		try {
-			return yaml.safeLoad(thing);
+			return yaml.load(thing);
 		} catch (e) {
 			console.error('unable to convert yaml to json. e:', e);
 		}

diff --git a/packages/athena/test/test-suites/common-test-framework.js b/packages/athena/test/test-suites/common-test-framework.js
@@ -320,7 +320,7 @@ tools.middleware = require('../../libs/middleware/middleware.js')(logger, ev, to
 tools.notifications = require('../../libs/notifications_lib.js')(logger, ev, tools);
 tools.ca_lib = require('../../libs/ca_lib.js')(logger, ev, tools);
 tools.proxy_lib = require('../../libs/proxy_lib.js')(logger, ev, tools);
-tools.config_file = tools.yaml.safeLoad(tools.fs.readFileSync(config_file_location, 'utf8'));
+tools.config_file = tools.yaml.load(tools.fs.readFileSync(config_file_location, 'utf8'));
 tools.notifications.create = () => { return true; };
 tools.user_preferences = require('../../libs/user_preferences_lib.js')(logger, ev, tools);
 tools.auth_scheme = require('../../libs/auth_scheme_lib.js')(logger, ev, tools);