From 70f1c9c1e6298ad551af2892a38bfed44b98a235 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Mon, 16 Nov 2015 15:16:41 -0600 Subject: [PATCH] remove duplicate readInstance call --- builtin/providers/aws/resource_aws_spot_instance_request.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_spot_instance_request.go b/builtin/providers/aws/resource_aws_spot_instance_request.go index eb9933922c..26a88a11fd 100644 --- a/builtin/providers/aws/resource_aws_spot_instance_request.go +++ b/builtin/providers/aws/resource_aws_spot_instance_request.go @@ -180,6 +180,7 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{} // Instance ID is not set if the request is still pending if request.InstanceId != nil { d.Set("spot_instance_id", *request.InstanceId) + // Read the instance data, setting up connection information if err := readInstance(d, meta); err != nil { return fmt.Errorf("[ERR] Error reading Spot Instance Data: %s", err) } @@ -187,8 +188,7 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{} d.Set("spot_request_state", *request.State) d.Set("tags", tagsToMap(request.Tags)) - // Read the instance data, setting up connection information - return readInstance(d, meta) + return nil } func readInstance(d *schema.ResourceData, meta interface{}) error {