Skip to content

Commit 4195c4c

Browse files
ajmu1mabe13dependabot[bot]Tomdangonsindhu26
authored
Release/shared resources ten (#1142)
# Release Branch Pull Request ## Description of Changes This release will contain upgrade of terraform core version(from v1.2.1 to v1.13.0), terraform AWS provider version(v5.68.0 to v6.14.1) and python version upgrade(v3.12 to v3.14) for lambda and tester docker images of DI application as well. --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Matthew Begley <60427904+mabe13@users.noreply.github.com> Co-authored-by: Matthew Begley <60427904+mabe13@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Judd-Cooper <me@tomjuddcooper.co.uk> Co-authored-by: Sindhu Natarajan <nsindhupriya@hotmail.co.uk> Co-authored-by: ThomasC-Kainos <106971950+ThomasC-Kainos@users.noreply.github.com> Co-authored-by: ajmu1 <ajmu1@hscic.gov.uk> Co-authored-by: ManithaSrinivasa <142212846+ManithaSrinivasa@users.noreply.github.com>
1 parent 513efc8 commit 4195c4c

1 file changed

Lines changed: 16 additions & 5 deletions

File tree

infrastructure/stacks/blue-green-link/cloudwatch-queries.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// to propagate. Note: This does NOT guarantee post-create consistency
44
// of the query definitions themselves, but can reduce immediate read
55
// failures when the provider plans many resources concurrently.
6-
# resource "time_sleep" "wait_for_propagation" {
7-
# create_duration = "45s"
8-
# }
6+
resource "time_sleep" "wait_for_propagation" {
7+
create_duration = "45s"
8+
}
99

1010
resource "aws_cloudwatch_query_definition" "search_for_errors" {
11-
# depends_on = [time_sleep.wait_for_propagation]
11+
depends_on = [time_sleep.wait_for_propagation]
1212
name = "${var.project_id}/${var.blue_green_environment}/search-for-errors"
1313

1414
log_group_names = [
@@ -30,7 +30,6 @@ EOF
3030
lifecycle {
3131
create_before_destroy = false
3232
}
33-
3433
}
3534

3635
resource "aws_cloudwatch_query_definition" "search_by_correlation_id" {
@@ -52,6 +51,7 @@ fields @timestamp, message
5251
| filter correlation_id == 'REPLACE'
5352
| sort @timestamp
5453
EOF
54+
5555
lifecycle {
5656
create_before_destroy = false
5757
}
@@ -76,6 +76,7 @@ fields @timestamp,correlation_id,ods_code,level,message_received,function_name,
7676
| filter correlation_id == 'REPLACE'
7777
| sort @timestamp
7878
EOF
79+
7980
lifecycle {
8081
create_before_destroy = false
8182
}
@@ -100,6 +101,7 @@ fields @timestamp, message
100101
| filter ods_code == 'REPLACE'
101102
| sort @timestamp
102103
EOF
104+
103105
lifecycle {
104106
create_before_destroy = false
105107
}
@@ -124,6 +126,7 @@ fields @timestamp,correlation_id,ods_code,level,message_received,function_name,
124126
| filter ods_code == 'REPLACE'
125127
| sort @timestamp
126128
EOF
129+
127130
lifecycle {
128131
create_before_destroy = false
129132
}
@@ -142,6 +145,7 @@ fields @timestamp,correlation_id,ods_code,level,message_received,function_name,
142145
| filter report_key == 'INVALID_POSTCODE'
143146
| sort @timestamp
144147
EOF
148+
145149
lifecycle {
146150
create_before_destroy = false
147151
}
@@ -160,6 +164,7 @@ fields @timestamp,correlation_id,ods_code,level,message_received,function_name,
160164
| filter report_key == 'INVALID_OPEN_TIMES'
161165
| sort @timestamp
162166
EOF
167+
163168
lifecycle {
164169
create_before_destroy = false
165170
}
@@ -179,6 +184,7 @@ fields correlation_id
179184
| filter message =="Email Correlation Id"
180185
| filter email_correlation_id == "ADD_EMAIL_CORRELATION_ID"
181186
EOF
187+
182188
lifecycle {
183189
create_before_destroy = false
184190
}
@@ -197,6 +203,7 @@ fields @timestamp, correlation_id
197203
| filter ServiceUpdateSuccess == 1
198204
| sort @timestamp desc
199205
EOF
206+
200207
lifecycle {
201208
create_before_destroy = false
202209
}
@@ -215,6 +222,7 @@ fields @timestamp, correlation_id, report_key
215222
| filter report_key == DOS_DB_UPDATE_DLQ_HANDLER_RECEIVED_EVENT
216223
| sort @timestamp desc
217224
EOF
225+
218226
lifecycle {
219227
create_before_destroy = false
220228
}
@@ -235,6 +243,7 @@ fields @timestamp, correlation_id
235243
| filter field == 'REPLACE'
236244
| sort @timestamp desc
237245
EOF
246+
238247
lifecycle {
239248
create_before_destroy = false
240249
}
@@ -260,6 +269,7 @@ fields @timestamp, correlation_id, message
260269
| filter level == 'WARNING'
261270
| sort @timestamp desc
262271
EOF
272+
263273
lifecycle {
264274
create_before_destroy = false
265275
}
@@ -279,6 +289,7 @@ fields @timestamp, level, message
279289
| filter odscode = 'TO_ADD'
280290
| sort @timestamp asc
281291
EOF
292+
282293
lifecycle {
283294
create_before_destroy = false
284295
}

0 commit comments

Comments
 (0)