Merge pull request #31112 from hashicorp/t-rds-cluster-engine-default

rds/cluster/cluster_instance: engine becomes required
hashicorp · May 3, 2023 · 5c327f7 · 5c327f7
2 parents fc70c7d + 8110085
commit 5c327f7
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 388 deletions.
diff --git a/.changelog/31112.txt b/.changelog/31112.txt
@@ -0,0 +1,15 @@
+```release-note:breaking-change
+resource/aws_rds_cluster: The `engine` argument is now required and has no default
+```
+
+```release-note:note
+resource/aws_rds_cluster: Configurations not including the `engine` argument must be updated to include `engine` as it is now required. Previously, not including `engine` was equivalent to `engine = "aurora"` and created a MySQL-5.6-compatible cluster
+```
+
+```release-note:breaking-change
+resource/aws_rds_cluster_instance: The `engine` argument is now required and has no default
+```
+
+```release-note:note
+resource/aws_rds_cluster_instance: Configurations not including the `engine` argument must be updated to include `engine` as it is now required. Previously, not including `engine` was equivalent to `engine = "aurora"` and created a MySQL-5.6-compatible cluster instance
+```
diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go
@@ -174,9 +174,8 @@ func ResourceCluster() *schema.Resource {
 			},
 			"engine": {
 				Type:         schema.TypeString,
-				Optional:     true,
+				Required:     true,
 				ForceNew:     true,
-				Default:      ClusterEngineAurora,
 				ValidateFunc: validClusterEngine(),
 			},
 			"engine_mode": {

diff --git a/internal/service/rds/cluster_instance.go b/internal/service/rds/cluster_instance.go
@@ -99,9 +99,8 @@ func ResourceClusterInstance() *schema.Resource {
 			},
 			"engine": {
 				Type:         schema.TypeString,
-				Optional:     true,
+				Required:     true,
 				ForceNew:     true,
-				Default:      ClusterEngineAurora,
 				ValidateFunc: validClusterEngine(),
 			},
 			"engine_version": {