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-diff): handle Fn::If inside policies and statements #12975

Merged
merged 2 commits into from
Feb 19, 2021

Conversation

skinny85
Copy link
Contributor

cloudformation-diff assumes the policies and statements it encounters are simple JSON objects.
However, in reality, everywhere that simple object can be used,
the Fn::If function can be used as well.
Add code that handles that eventuality.

Fixes #12887


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

@skinny85 skinny85 self-assigned this Feb 10, 2021
@gitpod-io
Copy link

gitpod-io bot commented Feb 10, 2021

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Feb 10, 2021
@rix0rrr rix0rrr added the pr/do-not-merge This PR should not be merged at this time. label Feb 11, 2021
@skinny85
Copy link
Contributor Author

@rix0rrr I know you already approved this one (thanks!), but do you mind taking another look? As it turns out, the toJson() method that we talked about was a red herring - it's only used in tests, and there's a different method in IamChanges (summarizeManagedPolicies()) that's responsible for rendering the actual diff.

I did a refactoring to be able to control how the rendering of a Statement happens - let me know what you think about it!

cloudformation-diff assumes the policies and statements it encounters are simple JSON objects.
However, in reality, everywhere that simple object can be used,
the Fn::If function can be used as well.
Add code that handles that eventuality.

Fixes aws#12887
@skinny85
Copy link
Contributor Author

@rix0rrr included your latest comments, please re-review when you have a chance!

@skinny85 skinny85 removed the pr/do-not-merge This PR should not be merged at this time. label Feb 19, 2021
@mergify
Copy link
Contributor

mergify bot commented Feb 19, 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: e7e452b
  • 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 Feb 19, 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).

@mergify mergify bot merged commit daf4e47 into aws:master Feb 19, 2021
eladb pushed a commit that referenced this pull request Feb 22, 2021
cloudformation-diff assumes the policies and statements it encounters are simple JSON objects.
However, in reality, everywhere that simple object can be used,
the Fn::If function can be used as well.
Add code that handles that eventuality.

Fixes #12887

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
@skinny85 skinny85 deleted the fix/diff-for-iam-policies branch March 2, 2021 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(cloudformation_include): Usage of Fn::If breaks diff
3 participants