Fixing cloudwatch query issue in pipeline

Author: ajmu1

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

@@ -1,4 +1,14 @@
+// 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 = "5s"
+}
+
 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 = [
@@ -23,6 +33,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id"
 
   log_group_names = [
@@ -47,6 +58,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id_expanded" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id-expanded"
 
   log_group_names = [
@@ -71,6 +83,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode"
 
   log_group_names = [
@@ -95,6 +108,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode_expanded" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode-expanded"
 
   log_group_names = [
@@ -119,6 +133,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_postcode" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-invalid-postcode"
 
   log_group_names = [
@@ -137,6 +152,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_opening_times" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-invalid-opening-times"
 
   log_group_names = [
@@ -155,6 +171,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_email_correlation_id" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-email-correlation-id"
 
   log_group_names = [
@@ -174,6 +191,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_success" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/update-request-success"
 
   log_group_names = [
@@ -192,6 +210,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_failed" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/update-request-failed"
 
   log_group_names = [
@@ -210,6 +229,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_dos_data_item_updates" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/dos-data-item-updates"
 
   log_group_names = [
@@ -230,6 +250,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_report_warnings" {
+  depends_on = [time_sleep.wait_for_propagation]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-report-warnings"
 
   log_group_names = [
@@ -256,6 +277,7 @@ EOF
 
 
 resource "aws_cloudwatch_query_definition" "search_for_quality_checker_logs_with_odscode" {
+  depends_on = [time_sleep.wait_for_propagation]
   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,5 +7,9 @@ terraform {
       source  = "hashicorp/aws"
       version = "~> 6.14.1"
     }
+    time = {
+      source  = "hashicorp/time"
+      version = "~> 0.13.1"
+    }
   }
 }