Skip to content

fix: Change yaml.load to yaml_parse as a best practice #1951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2021
Merged

fix: Change yaml.load to yaml_parse as a best practice #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aacd6d
change yaml.load to yaml.safe_load for the security best practice
mingkun2020 Mar 2, 2021
060102c
use yaml_parse for consistant style
mingkun2020 Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion integration/helpers/base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from integration.helpers.client_provider import ClientProvider
from integration.helpers.resource import generate_suffix, create_bucket, verify_stack_resources
from integration.helpers.yaml_utils import dump_yaml, load_yaml
from samtranslator.yaml_helper import yaml_parse

try:
from pathlib import Path
Expand Down Expand Up @@ -293,7 +294,7 @@ def _fill_template(self, file_name):
for key, _ in self.code_key_to_file.items():
# We must double the {} to escape them so they will survive a round of unescape
data = data.replace("${{{}}}".format(key), self.get_code_key_s3_uri(key))
yaml_doc = yaml.load(data, Loader=yaml.FullLoader)
yaml_doc = yaml_parse(data)

dump_yaml(updated_template_path, yaml_doc)

Expand Down
4 changes: 3 additions & 1 deletion integration/helpers/yaml_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import yaml

from samtranslator.yaml_helper import yaml_parse


def load_yaml(file_path):
"""
Expand All @@ -17,7 +19,7 @@ def load_yaml(file_path):
"""
with open(file_path) as f:
data = f.read()
return yaml.load(data, Loader=yaml.FullLoader)
return yaml_parse(data)


def dump_yaml(file_path, yaml_doc):
Expand Down