Merge pull request #2640 from hashicorp/b-aws-spot-instance-fix

provider/aws: Fix issue where spot instance requests would crash
hashicorp · Jul 8, 2015 · d34bd0d · d34bd0d
2 parents ec6f866 + 2fedaa9
commit d34bd0d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/builtin/providers/aws/resource_aws_spot_instance_request.go b/builtin/providers/aws/resource_aws_spot_instance_request.go
@@ -166,7 +166,10 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{}
 	}
 
 	d.Set("spot_bid_status", *request.Status.Code)
-	d.Set("spot_instance_id", *request.InstanceID)
+	// Instance ID is not set if the request is still pending
+	if request.InstanceID != nil {
+		d.Set("spot_instance_id", *request.InstanceID)
+	}
 	d.Set("spot_request_state", *request.State)
 	d.Set("tags", tagsToMap(request.Tags))