Updating ResourcePolicy create and update handlers to support stack tags #87
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
pns-amzn
commented
Dec 24, 2024
Comment on lines
-116
to
-143
| static Set<Tag> convertResourcePolicyTagToOrganizationTag(final Set<software.amazon.organizations.resourcepolicy.Tag> tags) { | ||
| final Set<Tag> tagsToReturn = new HashSet<>(); | ||
| if (tags == null) return tagsToReturn; | ||
| for (software.amazon.organizations.resourcepolicy.Tag inputTag : tags) { | ||
| Tag tag = Tag.builder() | ||
| .key(inputTag.getKey()) | ||
| .value(inputTag.getValue()) | ||
| .build(); | ||
| tagsToReturn.add(tag); | ||
| } | ||
| return tagsToReturn; | ||
| } | ||
|
|
||
| static Set<String> getTagKeysToRemove( | ||
| Set<Tag> oldTags, Set<Tag> newTags) { | ||
| final Set<String> oldTagKeys = getTagKeySet(oldTags); | ||
| final Set<String> newTagKeys = getTagKeySet(newTags); | ||
| return Sets.difference(oldTagKeys, newTagKeys); | ||
| } | ||
|
|
||
| static Set<Tag> getTagsToAddOrUpdate( | ||
| Set<Tag> oldTags, Set<Tag> newTags) { | ||
| return Sets.difference(newTags, oldTags); | ||
| } | ||
|
|
||
| static Set<String> getTagKeySet(Set<Tag> oldTags) { | ||
| return oldTags.stream().map(Tag::key).collect(Collectors.toSet()); | ||
| } |
There was a problem hiding this comment.
Moved these to TagsHelper
pns-amzn
commented
Dec 24, 2024
| @@ -86,10 +87,11 @@ public void handleRequest_NoTags_SimpleSuccess() { | |||
|
|
|||
| @Test | |||
| public void handleRequest_WithTags_SimpleSuccess() { | |||
| final ResourceModel model = generateInitialResourceModel(false, TEST_RESOURCEPOLICY_CONTENT); | |||
There was a problem hiding this comment.
This and few others had incorrectly set the hasTags to false, have updated them to true
pns-amzn
commented
Dec 24, 2024
Comment on lines
-148
to
-149
| assertThat(TagTestResourceHelper.tagsEqual(response.getResourceModel().getTags(), TagTestResourceHelper.updatedTags)); | ||
| assertThat(TagTestResourceHelper.correctTagsInTagAndUntagRequests(tagsToAddOrUpdate, tagKeysToRemove)); |
There was a problem hiding this comment.
Were missing isTrue() and thus were never getting tested
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.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.