Refactor

frasermolyneux · May 20, 2024 · 1668875 · 1668875
1 parent 0765edd
commit 1668875
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/terraform/key_vault.tf b/terraform/key_vault.tf
@@ -0,0 +1,19 @@
+resource "azurerm_key_vault" "sql_kv" {
+  name                = local.key_vault_name
+  location            = azurerm_resource_group.rg.location
+  resource_group_name = azurerm_resource_group.rg.name
+  tenant_id           = data.azurerm_client_config.current.tenant_id
+
+  tags = var.tags
+
+  soft_delete_retention_days = 90
+  purge_protection_enabled   = true
+  enable_rbac_authorization  = true
+
+  sku_name = "standard"
+
+  network_acls {
+    bypass         = "AzureServices"
+    default_action = "Allow"
+  }
+}
diff --git a/terraform/locals.tf b/terraform/locals.tf
@@ -3,7 +3,7 @@ locals {
   app_insights_name     = "ai-portal-core-${var.environment}-${var.location}-${var.instance}"
   app_service_plan_name = "asp-portal-core-${var.environment}-${var.location}-${var.instance}"
   api_management_name   = "apim-portal-core-${var.environment}-${var.location}-${var.instance}-${random_id.environment_id.hex}"
+  key_vault_name        = "kv-${random_id.environment_id.hex}-${var.location}"
   sql_admin_group_name  = "sql-admins-${var.environment}-${var.location}-${var.instance}"
-  sql_key_vault_name    = "kv-sql${random_id.environment_id.hex}-${var.location}"
   sql_name              = "sql-${var.environment}-${var.location}-${var.instance}"
 }
diff --git a/terraform/sql_server.tf b/terraform/sql_server.tf
@@ -14,26 +14,6 @@ resource "random_id" "username_suffix" {
   byte_length = 4
 }
 
-resource "azurerm_key_vault" "sql_kv" {
-  name                = local.sql_key_vault_name
-  location            = azurerm_resource_group.rg.location
-  resource_group_name = azurerm_resource_group.rg.name
-  tenant_id           = data.azurerm_client_config.current.tenant_id
-
-  tags = var.tags
-
-  soft_delete_retention_days = 90
-  purge_protection_enabled   = true
-  enable_rbac_authorization  = true
-
-  sku_name = "standard"
-
-  network_acls {
-    bypass         = "AzureServices"
-    default_action = "Allow"
-  }
-}
-
 resource "azurerm_key_vault_secret" "sql_username" {
   name         = "${local.sql_name}-username"
   value        = "addy${random_id.username_suffix.hex}"