Skip to content

[v2] Fix non-ASCII escaping in cloudformation package #10380

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

Open
Zelys-DFKH wants to merge 1 commit into
base: develop
Choose a base branch
from
+11 −0
Open

[v2] Fix non-ASCII escaping in cloudformation package #10380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions awscli/customizations/cloudformation/yamlhelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def yaml_dump(dict_to_dump):
return yaml.dump(
dict_to_dump,
default_flow_style=False,
allow_unicode=False,
Dumper=FlattenAliasDumper,
)

Expand Down
10 changes: 10 additions & 0 deletions tests/unit/customizations/cloudformation/test_yamlhelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,16 @@ def test_yaml_merge_tag(self):
self.assertTrue(isinstance(output, OrderedDict))
self.assertEqual(output.get('test').get('property'), 'value')

def test_yaml_dump_escapes_non_ascii_characters(self):
# PyYAML defaults write raw UTF-8; CloudFormation shows '?' for non-ASCII
data = {'Value': '\U0001F6A8 firing \U0001F7E2 resolved'}
dumped = yaml_dump(data)
self.assertNotIn('\U0001F6A8', dumped)
self.assertNotIn('\U0001F7E2', dumped)
self.assertIn('\\U0001F6A8', dumped)
self.assertIn('\\U0001F7E2', dumped)
self.assertEqual(yaml_parse(dumped), data)

def test_unroll_yaml_anchors(self):
properties = {
"Foo": "bar",
Expand Down