Merge pull request #1903 from darkowlzz/1327-handle-closed-spot-request

Spot Instance Request: handle "closed" requests
hashicorp · Oct 15, 2017 · 3089ed0 · 3089ed0
2 parents 4fc6d6b + fd5f541
commit 3089ed0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go
@@ -215,8 +215,8 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{}
 
 	request := resp.SpotInstanceRequests[0]
 
-	// if the request is cancelled, then it is gone
-	if *request.State == "cancelled" {
+	// if the request is cancelled or closed, then it is gone
+	if *request.State == "cancelled" || *request.State == "closed" {
 		d.SetId("")
 		return nil
 	}

diff --git a/aws/resource_aws_spot_instance_request_test.go b/aws/resource_aws_spot_instance_request_test.go
@@ -211,8 +211,9 @@ func testAccCheckAWSSpotInstanceRequestDestroy(s *terraform.State) error {
 			return nil
 		}
 
-		if *s.State == "canceled" {
+		if *s.State == "canceled" || *s.State == "closed" {
 			// Requests stick around for a while, so we make sure it's cancelled
+			// or closed.
 			return nil
 		}