Merge pull request hashicorp#20926 from bkez322/b-rds_replicas_enhanc…

…ed_monitoring Bug Fix: Failure to create RDS replicas with 'enhanced-monitoring' if source already exists
gavin-truework · Aug 10, 2022 · 6f0dbca · 6f0dbca
2 parents dd89104 + 5eb7124
commit 6f0dbca
Show file tree

Hide file tree

Showing 10 changed files with 2,811 additions and 3,326 deletions.
diff --git a/.changelog/20926.txt b/.changelog/20926.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_db_instance: Add retries (for handling IAM eventual consistency) when creating database replicas that use enhanced monitoring
+```
+
+```release-note:bug
+resource/aws_db_instance: Apply `monitoring_interval` and `monitoring_role_arn` when creating via `restore_to_point_in_time`
+```
diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go
@@ -169,8 +169,8 @@ func ResourceCluster() *schema.Resource {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ForceNew:     true,
-				Default:      EngineAurora,
-				ValidateFunc: validEngine(),
+				Default:      ClusterEngineAurora,
+				ValidateFunc: validClusterEngine(),
 			},
 			"engine_mode": {
 				Type:         schema.TypeString,