Fixing cloudwatch query empty result issue

Author: ajmu1

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

@@ -3,12 +3,12 @@
 // to propagate. Note: This does NOT guarantee post-create consistency
 // of the query definitions themselves, but can reduce immediate read
 // failures when the provider plans many resources concurrently.
-resource "time_sleep" "wait_for_propagation" {
-  create_duration = "45s"
-}
+# resource "time_sleep" "wait_for_propagation" {
+#   create_duration = "45s"
+# }
 
 resource "aws_cloudwatch_query_definition" "search_for_errors" {
-  depends_on = [time_sleep.wait_for_propagation]
+  # depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-errors"
 
   log_group_names = [
@@ -30,7 +30,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_errors]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id"
 
   log_group_names = [
@@ -52,7 +52,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id_expanded" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_correlation_id]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id-expanded"
 
   log_group_names = [
@@ -74,7 +74,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_correlation_id_expanded]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode"
 
   log_group_names = [
@@ -96,7 +96,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode_expanded" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_odscode]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode-expanded"
 
   log_group_names = [
@@ -118,7 +118,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_postcode" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_odscode_expanded]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-invalid-postcode"
 
   log_group_names = [
@@ -134,7 +134,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_opening_times" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_invalid_postcode]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-invalid-opening-times"
 
   log_group_names = [
@@ -150,7 +150,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_email_correlation_id" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_invalid_opening_times]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-email-correlation-id"
 
   log_group_names = [
@@ -167,7 +167,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_success" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_email_correlation_id]
   name = "${var.project_id}/${var.blue_green_environment}/update-request-success"
 
   log_group_names = [
@@ -183,7 +183,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_failed" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_update_request_success]
   name = "${var.project_id}/${var.blue_green_environment}/update-request-failed"
 
   log_group_names = [
@@ -199,7 +199,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_dos_data_item_updates" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_update_request_failed]
   name = "${var.project_id}/${var.blue_green_environment}/dos-data-item-updates"
 
   log_group_names = [
@@ -217,7 +217,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_report_warnings" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_dos_data_item_updates]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-report-warnings"
 
   log_group_names = [
@@ -241,7 +241,7 @@ EOF
 
 
 resource "aws_cloudwatch_query_definition" "search_for_quality_checker_logs_with_odscode" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_report_warnings]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-quality-checker-logs-with-odscode"
 
   log_group_names = [