Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/aws_instance: Ignore change of user_data from omission to empty #5467

Merged
merged 1 commit into from Aug 17, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion aws/resource_aws_instance.go
Expand Up @@ -128,7 +128,8 @@ func resourceAwsInstance() *schema.Resource {
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
// Sometimes the EC2 API responds with the equivalent, empty SHA1 sum
// echo -n "" | shasum
if old == "da39a3ee5e6b4b0d3255bfef95601890afd80709" && new == "" {
if (old == "da39a3ee5e6b4b0d3255bfef95601890afd80709" && new == "") ||
(old == "" && new == "da39a3ee5e6b4b0d3255bfef95601890afd80709") {
return true
}
return false
Expand Down