@@ -75,6 +75,12 @@ resource "aws_rds_cluster" "primary" {
75
75
backtrack_window = var. backtrack_window
76
76
enable_http_endpoint = var. engine_mode == " serverless" && var. enable_http_endpoint ? true : false
77
77
78
+ depends_on = [
79
+ aws_db_subnet_group . default ,
80
+ aws_rds_cluster_parameter_group . default ,
81
+ aws_security_group . default ,
82
+ ]
83
+
78
84
dynamic "s3_import" {
79
85
for_each = var. s3_import [* ]
80
86
content {
@@ -150,6 +156,13 @@ resource "aws_rds_cluster" "secondary" {
150
156
backtrack_window = var. backtrack_window
151
157
enable_http_endpoint = var. engine_mode == " serverless" && var. enable_http_endpoint ? true : false
152
158
159
+ depends_on = [
160
+ aws_db_subnet_group . default ,
161
+ aws_db_parameter_group . default ,
162
+ aws_rds_cluster_parameter_group . default ,
163
+ aws_security_group . default ,
164
+ ]
165
+
153
166
dynamic "scaling_configuration" {
154
167
for_each = var. scaling_configuration
155
168
content {
@@ -182,7 +195,8 @@ resource "aws_rds_cluster" "secondary" {
182
195
183
196
lifecycle {
184
197
ignore_changes = [
185
- replication_source_identifier
198
+ replication_source_identifier , # will be set/managed by Global Cluster
199
+ snapshot_identifier , # if created from a snapshot, will be non-null at creation, but null afterwards
186
200
]
187
201
}
188
202
}
@@ -204,6 +218,14 @@ resource "aws_rds_cluster_instance" "default" {
204
218
performance_insights_enabled = var. performance_insights_enabled
205
219
performance_insights_kms_key_id = var. performance_insights_kms_key_id
206
220
availability_zone = var. instance_availability_zone
221
+
222
+ depends_on = [
223
+ aws_db_subnet_group . default ,
224
+ aws_db_parameter_group . default ,
225
+ aws_iam_role . enhanced_monitoring ,
226
+ aws_rds_cluster . secondary ,
227
+ aws_rds_cluster_parameter_group . default ,
228
+ ]
207
229
}
208
230
209
231
resource "aws_db_subnet_group" "default" {
@@ -216,7 +238,7 @@ resource "aws_db_subnet_group" "default" {
216
238
217
239
resource "aws_rds_cluster_parameter_group" "default" {
218
240
count = module. this . enabled ? 1 : 0
219
- name = module. this . id
241
+ name_prefix = " ${ module . this . id } ${ module . this . delimiter } "
220
242
description = " DB cluster parameter group"
221
243
family = var. cluster_family
222
244
@@ -230,11 +252,15 @@ resource "aws_rds_cluster_parameter_group" "default" {
230
252
}
231
253
232
254
tags = module. this . tags
255
+
256
+ lifecycle {
257
+ create_before_destroy = true
258
+ }
233
259
}
234
260
235
261
resource "aws_db_parameter_group" "default" {
236
262
count = module. this . enabled ? 1 : 0
237
- name = module. this . id
263
+ name_prefix = " ${ module . this . id } ${ module . this . delimiter } "
238
264
description = " DB instance parameter group"
239
265
family = var. cluster_family
240
266
@@ -248,6 +274,10 @@ resource "aws_db_parameter_group" "default" {
248
274
}
249
275
250
276
tags = module. this . tags
277
+
278
+ lifecycle {
279
+ create_before_destroy = true
280
+ }
251
281
}
252
282
253
283
locals {
0 commit comments