Merge pull request #9674 from terraform-providers/rfd-retry-ami

Final retry after timeout reading AMI
hashicorp · Aug 9, 2019 · 348fa19 · 348fa19
2 parents 1e191cb + 38126d9
commit 348fa19
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/aws/resource_aws_ami.go b/aws/resource_aws_ami.go
@@ -299,7 +299,7 @@ func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error {
 		var err error
 		res, err = client.DescribeImages(req)
 		if err != nil {
-			if ec2err, ok := err.(awserr.Error); ok && ec2err.Code() == "InvalidAMIID.NotFound" {
+			if isAWSErr(err, "InvalidAMIID.NotFound", "") {
 				if d.IsNewResource() {
 					return resource.RetryableError(err)
 				}
@@ -313,6 +313,9 @@ func resourceAwsAmiRead(d *schema.ResourceData, meta interface{}) error {
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		res, err = client.DescribeImages(req)
+	}
 	if err != nil {
 		return fmt.Errorf("Unable to find AMI after retries: %s", err)
 	}