Merge pull request #4242 from hashicorp/b-aws-lc-guard

provider/aws: Fix missing AMI issue with Launch Configurations
hashicorp · Dec 10, 2015 · eb3840c · eb3840c
2 parents b23e6ed + e4dba86
commit eb3840c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/builtin/providers/aws/resource_aws_launch_configuration.go b/builtin/providers/aws/resource_aws_launch_configuration.go
@@ -386,6 +386,11 @@ func resourceAwsLaunchConfigurationCreate(d *schema.ResourceData, meta interface
 			}
 
 			if dn, err := fetchRootDeviceName(d.Get("image_id").(string), ec2conn); err == nil {
+				if dn == nil {
+					return fmt.Errorf(
+						"Expected to find a Root Device name for AMI (%s), but got none",
+						d.Get("image_id").(string))
+				}
 				blockDevices = append(blockDevices, &autoscaling.BlockDeviceMapping{
 					DeviceName: dn,
 					Ebs:        ebs,