Merge pull request #9813 from terraform-providers/rfd-retry-sqs

Final retries for SQS resources
hashicorp · Aug 21, 2019 · f90dfa8 · f90dfa8
2 parents d941469 + 27d186e
commit f90dfa8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/aws/resource_aws_sqs_queue.go b/aws/resource_aws_sqs_queue.go
@@ -206,6 +206,9 @@ func resourceAwsSqsQueueCreate(d *schema.ResourceData, meta interface{}) error {
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		output, err = sqsconn.CreateQueue(req)
+	}
 	if err != nil {
 		return fmt.Errorf("Error creating SQS queue: %s", err)
 	}

diff --git a/aws/resource_aws_sqs_queue_policy.go b/aws/resource_aws_sqs_queue_policy.go
@@ -67,9 +67,11 @@ func resourceAwsSqsQueuePolicyUpsert(d *schema.ResourceData, meta interface{}) e
 		AttributeNames: []*string{aws.String(sqs.QueueAttributeNamePolicy)},
 	}
 	notUpdatedError := fmt.Errorf("SQS attribute %s not updated", sqs.QueueAttributeNamePolicy)
+	var out *sqs.GetQueueAttributesOutput
 	err = resource.Retry(1*time.Minute, func() *resource.RetryError {
 		log.Printf("[DEBUG] Reading SQS attributes: %s", gqaInput)
-		out, err := conn.GetQueueAttributes(gqaInput)
+		var err error
+		out, err = conn.GetQueueAttributes(gqaInput)
 		if err != nil {
 			return resource.NonRetryableError(err)
 		}
@@ -88,8 +90,23 @@ func resourceAwsSqsQueuePolicyUpsert(d *schema.ResourceData, meta interface{}) e
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		out, err = conn.GetQueueAttributes(gqaInput)
+		if err == nil {
+			queuePolicy, ok := out.Attributes[sqs.QueueAttributeNamePolicy]
+			if !ok {
+				return notUpdatedError
+			}
+
+			var equivalent bool
+			equivalent, err = awspolicy.PoliciesAreEquivalent(*queuePolicy, policy)
+			if !equivalent {
+				return notUpdatedError
+			}
+		}
+	}
 	if err != nil {
-		return err
+		return fmt.Errorf("Error updating SQS queue attributes: %s", err)
 	}
 
 	d.SetId(url)