Fix deep_merge function to correctly handle nil arrays #11636
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
roaks3
force-pushed
the
fix-array-merge
branch
from
a127764 to
135f168
Compare
|
Hi there, I'm the Modular magician. I've detected the following information about your changes: Diff reportYour PR hasn't generated any diffs, but I'll let you know if a future commit does. |
1 similar comment
|
Hi there, I'm the Modular magician. I've detected the following information about your changes: Diff reportYour PR hasn't generated any diffs, but I'll let you know if a future commit does. |
This was referenced Sep 4, 2024
Fix deep_merge function to correctly handle nil arrays
hashicorp/terraform-provider-google-beta#8106
Merged
Merged
iyabchen
pushed a commit
to iyabchen/magic-modules
that referenced
this pull request
Sep 14, 2024
niharika-98
pushed a commit
to niharika-98/magic-modules
that referenced
this pull request
Oct 7, 2024
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.
This was discovered on https://cloud-internal-review.git.corp.google.com/c/cloud-graphite-eng/magic-modules-private-overrides/+/47770.
Previously, we could have a state where a new array field was added in the overrides (like
conflicts), and this would cause a build failure. This occurred becausestring_array?assumes the array is not nil.This fix checks both arrays for nil, and instead of failing when the array from magic-modules is nil, it returns the other array, which is what the caller likely expects.
Release Note Template for Downstream PRs (will be copied)