updates

ops/terraform/main.tf

@@ -124,6 +124,7 @@ module "ocr_autoscale" {
 module "database" {
   source              = "./modules/database"
   env                 = local.environment
+  name                = var.name
   resource_group_name = data.azurerm_resource_group.rg.name
   db_subnet           = module.networking.dbsubnet_id
   private_dns_zone_id = module.networking.private_dns_zone_id

ops/terraform/modules/database/main.tf

@@ -2,7 +2,7 @@
 # As a result we are using Azure Database for PostgreSQL Flexible Server
 # with granular control, flexibility and better cost optimization. 
 resource "azurerm_postgresql_flexible_server" "postgres_flexible_server" {
-  name                  = "reportvisionpostgresql-flexible-server-${var.env}"
+  name                  = "${var.name}postgresql-fs-${var.env}"
   location              = var.location
   resource_group_name   = var.resource_group_name
   sku_name              = var.postgres_sku_name

ops/terraform/modules/database/variables.tf

@@ -15,6 +15,11 @@ variable "location" {
   default     = "eastus2"
 }
 
+variable "name" {
+  type        = string
+  description = "The name of the Project"
+}
+
 variable "resource_group_name" {
   type        = string
   description = "The Azure Resource Group to deploy to"

ops/terraform/modules/vault/main.tf

@@ -4,7 +4,7 @@ resource "azurerm_key_vault" "this" {
   resource_group_name      = var.resource_group_name
   sku_name                 = "standard"
   tenant_id                = data.azurerm_client_config.current.tenant_id
-  purge_protection_enabled = true
+  purge_protection_enabled = false
 
   access_policy {
     tenant_id = data.azurerm_client_config.current.tenant_id

ops/terraform/variables.tf

@@ -1,6 +1,5 @@
 variable "client_id" {}
 variable "name" {}
-variable "postgres_server_id" {}
 variable "object_id" {}
 variable "tenant_id" {}