fix db name

Tietokilta · Jan 18, 2024 · ff32ad1 · ff32ad1
1 parent 67294e9
commit ff32ad1
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 20 deletions.
diff --git a/main.tf b/main.tf
@@ -133,7 +133,6 @@ module "web" {
   storage_connection_string  = module.web_storage.storage_connection_string
   storage_container_name     = module.web_storage.storage_container_name
   storage_account_base_url   = module.web_storage.storage_account_base_url
-  mongo_db_name              = module.web_storage.mongo_db_name
 }
 
 module "ilmo" {

diff --git a/modules/web/app/main.tf b/modules/web/app/main.tf
@@ -60,7 +60,7 @@ resource "azurerm_linux_web_app" "cms" {
   app_settings = {
     PUBLIC_FRONTEND_URL             = "https://${local.fqdn}"
     PAYLOAD_MONGO_CONNECTION_STRING = var.mongo_connection_string
-    PAYLOAD_MONGO_DB_NAME           = var.mongo_db_name
+    PAYLOAD_MONGO_DB_NAME           = "cms"
     PAYLOAD_SECRET                  = random_password.payload_secret.result
     WEBSITES_PORT                   = local.payload_port
     PAYLOAD_PORT                    = local.payload_port

diff --git a/modules/web/app/variables.tf b/modules/web/app/variables.tf
@@ -32,10 +32,6 @@ variable "mongo_connection_string" {
   type      = string
   sensitive = true
 }
-variable "mongo_db_name" {
-  type      = string
-  sensitive = true
-}
 variable "google_oauth_client_id" {
   type      = string
   sensitive = true

diff --git a/modules/web/storage/main.tf b/modules/web/storage/main.tf
@@ -28,16 +28,6 @@ resource "azurerm_cosmosdb_account" "db_account" {
   }
 }
 
-resource "azurerm_cosmosdb_mongo_database" "db" {
-  name                = "cms-${terraform.workspace}"
-  resource_group_name = var.resource_group_name
-  account_name        = azurerm_cosmosdb_account.db_account.name
-  autoscale_settings {
-    # CosmosDB free tier allows for a throughput of 1000 at max
-    max_throughput = 1000
-  }
-}
-
 resource "azurerm_storage_account" "tikweb_storage_account" {
   name                            = "tikwebstorage${terraform.workspace}"
   resource_group_name             = var.resource_group_name

diff --git a/modules/web/storage/output.tf b/modules/web/storage/output.tf
@@ -3,10 +3,6 @@ output "mongo_connection_string" {
   value     = azurerm_cosmosdb_account.db_account.primary_mongodb_connection_string
   sensitive = true
 }
-output "mongo_db_name" {
-  value     = azurerm_cosmosdb_mongo_database.db.name
-  sensitive = true
-}
 
 // Storage