Merge pull request #8 from data-platform-hq/feat/custom_name

feat: added custom names for resources

Author: owlleg6

README.md

@@ -9,13 +9,13 @@ Terraform module for creation Azure Microsoft SQL Database Server
 | Name                                                                      | Version   |
 | ------------------------------------------------------------------------- | --------- |
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0  |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm)       | >= 3.23.0 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm)       | >= 3.40.0 |
 
 ## Providers
 
 | Name                                                          | Version |
 | ------------------------------------------------------------- | ------- |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.24.0  |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.40.0  |
 
 ## Modules
 
@@ -45,6 +45,8 @@ No modules.
 | <a name="input_admin_password"></a> [admin\_password](#input\_admin\_password)                                                  | The password associated with the admin_username                                                                               | `string`       | n/a                                                                                                            |   yes    |
 | <a name="input_azure_ad_admin_login"></a> [azure\_ad\_admin\_login](#input\_azure\_ad\_admin\_login)                            | The login username of the Azure AD Administrator of this SQL Server                                                           | `string`       | n/a                                                                                                            |   yes    |
 | <a name="input_azure_ad_admin_object_id"></a> [azure\_ad\_admin\_object\_id](#input\_azure\_ad\_admin\_object\_id)              | The object id of the Azure AD Administrator of this SQL Server                                                                | `string`       | n/a                                                                                                            |   yes    |
+| <a name="input_custom_mssql_server_name"></a> [custom_mssql\_server\_name](#input\_custom\_mssql\_server\_name)                 | The name of the Microsoft SQL Server                                                                                          | `string`       | `null`                                                                                                         |    no    |
+| <a name="input_custom_tde_key_name"></a> [custom\_tde\_key\_name](#input\_custom\_tde\_key\_name)                               | Specifies the name of the Key Vault Key                                                                                       | `string`       | `null`                                                                                                         |    no    |
 | <a name="input_server_version"></a> [server_version](#input\_server\_version)                                                   | Server version                                                                                                                | `string`       | 12.0                                                                                                           |    no    |
 | <a name="input_connection_policy"></a> [connection\_policy](#input\_connection\_policy)                                         | The connection policy the server will use: [Default \| Proxy \| Redirect]                                                     | `string`       | Default                                                                                                        |    no    |
 | <a name="input_minimum_tls_version"></a> [minimum\_tls\_version](#input\_minimum\_tls\_version)                                 | The Minimum TLS Version for all SQL Database and SQL Data Warehouse databases associated with the server: [1.0 \| 1.1 \| 1.2] | `string`       | 1.2                                                                                                            |    no    |

main.tf

@@ -1,9 +1,11 @@
 locals {
-  ip_rules = { for e in [for k, ip in var.ip_rules : try(regex("/", ip), 0) != 0 ? { (k) = { start_ip_address = cidrhost(ip, 0), end_ip_address = cidrhost(ip, -1) } } : { (k) = { start_ip_address = ip, end_ip_address = ip } }] : keys(e)[0] => e[keys(e)[0]] }
+  ip_rules     = { for e in [for k, ip in var.ip_rules : try(regex("/", ip), 0) != 0 ? { (k) = { start_ip_address = cidrhost(ip, 0), end_ip_address = cidrhost(ip, -1) } } : { (k) = { start_ip_address = ip, end_ip_address = ip } }] : keys(e)[0] => e[keys(e)[0]] }
+  server_name  = var.custom_mssql_server_name == null ? "mssql-${var.project}-${var.env}-${var.location}" : var.custom_mssql_server_name
+  tde_key_name = var.custom_tde_key_name == null ? "tde-${var.project}-${var.env}-${var.location}" : var.custom_tde_key_name
 }
 
 resource "azurerm_mssql_server" "this" {
-  name                          = "mssql-${var.project}-${var.env}-${var.location}"
+  name                          = local.server_name
   resource_group_name           = var.resource_group
   location                      = var.location
   version                       = var.server_version
@@ -48,11 +50,15 @@ resource "azurerm_key_vault_access_policy" "tde_policy" {
 resource "azurerm_key_vault_key" "this" {
   for_each = { for k, v in var.key_vault_id : k => v }
 
-  name         = "tde-${var.project}-${var.env}-${var.location}"
+  name         = local.tde_key_name
   key_type     = var.key_type
   key_size     = var.key_size
   key_vault_id = each.value
   key_opts     = var.key_opts
+
+  depends_on = [
+    azurerm_key_vault_access_policy.tde_policy
+  ]
 }
 
 resource "azurerm_mssql_server_transparent_data_encryption" "this" {

variables.tf

@@ -38,6 +38,18 @@ variable "azure_ad_admin_object_id" {
   description = "The object id of the Azure AD Administrator of this SQL Server"
 }
 
+variable "custom_mssql_server_name" {
+  type        = string
+  description = "The name of the Microsoft SQL Server"
+  default     = null
+}
+
+variable "custom_tde_key_name" {
+  type        = string
+  description = "Specifies the name of the Key Vault Key"
+  default     = null
+}
+
 variable "server_version" {
   type        = string
   description = "Server version"

versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.23.0"
+      version = ">= 3.40.0"
     }
   }
 }