Final retries after timeouts for various Neptune resources

aws/resource_aws_neptune_cluster.go

@@ -350,6 +350,13 @@ func resourceAwsNeptuneClusterCreate(d *schema.ResourceData, meta interface{}) e
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		if restoreDBClusterFromSnapshot {
+			_, err = conn.RestoreDBClusterFromSnapshot(restoreDBClusterFromSnapshotInput)
+		} else {
+			_, err = conn.CreateDBCluster(createDbClusterInput)
+		}
+	}
 	if err != nil {
 		return fmt.Errorf("error creating Neptune Cluster: %s", err)
 	}
@@ -542,6 +549,9 @@ func resourceAwsNeptuneClusterUpdate(d *schema.ResourceData, meta interface{}) e
 			}
 			return nil
 		})
+		if isResourceTimeoutError(err) {
+			_, err = conn.ModifyDBCluster(req)
+		}
 		if err != nil {
 			return fmt.Errorf("Failed to modify Neptune Cluster (%s): %s", d.Id(), err)
 		}
@@ -636,6 +646,9 @@ func resourceAwsNeptuneClusterDelete(d *schema.ResourceData, meta interface{}) e
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		_, err = conn.DeleteDBCluster(&deleteOpts)
+	}
 	if err != nil {
 		return fmt.Errorf("Neptune Cluster cannot be deleted: %s", err)
 	}

aws/resource_aws_neptune_cluster_instance.go

@@ -247,6 +247,9 @@ func resourceAwsNeptuneClusterInstanceCreate(d *schema.ResourceData, meta interf
 		}
 		return nil
 	})
+	if isResourceTimeoutError(err) {
+		resp, err = conn.CreateDBInstance(createOpts)
+	}
 	if err != nil {
 		return fmt.Errorf("error creating Neptune Instance: %s", err)
 	}
@@ -407,6 +410,9 @@ func resourceAwsNeptuneClusterInstanceUpdate(d *schema.ResourceData, meta interf
 			}
 			return nil
 		})
+		if isResourceTimeoutError(err) {
+			_, err = conn.ModifyDBInstance(req)
+		}
 		if err != nil {
 			return fmt.Errorf("Error modifying Neptune Instance %s: %s", d.Id(), err)
 		}

aws/resource_aws_neptune_parameter_group.go

@@ -229,6 +229,9 @@ func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interfa
 				}
 				return nil
 			})
+			if isResourceTimeoutError(err) {
+				_, err = conn.ResetDBParameterGroup(&resetOpts)
+			}
 			if err != nil {
 				return fmt.Errorf("Error resetting Neptune Parameter Group: %s", err)
 			}
@@ -272,10 +275,10 @@ func resourceAwsNeptuneParameterGroupUpdate(d *schema.ResourceData, meta interfa
 func resourceAwsNeptuneParameterGroupDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).neptuneconn
 
-	return resource.Retry(3*time.Minute, func() *resource.RetryError {
-		deleteOpts := neptune.DeleteDBParameterGroupInput{
-			DBParameterGroupName: aws.String(d.Id()),
-		}
+	deleteOpts := neptune.DeleteDBParameterGroupInput{
+		DBParameterGroupName: aws.String(d.Id()),
+	}
+	err := resource.Retry(3*time.Minute, func() *resource.RetryError {
 		_, err := conn.DeleteDBParameterGroup(&deleteOpts)
 		if err != nil {
 			if isAWSErr(err, neptune.ErrCodeDBParameterGroupNotFoundFault, "") {
@@ -288,4 +291,18 @@ func resourceAwsNeptuneParameterGroupDelete(d *schema.ResourceData, meta interfa
 		}
 		return nil
 	})
+
+	if isResourceTimeoutError(err) {
+		_, err = conn.DeleteDBParameterGroup(&deleteOpts)
+	}
+
+	if isAWSErr(err, neptune.ErrCodeDBParameterGroupNotFoundFault, "") {
+		return nil
+	}
+
+	if err != nil {
+		return fmt.Errorf("Error deleting Neptune Parameter Group: %s", err)
+	}
+
+	return nil
 }