Backport of ignore_changes converting null maps to empty maps, and applying marks. into v1.1
#29938
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
teamterraform
force-pushed
the
backport/jbardin/ignore_null_map/duly-distinct-kodiak
branch
from
f283f12
to
1703cd5
Compare
jbardin
deleted the
backport/jbardin/ignore_null_map/duly-distinct-kodiak
branch
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport
This PR is auto-generated from #29928 to be assessed for backporting due to the inclusion of the label 1.1-backport.
The below text is copied from the body of the original PR.
When processing nested data structures for
ignore_changes, a null map was sometimes converted to an empty map.When processing individual changes within a map, those changes could be lost when re-applying any marks set on the outer map.
Fixes #29921