Merge pull request #6 from data-platform-hq/fix/change-to-demos_sql_azure_ad_object_id-variable

owlleg6 · web-flow · commit 52ee9d66040f · 2024-09-12T13:40:39.000+03:00
diff --git a/README.md b/README.md
@@ -28,13 +28,9 @@ This module is provisioning Azure WWI Demo
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_debezium"></a> [debezium](#module\_debezium) | data-platform-hq/debezium/azurerm | 1.1.0 |
-| <a name="module_eventhub"></a> [eventhub](#module\_eventhub) | data-platform-hq/eventhub/azurerm | 1.2.0 |
-| <a name="module_logic_app_workflow_api"></a> [logic\_app\_workflow\_api](#module\_logic\_app\_workflow\_api) | data-platform-hq/logic-app-workflow/azurerm | 1.3.0 |
 | <a name="module_mssql_database"></a> [mssql\_database](#module\_mssql\_database) | data-platform-hq/mssql-database/azurerm | 1.2.0 |
-| <a name="module_mssql_server"></a> [mssql\_server](#module\_mssql\_server) | data-platform-hq/mssql-server/azurerm | 1.5.0 |
+| <a name="module_mssql_server"></a> [mssql\_server](#module\_mssql\_server) | data-platform-hq/mssql-server/azurerm | 1.5.1 |
 | <a name="module_mssql_tde_key"></a> [mssql\_tde\_key](#module\_mssql\_tde\_key) | data-platform-hq/key-vault-key/azurerm | 1.1.0 |
-| <a name="module_resource_group_debezium"></a> [resource\_group\_debezium](#module\_resource\_group\_debezium) | data-platform-hq/resource-group/azurerm | 1.4.0 |
 | <a name="module_resource_group_wwi_demo"></a> [resource\_group\_wwi\_demo](#module\_resource\_group\_wwi\_demo) | data-platform-hq/resource-group/azurerm | 1.4.0 |
 | <a name="module_wwi_demo_secrets"></a> [wwi\_demo\_secrets](#module\_wwi\_demo\_secrets) | data-platform-hq/key-vault-secret/azurerm | 1.2.0 |
 | <a name="module_wwi_demo_virtual_machine"></a> [wwi\_demo\_virtual\_machine](#module\_wwi\_demo\_virtual\_machine) | data-platform-hq/linux-vm/azurerm | 1.1.0 |
@@ -55,18 +51,9 @@ This module is provisioning Azure WWI Demo
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_admin_password"></a> [admin\_password](#input\_admin\_password) | Azure Admin Password to use | `string` | `null` | no |
-| <a name="input_container_config"></a> [container\_config](#input\_container\_config) | Version and capacity config for container | <pre>map(object({<br>    image  = string<br>    cpu    = string<br>    memory = string<br>  }))</pre> | <pre>{<br>  "debezium": {<br>    "cpu": "4",<br>    "image": "debezium/connect:1.9",<br>    "memory": "2"<br>  }<br>}</pre> | no |
-| <a name="input_custom_eventhub_components_names"></a> [custom\_eventhub\_components\_names](#input\_custom\_eventhub\_components\_names) | Specifies the custom name of the resources in Eventhub module | <pre>object({<br>    namespace      = optional(string)<br>    namespace_rule = optional(string)<br>    topic          = optional(string)<br>    topic_rule     = optional(string)<br>  })</pre> | `{}` | no |
-| <a name="input_custom_resource_group_name"></a> [custom\_resource\_group\_name](#input\_custom\_resource\_group\_name) | Custom name for Resource Group | `string` | `null` | no |
-| <a name="input_debezium_enabled"></a> [debezium\_enabled](#input\_debezium\_enabled) | Boolean flag to specify whether Container Instance with Debezium is provisioned | `bool` | `false` | no |
-| <a name="input_debezium_encryption_key"></a> [debezium\_encryption\_key](#input\_debezium\_encryption\_key) | Boolean flag to specify whether Container Instance with Debezium is CMK encrypted | `bool` | `false` | no |
-| <a name="input_debezium_mssql_db_name"></a> [debezium\_mssql\_db\_name](#input\_debezium\_mssql\_db\_name) | Name of target Database which would be used by Debezium | `string` | `""` | no |
-| <a name="input_debezium_mssql_tables"></a> [debezium\_mssql\_tables](#input\_debezium\_mssql\_tables) | Tables with CDC enabled in target Database | `list(string)` | `[]` | no |
+| <a name="input_demos_sql_azure_ad_object_id"></a> [demos\_sql\_azure\_ad\_object\_id](#input\_demos\_sql\_azure\_ad\_object\_id) | The login username of the Azure AD Administrator of this SQL Server. | `string` | `null` | no |
 | <a name="input_env"></a> [env](#input\_env) | Environment name | `string` | n/a | yes |
-| <a name="input_eventhub_enabled"></a> [eventhub\_enabled](#input\_eventhub\_enabled) | Boolean flag to specify whether Azure Event Hub is provisioned | `bool` | `false` | no |
-| <a name="input_eventhub_topics"></a> [eventhub\_topics](#input\_eventhub\_topics) | Map of eventhub topics | <pre>map(object({<br>    partition_count   = string<br>    message_retention = string<br>    permissions       = list(string)<br>  }))</pre> | `{}` | no |
 | <a name="input_key_vault_id"></a> [key\_vault\_id](#input\_key\_vault\_id) | Azure Key Vault ID to use | `string` | n/a | yes |
-| <a name="input_key_vault_name"></a> [key\_vault\_name](#input\_key\_vault\_name) | Azure Key Vault Name to use | `string` | n/a | yes |
 | <a name="input_location"></a> [location](#input\_location) | Azure location | `string` | n/a | yes |
 | <a name="input_microsoft_wwi_demo_enabled"></a> [microsoft\_wwi\_demo\_enabled](#input\_microsoft\_wwi\_demo\_enabled) | Boolean flag that determines whether Microsoft WWI Demo in provisioned within Environment | `bool` | `false` | no |
 | <a name="input_mssql_database"></a> [mssql\_database](#input\_mssql\_database) | Map of databases to be deployed in Azure SQL | `map(any)` | `{}` | no |
@@ -79,17 +66,14 @@ This module is provisioning Azure WWI Demo
 | <a name="input_resource_group"></a> [resource\_group](#input\_resource\_group) | The name of the resource group in which to create MSSQL Server | `string` | n/a | yes |
 | <a name="input_secrets_expiration_date"></a> [secrets\_expiration\_date](#input\_secrets\_expiration\_date) | Expiration UTC datetime (Y-m-d'T'H:M:S'Z') | `string` | `"2024-12-21T00:00:00Z"` | no |
 | <a name="input_sql_azure_ad_admin_login"></a> [sql\_azure\_ad\_admin\_login](#input\_sql\_azure\_ad\_admin\_login) | The login username of the Azure AD Administrator of this SQL Server. | `string` | `null` | no |
-| <a name="input_sql_azure_ad_admin_object_id"></a> [sql\_azure\_ad\_admin\_object\_id](#input\_sql\_azure\_ad\_admin\_object\_id) | The login username of the Azure AD Administrator of this SQL Server. | `string` | `null` | no |
 | <a name="input_sql_server_admin_login"></a> [sql\_server\_admin\_login](#input\_sql\_server\_admin\_login) | The administrator login name for Azure SQL server | `string` | `"dpaf"` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | Resource tags | `map(any)` | `{}` | no |
-| <a name="input_tenant_id"></a> [tenant\_id](#input\_tenant\_id) | Azure Tenant ID to use | `string` | n/a | yes |
 | <a name="input_wwi_demo_subnet_id"></a> [wwi\_demo\_subnet\_id](#input\_wwi\_demo\_subnet\_id) | Microsoft WWI subnet | `string` | `null` | no |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| <a name="output_eventhub"></a> [eventhub](#output\_eventhub) | Eventhub related outputs |
 | <a name="output_mssql_database"></a> [mssql\_database](#output\_mssql\_database) | MSSQL Database elated outputs |
 | <a name="output_mssql_server"></a> [mssql\_server](#output\_mssql\_server) | MSSQL Server related outputs |
 | <a name="output_random_password"></a> [random\_password](#output\_random\_password) | Password for Admin Login on WWI SQL Server |
diff --git a/debezium.tf b/debezium.tf
diff --git a/mssql.tf b/mssql.tf
@@ -1,7 +1,7 @@
 module "mssql_server" {
   count   = var.mssql_enabled ? 1 : 0
   source  = "data-platform-hq/mssql-server/azurerm"
-  version = "1.5.0"
+  version = "1.5.1"
 
   project                  = var.project
   env                      = var.env
@@ -10,15 +10,15 @@ module "mssql_server" {
   tags                     = var.tags
   resource_group           = var.resource_group
 
-  admin_login              = var.sql_server_admin_login
-  admin_password           = coalesce(var.admin_password, random_password.sql_server_admin_password[0].result)
-  azure_ad_admin_login     = var.sql_azure_ad_admin_login
-  azure_ad_admin_object_id = var.sql_azure_ad_admin_object_id
-  ip_rules                 = var.mssql_server_ip_rules
-  tde_encryption_enabled   = var.mssql_tde_key_enabled
-  key_vault_id             = var.key_vault_id
-  key_vault_key_id         = try(module.mssql_tde_key[0].key_id, "")
-  mssql_defender_state     = var.mssql_defender_state
+  admin_login            = var.sql_server_admin_login
+  admin_password         = coalesce(var.admin_password, random_password.sql_server_admin_password[0].result)
+  azure_ad_admin_login   = var.sql_azure_ad_admin_login
+  azure_ad_object_id     = var.demos_sql_azure_ad_object_id
+  ip_rules               = var.mssql_server_ip_rules
+  tde_encryption_enabled = var.mssql_tde_key_enabled
+  key_vault_id           = var.key_vault_id
+  key_vault_key_id       = try(module.mssql_tde_key[0].key_id, "")
+  mssql_defender_state   = var.mssql_defender_state
 }
 
 module "mssql_database" {
diff --git a/outputs.tf b/outputs.tf
@@ -1,8 +1,3 @@
-output "eventhub" {
-  value       = try(module.eventhub[0][*], null)
-  description = "Eventhub related outputs"
-}
-
 output "mssql_server" {
   value       = try(module.mssql_server[0][*], null)
   description = "MSSQL Server related outputs"
diff --git a/variables.tf b/variables.tf
@@ -24,104 +24,18 @@ variable "tags" {
   default     = {}
 }
 
-# Eventhubs
-variable "custom_eventhub_components_names" {
-  type = object({
-    namespace      = optional(string)
-    namespace_rule = optional(string)
-    topic          = optional(string)
-    topic_rule     = optional(string)
-  })
-  description = "Specifies the custom name of the resources in Eventhub module"
-  default     = {}
-}
-
-variable "custom_resource_group_name" {
-  type        = string
-  description = "Custom name for Resource Group"
-  default     = null
-}
-
 # Key Vault Config
 variable "key_vault_id" {
   type        = string
   description = "Azure Key Vault ID to use"
 }
 
-variable "key_vault_name" {
-  type        = string
-  description = "Azure Key Vault Name to use"
-}
-
-variable "tenant_id" {
-  type        = string
-  description = "Azure Tenant ID to use"
-}
-
 variable "secrets_expiration_date" {
   type        = string
   description = "Expiration UTC datetime (Y-m-d'T'H:M:S'Z')"
   default     = "2024-12-21T00:00:00Z"
 }
 
-# Event Hub
-variable "eventhub_enabled" {
-  type        = bool
-  description = "Boolean flag to specify whether Azure Event Hub is provisioned"
-  default     = false
-}
-
-variable "eventhub_topics" {
-  type = map(object({
-    partition_count   = string
-    message_retention = string
-    permissions       = list(string)
-  }))
-  description = "Map of eventhub topics"
-  default     = {}
-}
-
-# Debezium
-variable "debezium_enabled" {
-  type        = bool
-  description = "Boolean flag to specify whether Container Instance with Debezium is provisioned"
-  default     = false
-}
-
-variable "debezium_encryption_key" {
-  type        = bool
-  description = "Boolean flag to specify whether Container Instance with Debezium is CMK encrypted "
-  default     = false
-}
-
-variable "debezium_mssql_db_name" {
-  type        = string
-  description = "Name of target Database which would be used by Debezium"
-  default     = ""
-}
-
-variable "debezium_mssql_tables" {
-  type        = list(string)
-  description = "Tables with CDC enabled in target Database"
-  default     = []
-}
-
-variable "container_config" {
-  type = map(object({
-    image  = string
-    cpu    = string
-    memory = string
-  }))
-  description = "Version and capacity config for container"
-  default = {
-    "debezium" = {
-      image  = "debezium/connect:1.9",
-      cpu    = "4",
-      memory = "2"
-    }
-  }
-}
-
 # MSSQL
 variable "mssql_server_name" {
   type        = string
@@ -152,7 +66,7 @@ variable "sql_azure_ad_admin_login" {
   default     = null
 }
 
-variable "sql_azure_ad_admin_object_id" {
+variable "demos_sql_azure_ad_object_id" {
   type        = string
   description = "The login username of the Azure AD Administrator of this SQL Server."
   default     = null
