From 172a70bbb775cc558250add322109bab9636f913 Mon Sep 17 00:00:00 2001
From: Michael Imamura <michael.imamura@turner.com>
Date: Wed, 29 Jan 2025 17:31:25 -0500
Subject: [PATCH] Ensure stage is created before dependents.

---
 backend/terraform/modules/analyzer/api_main.tf | 2 ++
 orchestrator/terraform/modules/heimdall/api.tf | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/backend/terraform/modules/analyzer/api_main.tf b/backend/terraform/modules/analyzer/api_main.tf
index 9c76b18f..2aa80d37 100644
--- a/backend/terraform/modules/analyzer/api_main.tf
+++ b/backend/terraform/modules/analyzer/api_main.tf
@@ -497,6 +497,8 @@ resource "aws_api_gateway_base_path_mapping" "api" {
   api_id      = aws_api_gateway_rest_api.api.id
   stage_name  = var.api_stage
   domain_name = aws_api_gateway_domain_name.api.*.domain_name[count.index]
+
+  depends_on = [aws_api_gateway_stage.api]
 }
 
 ################################################################################
diff --git a/orchestrator/terraform/modules/heimdall/api.tf b/orchestrator/terraform/modules/heimdall/api.tf
index 090dfa7b..d8b1db69 100644
--- a/orchestrator/terraform/modules/heimdall/api.tf
+++ b/orchestrator/terraform/modules/heimdall/api.tf
@@ -22,6 +22,8 @@ resource "aws_api_gateway_usage_plan" "org_queue_usage" {
     api_id = aws_api_gateway_rest_api.on_demand_api.id
     stage  = var.api_stage
   }
+
+  depends_on = [aws_api_gateway_stage.on_demand_api]
 }
 
 resource "aws_api_gateway_usage_plan_key" "org-queue-plan-key" {
@@ -163,4 +165,6 @@ resource "aws_api_gateway_base_path_mapping" "on_demand" {
   stage_name  = var.api_stage
   domain_name = aws_api_gateway_domain_name.heimdall.domain_name
   base_path   = "on_demand"
+
+  depends_on = [aws_api_gateway_stage.on_demand_api]
 }