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(cfn-include): correctly parse Fn::Sub expressions containing serialized JSON #14512

Merged
merged 2 commits into from
May 4, 2021

Conversation

skinny85
Copy link
Contributor

@skinny85 skinny85 commented May 3, 2021

Our logic for parsing ${} expressions inside Fn::Sub incorrectly looked for closing braces everywhere in the string,
instead of doing it to the right of the opening ${.
This would fail if the string passed to Fn::Sub was serialized JSON
(as those would contain closing braces completely unrelated to the ${).

Fixes #14095


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

…alized JSON

Our logic for parsing `${}` expressions inside `Fn::Sub` incorrectly looked for closing braces everywhere in the string,
instead of doing it to the right of the opening `${`.
This would fail if the string passed to `Fn::Sub` was serialized JSON
(as those would contain closing braces completely unrelated to the `${`).

Fixes aws#14095
@skinny85 skinny85 requested a review from rix0rrr May 3, 2021 21:45
@skinny85 skinny85 self-assigned this May 3, 2021
@gitpod-io
Copy link

gitpod-io bot commented May 3, 2021

@github-actions github-actions bot added the @aws-cdk/cloudformation-include Issues related to the "CFN include v.20" package label May 3, 2021
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label May 3, 2021
@mergify
Copy link
Contributor

mergify bot commented May 4, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 183ce4c
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit fd6d6d0 into aws:master May 4, 2021
@mergify
Copy link
Contributor

mergify bot commented May 4, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@skinny85 skinny85 deleted the fix/cfn-include-brace-parsing branch May 4, 2021 18:48
john-tipper pushed a commit to john-tipper/aws-cdk that referenced this pull request May 10, 2021
…alized JSON (aws#14512)

Our logic for parsing `${}` expressions inside `Fn::Sub` incorrectly looked for closing braces everywhere in the string,
instead of doing it to the right of the opening `${`.
This would fail if the string passed to `Fn::Sub` was serialized JSON
(as those would contain closing braces completely unrelated to the `${`).

Fixes aws#14095

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
hollanddd pushed a commit to hollanddd/aws-cdk that referenced this pull request Aug 26, 2021
…alized JSON (aws#14512)

Our logic for parsing `${}` expressions inside `Fn::Sub` incorrectly looked for closing braces everywhere in the string,
instead of doing it to the right of the opening `${`.
This would fail if the string passed to `Fn::Sub` was serialized JSON
(as those would contain closing braces completely unrelated to the `${`).

Fixes aws#14095

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
@aws-cdk/cloudformation-include Issues related to the "CFN include v.20" package contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(cdk-go): CfnInclude Template Generation Issue
3 participants