Merge pull request #1288 from stack72/b-aws-instance-userdata-guard-581

resource/aws_instance: Guard check for aws_instance UserData to prevent panic
hashicorp · Jul 31, 2017 · 0bd2508 · 0bd2508
2 parents c7d5987 + 8ef10eb
commit 0bd2508
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go
@@ -718,7 +718,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
 		if err != nil {
 			return err
 		}
-		if attr.UserData.Value != nil {
+		if attr.UserData != nil && attr.UserData.Value != nil {
 			d.Set("user_data", userDataHashSum(*attr.UserData.Value))
 		}
 	}