From b74c6b7a4ad69956b301cf77d76676dce518a9f5 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Thu, 19 Mar 2026 13:48:58 -0400
Subject: [PATCH] update depends_on

---
 action_secrets.tf     | 10 ++++++++--
 branch_protection.tf  | 17 +++++++++--------
 github_branch.tf      |  7 ++++---
 github_deploy_keys.tf |  7 +++----
 github_files.tf       | 21 ++++++++++++---------
 5 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/action_secrets.tf b/action_secrets.tf
index c4116b2..828620d 100644
--- a/action_secrets.tf
+++ b/action_secrets.tf
@@ -3,7 +3,10 @@ resource "github_actions_secret" "secret" {
   repository      = var.create_repo ? github_repository.repo[0].name : data.github_repository.existing[0].name
   secret_name     = each.key
   plaintext_value = each.value
-  depends_on      = var.create_repo ? [github_repository.repo] : [data.github_repository.existing]
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+  ]
 }
 
 resource "github_actions_variable" "variable" {
@@ -11,5 +14,8 @@ resource "github_actions_variable" "variable" {
   repository    = var.create_repo ? github_repository.repo[0].name : data.github_repository.existing[0].name
   variable_name = each.key
   value         = each.value
-  depends_on    = var.create_repo ? [github_repository.repo] : [data.github_repository.existing]
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+  ]
 }
diff --git a/branch_protection.tf b/branch_protection.tf
index 0a016f5..44de797 100644
--- a/branch_protection.tf
+++ b/branch_protection.tf
@@ -49,12 +49,13 @@ resource "github_branch_protection" "protection" {
     }
   }
 
-  depends_on = concat(
-    var.create_repo ? [github_repository.repo] : [],
-    length(github_branch.branch) > 0 ? [github_branch.branch[0]] : [],
-    length(github_branch_default.default_main_branch) > 0 ? [github_branch_default.default_main_branch[0]] : [],
-    length(github_repository_file.extra_files) > 0 ? [for f in github_repository_file.extra_files : f] : [],
-    length(github_repository_file.codeowners) > 0 ? [github_repository_file.codeowners[0]] : [],
-    length(github_repository_file.managed_extra_files) > 0 ? [for f in github_repository_file.managed_extra_files : f] : []
-  )
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+    github_branch.branch,
+    github_branch_default.default_main_branch,
+    github_repository_file.extra_files,
+    github_repository_file.codeowners,
+    github_repository_file.managed_extra_files,
+  ]
 }
\ No newline at end of file
diff --git a/github_branch.tf b/github_branch.tf
index 86fe69e..26f833c 100644
--- a/github_branch.tf
+++ b/github_branch.tf
@@ -8,9 +8,10 @@ resource "github_branch" "branch" {
   count      = var.github_default_branch != "main" && local.github_repo != null ? 1 : 0
   repository = local.github_repo.name
   branch     = var.github_default_branch
-  depends_on = var.create_repo ? [
-    github_repository.repo
-  ] : []
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+  ]
 }
 
 # Set the default branch
diff --git a/github_deploy_keys.tf b/github_deploy_keys.tf
index 18aacc2..39768e4 100644
--- a/github_deploy_keys.tf
+++ b/github_deploy_keys.tf
@@ -20,9 +20,8 @@ resource "github_repository_deploy_key" "deploy_key" {
   key        = each.value.create ? tls_private_key.deploy_key[each.key].public_key_openssh : each.value.key
   read_only  = each.value.read_only
 
-  depends_on = var.create_repo ? [
-    github_repository.repo
-  ] : [
-    data.github_repository.existing
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
   ]
 }
diff --git a/github_files.tf b/github_files.tf
index 384eb86..06c4da5 100644
--- a/github_files.tf
+++ b/github_files.tf
@@ -20,9 +20,10 @@ resource "github_repository_file" "codeowners" {
   commit_author       = data.github_user.current.name
   commit_email        = data.github_user.current.email
   overwrite_on_create = true
-  depends_on = var.create_repo ? [
-    github_repository.repo
-  ] : []
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+  ]
   lifecycle {
     ignore_changes = [
       content,
@@ -71,9 +72,10 @@ resource "github_repository_file" "extra_files" {
   commit_author       = data.github_user.current.name
   commit_email        = data.github_user.current.email
   overwrite_on_create = true
-  depends_on = var.create_repo ? [
-    github_repository.repo
-  ] : []
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+  ]
   lifecycle {
     ignore_changes = [
       content,
@@ -93,9 +95,10 @@ resource "github_repository_file" "managed_extra_files" {
   commit_author       = data.github_user.current.name
   commit_email        = data.github_user.current.email
   overwrite_on_create = true
-  depends_on = var.create_repo ? [
-    github_repository.repo
-  ] : []
+  depends_on = [
+    github_repository.repo,
+    data.github_repository.existing,
+  ]
   lifecycle {
     ignore_changes = [
       branch