fix: bug fixes in resource policies #1395
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #1395 +/- ##
===========================================
- Coverage 94.44% 94.37% -0.08%
===========================================
Files 78 78
Lines 4557 4584 +27
Branches 911 917 +6
===========================================
+ Hits 4304 4326 +22
Misses 119 119
- Partials 134 139 +5
Continue to review full report at Codecov.
|
keetonian
reviewed
Jan 20, 2020
samtranslator/swagger/swagger.py
Outdated
Comment on lines
836
to
851
| if is_intrinsic_if(custom_statements): | ||
| if_list = custom_statements.get("Fn::If") | ||
| ## copy the statement created so far | ||
| original = self.resource_policy.copy() | ||
| if_true = if_list[1] | ||
| if_false = if_list[2] | ||
| if not is_intrinsic_no_value(if_list[1]): | ||
| self._add_custom_statement(if_list[1]) | ||
| if_true = self.resource_policy | ||
| self.resource_policy = original | ||
| if not is_intrinsic_no_value(if_list[2]): | ||
| self._add_custom_statement(if_list[2]) | ||
| if_false = self.resource_policy | ||
| self.resource_policy = make_conditional(if_list[0], if_true, if_false) | ||
| else: | ||
| self._add_custom_statement(custom_statements) |
There was a problem hiding this comment.
Why do we need to do this? Does it not work to just pass it straight through and let CFN resolve the if statement?
There was a problem hiding this comment.
The merge between global custom statements and local with if won't be handled.
There was a problem hiding this comment.
Could you add a test case then that tests this flow? I don't see a test case that has both local and global custom statements.
jlhood
suggested changes
Jan 23, 2020
jlhood
approved these changes
Jan 28, 2020
Added support for intrinsics Ref for api auth Added support for fn::if in CustomStatements Fixed the policy getting created for vpc whitelist to be 'OR' instead of 'AND'
keetonian
approved these changes
Feb 3, 2020
This was referenced Feb 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added support for intrinsics Ref for api auth
Added support for fn::if in CustomStatements
Fixed the policy getting created for vpc whitelist to be 'OR' instead of 'AND'
Issue #, if available:
#1249 #1372 #1218
Description of changes:
Description of how you validated changes:
Checklist:
make prpassesexamples/2016-10-31By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.