Merge pull request #4132 from hashicorp/b-aws-spot-panic

provider/aws: Check for nil on some spot instance attributes
hashicorp · Dec 1, 2015 · 4e5c5c3 · 4e5c5c3
2 parents 20beafd + c5f0c8c
commit 4e5c5c3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/builtin/providers/aws/resource_aws_spot_instance_request.go b/builtin/providers/aws/resource_aws_spot_instance_request.go
@@ -194,8 +194,13 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{}
 			return fmt.Errorf("[ERR] Error reading Spot Instance Data: %s", err)
 		}
 	}
-	d.Set("spot_request_state", *request.State)
-	d.Set("block_duration_minutes", *request.BlockDurationMinutes)
+
+	if request.State != nil {
+		d.Set("spot_request_state", *request.State)
+	}
+	if request.BlockDurationMinutes != nil {
+		d.Set("block_duration_minutes", *request.BlockDurationMinutes)
+	}
 	d.Set("tags", tagsToMap(request.Tags))
 
 	return nil