Skip to content
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.

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

fix(cli): hide diffs of mangled unicode strings #24557

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
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
7 changes: 7 additions & 0 deletions packages/@aws-cdk/cloudformation-diff/lib/diff/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ export function deepEqual(lvalue: any, rvalue: any): boolean {
safeParseFloat(lvalue) === safeParseFloat(rvalue)) {
return true;
}
// GetStackTemplate flattens any codepoint greater than "\u7f" to "?". This
// is true even for codepoints in the supplemental planes which are
// represented in JS as surrogate pairs, all the way up to "\u{10ffff}".
if (typeof lvalue === 'string' && typeof rvalue === 'string' &&
lvalue === rvalue.replace(/[\u{80}-\u{10ffff}]/gu, '?')) {
return true;
}
if (typeof lvalue !== typeof rvalue) { return false; }
if (Array.isArray(lvalue) !== Array.isArray(rvalue)) { return false; }
if (Array.isArray(lvalue) /* && Array.isArray(rvalue) */) {
Expand Down