From 9a1e6bb52a221a11d6290ecb1278307ddfd5b70e Mon Sep 17 00:00:00 2001
From: Ryn Daniels <ryn@hashicorp.com>
Date: Thu, 13 Jun 2019 17:31:21 +0200
Subject: [PATCH] Final retries for docdb cluster operations

---
 aws/resource_aws_docdb_cluster.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/aws/resource_aws_docdb_cluster.go b/aws/resource_aws_docdb_cluster.go
index b4d09f7eed27..46c6e99cd342 100644
--- a/aws/resource_aws_docdb_cluster.go
+++ b/aws/resource_aws_docdb_cluster.go
@@ -340,6 +340,9 @@ func resourceAwsDocDBClusterCreate(d *schema.ResourceData, meta interface{}) err
 			}
 			return nil
 		})
+		if isResourceTimeoutError(err) {
+			_, err = conn.RestoreDBClusterFromSnapshot(&opts)
+		}
 		if err != nil {
 			return fmt.Errorf("Error creating DocDB Cluster: %s", err)
 		}
@@ -421,6 +424,9 @@ func resourceAwsDocDBClusterCreate(d *schema.ResourceData, meta interface{}) err
 			}
 			return nil
 		})
+		if isResourceTimeoutError(err) {
+			resp, err = conn.CreateDBCluster(createOpts)
+		}
 		if err != nil {
 			return fmt.Errorf("error creating DocDB cluster: %s", err)
 		}
@@ -636,6 +642,9 @@ func resourceAwsDocDBClusterUpdate(d *schema.ResourceData, meta interface{}) err
 			}
 			return nil
 		})
+		if isResourceTimeoutError(err) {
+			_, err = conn.ModifyDBCluster(req)
+		}
 		if err != nil {
 			return fmt.Errorf("Failed to modify DocDB Cluster (%s): %s", d.Id(), err)
 		}
@@ -692,6 +701,9 @@ func resourceAwsDocDBClusterDelete(d *schema.ResourceData, meta interface{}) err
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		_, err = conn.DeleteDBCluster(&deleteOpts)
+	}
 	if err != nil {
 		return fmt.Errorf("DocDB Cluster cannot be deleted: %s", err)
 	}