Fixing race condition issue in cw queries

Author: ajmu1

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

@@ -1,14 +1,4 @@
-// Introduce a short sleep BEFORE creating query definitions to allow
-// recently-created log groups (from other modules in the same apply)
-// 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 "aws_cloudwatch_query_definition" "search_for_errors" {
-  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-errors"
 
   log_group_names = [
@@ -33,7 +23,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id" {
-  depends_on = [aws_cloudwatch_query_definition.search_for_errors]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id"
 
   log_group_names = [
@@ -58,7 +47,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id_expanded" {
-  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 = [
@@ -83,7 +71,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode" {
-  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 = [
@@ -108,7 +95,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode_expanded" {
-  depends_on = [aws_cloudwatch_query_definition.search_by_odscode]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode-expanded"
 
   log_group_names = [
@@ -133,7 +119,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_postcode" {
-  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 = [
@@ -152,7 +137,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_opening_times" {
-  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 = [
@@ -171,7 +155,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_email_correlation_id" {
-  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 = [
@@ -191,7 +174,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_success" {
-  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 = [
@@ -210,7 +192,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_failed" {
-  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 = [
@@ -229,7 +210,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_dos_data_item_updates" {
-  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 = [
@@ -250,7 +230,6 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_report_warnings" {
-  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 = [
@@ -277,7 +256,6 @@ EOF
 
 
 resource "aws_cloudwatch_query_definition" "search_for_quality_checker_logs_with_odscode" {
-  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 = [

infrastructure/stacks/blue-green-link/terraform.tf

@@ -7,9 +7,5 @@ terraform {
       source  = "hashicorp/aws"
       version = "~> 6.14.1"
     }
-    time = {
-      source  = "hashicorp/time"
-      version = "~> 0.13.1"
-    }
   }
 }

infrastructure/stacks/common/common-provider.tf

@@ -1,5 +1,7 @@
 provider "aws" {
   region = var.aws_region
+  retry_mode  = "adaptive"
+  max_retries = 25
   default_tags {
     tags = {
       "DataClassification" = var.data_classification