Adding dependency for db

CDCgov · Mar 1, 2024 · c41ab52 · c41ab52
1 parent cf8e0a9
commit c41ab52
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/operations/template/db.tf b/operations/template/db.tf
@@ -20,6 +20,8 @@ resource "azurerm_postgresql_flexible_server" "database" {
     tenant_id                     = data.azurerm_client_config.current.tenant_id
   }
 
+  depends_on = [azurerm_private_dns_zone_virtual_network_link.db_network_link]
+
   lifecycle {
     ignore_changes = [
       zone,
@@ -28,14 +30,14 @@ resource "azurerm_postgresql_flexible_server" "database" {
   }
 }
 
-resource "azurerm_postgresql_flexible_server_active_directory_administrator" "admin_for_deployer" {
-  server_name         = azurerm_postgresql_flexible_server.database.name
-  resource_group_name = data.azurerm_resource_group.group.name
-  tenant_id           = data.azurerm_client_config.current.tenant_id
-  object_id           = var.deployer_id
-  principal_name      = "cdcti-github"
-  principal_type      = "ServicePrincipal"
-}
+#resource "azurerm_postgresql_flexible_server_active_directory_administrator" "admin_for_deployer" {
+#  server_name         = azurerm_postgresql_flexible_server.database.name
+#  resource_group_name = data.azurerm_resource_group.group.name
+#  tenant_id           = data.azurerm_client_config.current.tenant_id
+#  object_id           = var.deployer_id
+#  principal_name      = "cdcti-github"
+#  principal_type      = "ServicePrincipal"
+#}
 
 #resource "azurerm_postgresql_flexible_server_active_directory_administrator" "admin_for_app" {
 #  server_name         = azurerm_postgresql_flexible_server.database.name

diff --git a/operations/template/net.tf b/operations/template/net.tf
@@ -68,13 +68,13 @@ resource "azurerm_private_dns_zone" "dns_zone" {
   resource_group_name = data.azurerm_resource_group.group.name
 }
 
-#resource "azurerm_private_dns_zone_virtual_network_link" "db_network_link" {
-#  name                  = "intermediarylink.com"
-#  private_dns_zone_name = azurerm_private_dns_zone.dns_zone.name
-#  virtual_network_id    = data.azurerm_virtual_network.app.id
-#  resource_group_name   = data.azurerm_resource_group.group.name
-#  depends_on            = [azurerm_subnet.database]
-#}
+resource "azurerm_private_dns_zone_virtual_network_link" "db_network_link" {
+  name                  = "intermediarylink.com"
+  private_dns_zone_name = azurerm_private_dns_zone.dns_zone.name
+  virtual_network_id    = data.azurerm_virtual_network.app.id
+  resource_group_name   = data.azurerm_resource_group.group.name
+  depends_on            = [azurerm_subnet.database]
+}
 
 resource "azurerm_network_security_group" "db_security_group" {
   name                = "database-security-group"