providers/aws: fix a few more bugs in launch configs #1444
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
These bugs were found by additional check added in #1443 * Reversed nil err check meant that block devices were broken :( * Fixing the err check revealed a few missed pointer derefs * Unlike instances, ephemeral block devices do come back in `BlockDeviceMappings` from `DescribeLaunchConfigurations` calls, so we need to recognize them and filter them properly. Even though they're not set as computed, I'm doing a `d.Set` since it doesn't hurt and it gives us the benefit of basic drift detection.
| blockDevices["root"] = nil | ||
| if len(lc.BlockDeviceMappings) == 0 { | ||
| return nil, nil | ||
| } | ||
| rootDeviceName, err := fetchRootDeviceName(d.Get("image_id").(string), ec2conn) | ||
| if err == nil { | ||
| if err != nil { | ||
| return nil, err | ||
| } |
|
LGTM |
phinze
added a commit
that referenced
this pull request
Apr 9, 2015
providers/aws: fix a few more bugs in launch configs
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
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.
These bugs were found by additional check added in #1443
BlockDeviceMappingsfromDescribeLaunchConfigurationscalls, sowe need to recognize them and filter them properly. Even though
they're not set as computed, I'm doing a
d.Setsince it doesn'thurt and it gives us the benefit of basic drift detection.