Merge pull request #17 from mongodb-partners/terraform

Add suffix to resources and remove spaces from Fabric workspace name

Author: DianaMDB

.DS_Store

@@ -7,4 +7,6 @@ data_files/
 *.log
 *.log.1
 *.log.*
-*.ipynb
+*.ipynb
+.DS_Store
+*.tfvars

.gitignore

@@ -26,17 +26,21 @@ MS Fabric provides a 60 days trial for the service. After this period, a [Fabric
 
  The required variables required for the solution deployment are the following:
 ```
-mongodbatlas_public_key         = "<Valid_Public_API_Key>"
-mongodbatlas_private_key        = "<Valid_Private_API_Key>"
-mongodbatlas_group_id           = "<MongoDB_Atlas_Project_ID>"
-mongodbatlas_clustername        = "<MongoDB_Atlas_ClusterName>"
-mongodbatlas_dbName             = "<MongoDB+Atlas_Database_name>"
-mongodbatlas_userpass           = "<DBUser>:<Password>"
-owner_tag                       = "<MongoDB_Username.Lastname>"
-subscription_id                 = "<MongoDB_Azure_Subscrition_ID>"
-azure_region                    = "australiacentral"
+mongodbatlas_public_key         = "<mongodb_atlas_public_key>"
+mongodbatlas_private_key        = "<mongodb_atlas_private_key>"
+mongodbatlas_group_id           = "<mongodb_atlas_project_id>"
+mongodbatlas_clustername        = "<mongodb_atlas_cluster_name>"
+mongodbatlas_dbName             = "<mongodb_atlas_collection_name>"
+mongodbatlas_collectionName     = "all"
+mongodbatlas_userpass           = "<mongodb_atlas_database_username>:<mongodb_atlas_database_password>"
+owner_tag                       = "<user_identification>"
+subscription_id                 = "<azure_subscription_id>"
+azure_region                    = "<azure_region_name>"
 azure_vault_name                = ""
 fabric_capacity_sku             = "<MS-Fabric-Capacity-SKU>"
+initSyncBatchSize               = "100000"
+incrementalSyncBatchSize        = "1000"
+incrementalSyncMaxTimeInterval  = "180"
 ```
 
  - MongoDB Atlas authentication keys as requested in the pre-requisites section
@@ -49,8 +53,9 @@ fabric_capacity_sku             = "<MS-Fabric-Capacity-SKU>"
  - Subscription ID can be obtained by running the `az login` command
  - `azure_vault_name`is optional and uses a random value by default
  - The Fabric Capacity SKU String can be found in Fabric's [Admin portal](https://app.fabric.microsoft.com/admin-portal/capacities/capacitiesList/trial?experience=fabric-developer) page.
+  - The values for `initSyncBatchSize`, `incrementalSyncBatchSize` and `incrementalSyncMaxTimeInterval` can be teaked through these parameters.
 
-Variables can be stored on the `terraform.tfvars` file, or provided when `terraform plan` is executed.
+Variables can be stored on the `terraform.tfvars` file, or provided when `terraform plan` is executed. You can copy the file `terraform_tfvars.example` as `terraform.tfvars` and update the values.
 
 ### Deploying without Secure network communication ###
 
@@ -108,7 +113,7 @@ Run `terraform plan --out plan_name.tfplan`, then `terraform apply "plan_name.tf
 |Microsoft Azure|vault-\[randomid\]|Key vault|
 |Microsoft Azure|mongodb-atlas-fabric-service-plan|App Service plan|
 |Microsoft Azure|mongodbatlasfabricmirrordbsynch|App Service|
-|Microsoft Fabric|MongoDB Atlas Azure Fabric Mirrored Database Integration|Workspace|
+|Microsoft Fabric|MongoDB_Atlas_Azure_Fabric_Mirrored_Database_Integration|Workspace|
 |Microsoft Fabric|MongoDB Atlas - Fabric Mirrored Database|Mirrored Database|
 |Microsoft Fabric|MongoDB Atlas - Fabric Mirrored Database|Semantic model (default)|
 |Microsoft Fabric|MongoDB Atlas - Fabric Mirrored Database|SQL analytics endpoint|
@@ -122,11 +127,13 @@ Run `terraform plan --out plan_name.tfplan`, then `terraform apply "plan_name.tf
 |Microsoft Azure|mongodb-atlas-fabric-resourceGroup|Resource Group|
 |Microsoft Azure|mongodb-atlas-fabric-service-plan|App Service plan|
 |Microsoft Azure|mongodbatlasfabricmirrordbsynch|App Service|
-|Microsoft Fabric|MongoDB Atlas Azure Fabric Mirrored Database Integration|Workspace|
+|Microsoft Fabric|MongoDB_Atlas_Azure_Fabric_Mirrored_Database_Integration|Workspace|
 |Microsoft Fabric|MongoDB Atlas - Fabric Mirrored Database|Mirrored Database|
 |Microsoft Fabric|MongoDB Atlas - Fabric Mirrored Database|Semantic model (default)|
 |Microsoft Fabric|MongoDB Atlas - Fabric Mirrored Database|SQL analytics endpoint|
 
+ Most of the resources will have the `-[random-value]` suffix to avoid conflict in case the solution is deployed in more than one region on Azure.
+
 # Deleting the deployed resources #
 
  The deployed solution can be deleted using the Terraform CLI  ```terraform destroy``` command, which will remove all resources from Fabric, Azure and MongoDB Atlas. The database will not be affected by this action.

terraform/README.md

@@ -1,5 +1,12 @@
+resource "random_string" "random_suffix" {
+  length  = 5
+  lower   = true
+  numeric = true
+  special = false
+  upper   = false
+}
 resource "azurerm_resource_group" "mongodb-atlas-fabric-resourceGroup" {
-  name = "mongodb-atlas-fabric-resourceGroup"
+  name = "mongodb-atlas-fabric-resourceGroup-${random_string.random_suffix.result}"
   location = var.azure_region
   tags = {
     owner = var.owner_tag
@@ -10,7 +17,7 @@ resource "azurerm_resource_group" "mongodb-atlas-fabric-resourceGroup" {
 }
 
 resource "azurerm_virtual_network" "mongodb-atlas-fabric-vNet" {
-  name      = "mongodb-atlas-fabric-vNet"
+  name      = "mongodb-atlas-fabric-vNet-${random_string.random_suffix.result}"
   location  = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.location
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   address_space = ["10.0.0.0/16"]
@@ -67,7 +74,7 @@ resource "azurerm_subnet" "mongodb-atlas-fabric-webAppSubnet" {
 }
 
 resource "azurerm_app_service_environment_v3" "mongodb-atlas-fabric-appServiceEnv" {
-  name = "mongodb-atlas-fabric-asev3"
+  name = "mongodb-atlas-fabric-asev3-${random_string.random_suffix.result}"
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   subnet_id = azurerm_subnet.mongodb-atlas-fabric-subnet1[0].id
   tags = {
@@ -81,7 +88,7 @@ resource "azurerm_app_service_environment_v3" "mongodb-atlas-fabric-appServiceEn
 }
 //Service plan for App Service Environment and Private Endpoint deployment
 resource "azurerm_service_plan" "mongodb-atlas-fabric-service-plan" {
-  name = "mongodb-atlas-fabric-service-plan"
+  name = "mongodb-atlas-fabric-service-plan-${random_string.random_suffix.result}"
   location = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.location
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   os_type = "Linux"
@@ -99,7 +106,7 @@ resource "azurerm_service_plan" "mongodb-atlas-fabric-service-plan" {
 
 //Service plan for simple deployment without private endpoint
 resource "azurerm_service_plan" "mongodb-atlas-fabric-service-simple-plan" {
-  name = "mongodb-atlas-fabric-service-plan"
+  name = "mongodb-atlas-fabric-service-plan-${random_string.random_suffix.result}"
   location = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.location
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   os_type = "Linux"
@@ -114,17 +121,8 @@ resource "azurerm_service_plan" "mongodb-atlas-fabric-service-simple-plan" {
   count = try(var.deployPrivateEnvironment ? 0 : 1, 0)
 }
 
-resource "random_string" "azurerm_key_vault_name" {
-  length  = 13
-  lower   = true
-  numeric = false
-  special = false
-  upper   = false
-}
-
 resource "azurerm_key_vault" "mongodb-atlas-fabric-mirrordb-vault" {
-  # name = "mongodbatlasfabricvault3"
-  name = coalesce(var.azure_vault_name, "vault-${random_string.azurerm_key_vault_name.result}")
+  name = coalesce(var.azure_vault_name, "vault-${random_string.random_suffix.result}")
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   sku_name = var.azure_vault_sku_name
   tenant_id = data.azuread_client_config.current.tenant_id
@@ -163,21 +161,21 @@ resource "azurerm_key_vault" "mongodb-atlas-fabric-mirrordb-vault" {
 }
 
 resource "azuread_application_registration" "mongodb-atlas-fabric-mirrordb-integration" {
-    display_name = "mongodb-atlas-fabric-mirrordb-integration"
+    display_name = "mongodb-atlas-fabric-mirrordb-integration-${random_string.random_suffix.result}"
 }
 
 resource "azuread_application_password" "mongodb-atlas-fabric-mirrordb-integration-secret" {
   application_id = azuread_application_registration.mongodb-atlas-fabric-mirrordb-integration.id
 }
 
 resource "azurerm_key_vault_secret" "mongodb-atlas-fabric-mirrordb-integration-secretValue" {
-  name         = "mongodb-atlas-fabric-app-secret-v2"
+  name         = "mongodb-atlas-fabric-app-secret-v2-${random_string.random_suffix.result}"
   value        = azuread_application_password.mongodb-atlas-fabric-mirrordb-integration-secret.value
   key_vault_id = azurerm_key_vault.mongodb-atlas-fabric-mirrordb-vault.id
 }
 
 resource "azurerm_private_endpoint" "mongodb-atlas-fabric-mirrordb-integration-privateEndpoint" {
-  name                = "${var.project_name}-private-endpoint"
+  name                = "${var.project_name}-private-endpoint-${random_string.random_suffix.result}"
   location            = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.location
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   subnet_id           = azurerm_subnet.mongodb-atlas-fabric-PrivateLinkSubnet[0].id
@@ -200,11 +198,10 @@ resource "azurerm_private_endpoint" "mongodb-atlas-fabric-mirrordb-integration-p
 
 # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/linux_web_app
 resource "azurerm_linux_web_app" "mongodb-atlas-fabric-mirrordb-integration-webapp" {
-  name                = "mongodbatlasfabricmirrordbsynch"
+  name                = "mongodbatlasfabricmirrordbsynch-${random_string.random_suffix.result}"
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   location            = azurerm_service_plan.mongodb-atlas-fabric-service-plan[0].location
   service_plan_id     = azurerm_service_plan.mongodb-atlas-fabric-service-plan[0].id
-  # virtual_network_subnet_id = azurerm_subnet.mongodb-atlas-fabric-webAppSubnet.id
   site_config {
     application_stack {
       python_version = "3.12"
@@ -215,7 +212,7 @@ resource "azurerm_linux_web_app" "mongodb-atlas-fabric-mirrordb-integration-weba
   }
   app_settings = {
     "APP_LOG_LEVEL"           = var.applicationLogLevel
-    "MONGO_CONN_STR"          = replace(data.mongodbatlas_advanced_cluster.mongodb-atlas-fabric-integration-connectData.connection_strings[0].private_endpoint[0].srv_connection_string,"mongodb+srv://","mongodb+srv://${var.mongodbatlas_userpass}@")
+    "MONGO_CONN_STR"          = replace(data.mongodbatlas_advanced_cluster.mongodb-atlas-fabric-integration-connectData[0].connection_strings[0].private_endpoint[0].srv_connection_string,"mongodb+srv://","mongodb+srv://${var.mongodbatlas_userpass}@")
     "MONGO_DB_NAME"           = var.mongodbatlas_dbName
     "MONGO_COLLECTION"        = var.mongodbatlas_collectionName
     "LZ_URL"                  = replace(fabric_mirrored_database.mongodb-atlas-mirrored-database.properties.onelake_tables_path,"/Tables","/Files/LandingZone/")
@@ -239,7 +236,7 @@ resource "azurerm_linux_web_app" "mongodb-atlas-fabric-mirrordb-integration-weba
 
 resource "azurerm_linux_web_app" "mongodb-atlas-fabric-mirrordb-integration-simple-webapp" {
   count               = try(var.deployPrivateEnvironment ? 0 : 1, 0)
-  name                = "mongodbatlasfabricmirrordbsynch"
+  name                = "mongodbatlasfabricmirrordbsynch-${random_string.random_suffix.result}"
   resource_group_name = azurerm_resource_group.mongodb-atlas-fabric-resourceGroup.name
   location            = azurerm_service_plan.mongodb-atlas-fabric-service-simple-plan[0].location
   service_plan_id     = azurerm_service_plan.mongodb-atlas-fabric-service-simple-plan[0].id
@@ -254,7 +251,7 @@ resource "azurerm_linux_web_app" "mongodb-atlas-fabric-mirrordb-integration-simp
   }
   app_settings = {
     "APP_LOG_LEVEL"           = var.applicationLogLevel
-    "MONGO_CONN_STR"          = replace(data.mongodbatlas_advanced_cluster.mongodb-atlas-fabric-integration-connectData.connection_strings[0].standard_srv,"mongodb+srv://","mongodb+srv://${var.mongodbatlas_userpass}@")
+    "MONGO_CONN_STR"          = replace(data.mongodbatlas_advanced_cluster.mongodb-atlas-fabric-integration-connectData-noEndpoint.connection_strings[0].standard_srv,"mongodb+srv://","mongodb+srv://${var.mongodbatlas_userpass}@")
     "MONGO_DB_NAME"           = var.mongodbatlas_dbName
     "MONGO_COLLECTION"        = var.mongodbatlas_collectionName
     "LZ_URL"                  = replace(fabric_mirrored_database.mongodb-atlas-mirrored-database.properties.onelake_tables_path,"/Tables","/Files/LandingZone/")

terraform/azureResources.tf

@@ -6,7 +6,8 @@ data "fabric_capacity" "mongodb-fabric-capacity" {
 data "mongodbatlas_advanced_cluster" "mongodb-atlas-fabric-integration-connectData" {
   project_id = var.mongodbatlas_group_id
   name = var.mongodbatlas_clustername
-  depends_on = [ azurerm_private_endpoint.mongodb-atlas-fabric-mirrordb-integration-privateEndpoint ]
+  depends_on = [ azurerm_app_service_environment_v3.mongodb-atlas-fabric-appServiceEnv[0] ]
+  count = try(var.deployPrivateEnvironment ? 1 : 0, 0)
 }
 
 data "mongodbatlas_advanced_cluster" "mongodb-atlas-fabric-integration-connectData-noEndpoint" {

terraform/data.tf

@@ -1,5 +1,5 @@
 resource "fabric_workspace" "mongodb-atlas-mirrored-db-workspace" {
-    display_name = "MongoDB Atlas Azure Fabric Mirrored Database Integration"
+    display_name = "MongoDB_Atlas_Azure_Fabric_Mirrored_Database_Integration-${random_string.random_suffix.result}"
     identity = {
       type = "SystemAssigned"
     }

terraform/fabricResources.tf

@@ -1,13 +1,17 @@
-mongodbatlas_public_key         = "<mongodb_atlas_public>key>"
+mongodbatlas_public_key         = "<mongodb_atlas_public_key>"
 mongodbatlas_private_key        = "<mongodb_atlas_private_key>"
 mongodbatlas_group_id           = "<mongodb_atlas_project_id>"
 mongodbatlas_clustername        = "<mongodb_atlas_cluster_name>"
 mongodbatlas_dbName             = "<mongodb_atlas_collection_name>"
+mongodbatlas_collectionName     = "all"
 mongodbatlas_userpass           = "<mongodb_atlas_database_username>:<mongodb_atlas_database_password>"
 owner_tag                       = "<user_identification>"
 subscription_id                 = "<azure_subscription_id>"
 azure_region                    = "<azure_region_name>"
 azure_vault_name                = ""
-fabric_capacity_sku             = "<fabric_sku_id>"
+fabric_capacity_sku             = "<MS-Fabric-Capacity-SKU>"
+initSyncBatchSize               = "100000"
+incrementalSyncBatchSize        = "1000"
+incrementalSyncMaxTimeInterval  = "180"
 # deployPrivateEnvironment        = false
 # azure_sku_name                  = "F1"

terraform/terraform_tfvars.example

@@ -17,7 +17,7 @@ variable "mongodbatlas_dbName" {
 
 }
 variable "mongodbatlas_collectionName" {
-    default = "all"
+    
 }
 variable "mongodbatlas_userpass"{
     //MongoDB database username:password
@@ -26,7 +26,6 @@ variable "mongodbatlas_userpass"{
 variable "owner_tag" {
 
 }
-
 variable "subscription_id" { 
 
 }
@@ -58,17 +57,14 @@ variable "applicationLogLevel" {
 variable "initSyncBatchSize" {
     //Batch size (rows) used for initial sync
     type = string
-    default ="100000"
 }
 variable "incrementalSyncBatchSize" {
     //Batch size (rows) used for incremental sync
     type = string
-    default = "1000"
 }
 variable "incrementalSyncMaxTimeInterval" {
     //Time interval (in secs), incremental sync waits before replicating accumulated changes when next event occurs
     type = string
-    default = "180"
 }
 
 variable "deployPrivateEnvironment" {