delete old resources

equinor · Feb 21, 2024 · acccc80 · acccc80
1 parent cfb82ed
commit acccc80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/scripts/radix-zone/radix_zone_prod.env b/scripts/radix-zone/radix_zone_prod.env
@@ -189,7 +189,7 @@ AZ_RESOURCE_GROUP_VULNERABILITY_SCAN_SQL="vulnerability-scan-platform"
 KV_SECRET_VULNERABILITY_SCAN_SQL_ADMIN="radix-vulnerability-scan-db-admin"
 KV_SECRET_VULNERABILITY_SCAN_DB_WRITER="radix-vulnerability-scan-db-writer"
 KV_SECRET_VULNERABILITY_SCAN_DB_API="radix-vulnerability-scan-db-api"
-VULNERABILITY_SCAN_SQL_SERVER_NAME="sql-radix-vulnerability-scan-$RADIX_ZONE"
+VULNERABILITY_SCAN_SQL_SERVER_NAME="sql-radix-vulnerability-scan-platform"
 VULNERABILITY_SCAN_SQL_SERVER_FQDN="$VULNERABILITY_SCAN_SQL_SERVER_NAME.database.windows.net"
 VULNERABILITY_SCAN_SQL_DATABASE_NAME=radix-vulnerability-scan
 VULNERABILITY_SCAN_SQL_ADMIN_LOGIN=radix

diff --git a/terraform/subscriptions/s940/prod/vulnerability-scanner/main.tf b/terraform/subscriptions/s940/prod/vulnerability-scanner/main.tf
@@ -15,28 +15,8 @@ data "azurerm_key_vault_secret" "keyvault_secrets" {
   key_vault_id = data.azurerm_key_vault.keyvault.id # local.external_outputs.keyvault.vault_id
 }
 
-# MS SQL Server
-module "mssql-database" {
-  source                        = "../../../modules/mssqldatabase"
-  env                           = module.config.environment
-  database_name                 = "radix-vulnerability-scan"
-  server_name                   = "sql-radix-vulnerability-scan-prod" # ${module.config.environment} # Se https://github.com/equinor/radix-platform/issues/1187
-  managed_identity_admin_name   = "radix-id-vulnerability-scan-admin-${module.config.environment}"
-  admin_adgroup                 = var.admin-adgroup
-  administrator_login           = "radix"
-  administrator_password        = data.azurerm_key_vault_secret.keyvault_secrets.value
-  rg_name                       = module.resourcegroup.data.name
-  vnet_resource_group           = module.config.vnet_resource_group
-  location                      = module.config.location
-  public_network_access_enabled = true
-  zone_redundant                = false
-  sku_name                      = "S6"
-
-  admin_federated_credentials = {}
-}
-
 output "mi-client-id" {
-  value = module.mssql-database.mi-admin
+  value = module.mssql-database-platform.mi-admin
 }
 
 ## MS SQL Server