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.

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

Jump to bottom

fix(diff): handle YAML short-forms like '!GetAtt' in diff #10381

Merged
merged 2 commits into from
Sep 21, 2020
Merged

fix(diff): handle YAML short-forms like '!GetAtt' in diff #10381

merged 2 commits into from
Sep 21, 2020

Conversation

skinny85
Copy link
Contributor

@skinny85 skinny85 commented Sep 16, 2020 •
edited
Loading

CloudFormation allows using short-form versions of intrinsic functions like !GetAtt.
We handled them correctly in the @aws-cdk/cloudformation-include module,
so extract that logic to a common package,
and use it from the CLI in the diff command as well.

Fixes #6537

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

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Sep 16, 2020
@skinny85
Copy link
Contributor Author

I wasn't sure which package should have the common YAML-handling logic. I decided on @aws-cdk/cx-api, but it's possible it should be somewhere else.

rix0rrr
rix0rrr requested changes Sep 16, 2020
View reviewed changes
packages/@aws-cdk/cx-api/lib/yaml.ts Outdated Show resolved Hide resolved
@SomayaB SomayaB assigned shivlaks and skinny85 and unassigned shivlaks Sep 16, 2020
@skinny85 skinny85 force-pushed the feat/diff-yaml-short-forms branch 3 times, most recently from 7d141ee to 576ccd6 Compare September 17, 2020 18:51
@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2020

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
fix(diff): handle YAML short-forms like '!GetAtt' in diff
8cafcb4 
CloudFormation allows using short-form versions of intrinsic functions like !GetAtt.
We handled them correctly in the `@aws-cdk/cloudformation-include` module,
so extract that logic to a common package,
and use it from the CLI in the `diff` command as well.

Fixes aws#6537
@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2020

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: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: d46ebc9
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2020

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).

@mergify mergify bot merged commit 457e109 into aws:master Sep 21, 2020
@skinny85 skinny85 deleted the feat/diff-yaml-short-forms branch September 21, 2020 17:25
@Chriscbr Chriscbr mentioned this pull request Apr 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rix0rrr rix0rrr rix0rrr approved these changes

Assignees

@skinny85 skinny85

Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cdk diff (and cdk deploy) complains about short functions in existing yaml
4 participants
@skinny85 @aws-cdk-automation @rix0rrr @shivlaks