You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/10/15 09:13:19 UTC
[incubator-datalab] branch DATALAB-2409 updated: [DATALAB-2409]:
replaced yaml.load with yaml.safe_load
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2409
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2409 by this push:
new ebfbcac [DATALAB-2409]: replaced yaml.load with yaml.safe_load
ebfbcac is described below
commit ebfbcac9d5b537b3c2c3eb9f6858de818cc1fab3
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Oct 15 12:13:07 2021 +0300
[DATALAB-2409]: replaced yaml.load with yaml.safe_load
---
infrastructure-provisioning/src/ssn/scripts/backup.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_mongo.py | 4 ++--
infrastructure-provisioning/src/ssn/scripts/resource_status.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/restore.py | 2 +-
.../terraform/bin/deploy/mongo_files/configure_mongo.py | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/backup.py b/infrastructure-provisioning/src/ssn/scripts/backup.py
index dc6d91c..6fc1928 100644
--- a/infrastructure-provisioning/src/ssn/scripts/backup.py
+++ b/infrastructure-provisioning/src/ssn/scripts/backup.py
@@ -141,7 +141,7 @@ def backup_database():
print('Backup db: {}'.format(args.db))
if args.db:
ssn_conf = open('{0}{1}ssn.yml'.format(args.datalab_path, conf_folder)).read()
- data = yaml.load('mongo{}'.format(ssn_conf.split('mongo')[-1]))
+ data = yaml.safe_load('mongo{}'.format(ssn_conf.split('mongo')[-1]))
with settings(hide('running')):
subprocess.run("mongodump --host {0} --port {1} --username {2} --password '{3}' --db={4} --archive={5}mongo.db" \
.format(data['mongo']['host'], data['mongo']['port'], data['mongo']['username'],
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py b/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py
index c0d7f2f..9b02cb0 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_mongo.py
@@ -41,7 +41,7 @@ def add_2_yml_config(path, section, param, value):
try:
try:
with open(path, 'r') as config_yml_r:
- config_orig = yaml.load(config_yml_r)
+ config_orig = yaml.safe_load(config_yml_r)
except:
config_orig = {}
sections = []
@@ -62,7 +62,7 @@ def add_2_yml_config(path, section, param, value):
def read_yml_conf(path, section, param):
try:
with open(path, 'r') as config_yml:
- config = yaml.load(config_yml)
+ config = yaml.safe_load(config_yml)
result = config[section][param]
return result
except:
diff --git a/infrastructure-provisioning/src/ssn/scripts/resource_status.py b/infrastructure-provisioning/src/ssn/scripts/resource_status.py
index 7146076..799e3dc 100644
--- a/infrastructure-provisioning/src/ssn/scripts/resource_status.py
+++ b/infrastructure-provisioning/src/ssn/scripts/resource_status.py
@@ -37,7 +37,7 @@ args = parser.parse_args()
def read_yml_conf(path, section, param):
try:
with open(path, 'r') as config_yml:
- config = yaml.load(config_yml)
+ config = yaml.safe_load(config_yml)
result = config[section][param]
return result
except:
diff --git a/infrastructure-provisioning/src/ssn/scripts/restore.py b/infrastructure-provisioning/src/ssn/scripts/restore.py
index 9cb9a98..5ff3d6b 100644
--- a/infrastructure-provisioning/src/ssn/scripts/restore.py
+++ b/infrastructure-provisioning/src/ssn/scripts/restore.py
@@ -262,7 +262,7 @@ def restore_database():
else:
if ask("Do you want to drop existing database and restore another from backup?"):
ssn_conf = open(args.datalab_path + conf_folder + 'ssn.yml').read()
- data = yaml.load("mongo" + ssn_conf.split("mongo")[-1])
+ data = yaml.safe_load("mongo" + ssn_conf.split("mongo")[-1])
print("Restoring database from backup")
subprocess.run("mongorestore --drop --host {0} --port {1} --archive={2}/mongo.db --username {3} --password '{4}' --authenticationDatabase={5}" \
.format(data['mongo']['host'], data['mongo']['port'], temp_folder,
diff --git a/infrastructure-provisioning/terraform/bin/deploy/mongo_files/configure_mongo.py b/infrastructure-provisioning/terraform/bin/deploy/mongo_files/configure_mongo.py
index acaf6ef..63f699b 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/mongo_files/configure_mongo.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/mongo_files/configure_mongo.py
@@ -34,7 +34,7 @@ def add_2_yml_config(path, section, param, value):
try:
try:
with open(path, 'r') as config_yml_r:
- config_orig = yaml.load(config_yml_r)
+ config_orig = yaml.safe_load(config_yml_r)
except:
config_orig = {}
sections = []
@@ -55,7 +55,7 @@ def add_2_yml_config(path, section, param, value):
def read_yml_conf(path, section, param):
try:
with open(path, 'r') as config_yml:
- config = yaml.load(config_yml)
+ config = yaml.safe_load(config_yml)
result = config[section][param]
return result
except:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org