From b70d80deb78845b3141bdcee9cd8c8f805017a8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Oct 2021 14:44:19 +0000 Subject: [PATCH 1/3] Bump pyyaml from 5.4.1 to 6.0 Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.4.1 to 6.0. - [Release notes](https://github.com/yaml/pyyaml/releases) - [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES) - [Commits](https://github.com/yaml/pyyaml/compare/5.4.1...6.0) --- updated-dependencies: - dependency-name: pyyaml dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ed1578752..02a9dd0fb 100644 --- a/setup.py +++ b/setup.py @@ -19,9 +19,9 @@ install_requires=[ 'argparse==1.4.0', 'tabulate==0.8.9', - 'PyYAML==5.4.1', + 'PyYAML==6.0', 'ansible==4.7.0', - 'Jinja2==3.0.1', + 'Jinja2==3.0.2', 'joblib==1.0.0', 'PyMySQL==0.7.11', 'psycopg2-binary==2.8.6', From 1c6164f7ed1293646d1b18d323fa879e917cf140 Mon Sep 17 00:00:00 2001 From: Jeet Parekh Date: Fri, 10 Dec 2021 11:43:08 +0000 Subject: [PATCH 2/3] fix pylint - add default argument --- pipelinewise/cli/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelinewise/cli/utils.py b/pipelinewise/cli/utils.py index 9015b4dcf..9608b14ab 100644 --- a/pipelinewise/cli/utils.py +++ b/pipelinewise/cli/utils.py @@ -196,7 +196,7 @@ def load_yaml(yaml_file, vault_secret=None): try: if is_encrypted_file(stream): file_data = stream.read() - data = yaml.load(vault.decrypt(file_data, None)) + data = yaml.load(vault.decrypt(file_data, None), Loader=None) else: loader = AnsibleLoader(stream, None, vault.secrets) try: From 3a022b8bd85f1aa4d534e5ae758bf16ec1ed999e Mon Sep 17 00:00:00 2001 From: Jeet Parekh Date: Mon, 13 Dec 2021 10:27:27 +0000 Subject: [PATCH 3/3] switch to yaml.safe_load --- pipelinewise/cli/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelinewise/cli/utils.py b/pipelinewise/cli/utils.py index 9608b14ab..67b3abe90 100644 --- a/pipelinewise/cli/utils.py +++ b/pipelinewise/cli/utils.py @@ -196,7 +196,7 @@ def load_yaml(yaml_file, vault_secret=None): try: if is_encrypted_file(stream): file_data = stream.read() - data = yaml.load(vault.decrypt(file_data, None), Loader=None) + data = yaml.safe_load(vault.decrypt(file_data, None)) else: loader = AnsibleLoader(stream, None, vault.secrets) try: