Feature/add resource names v2 (#7)

* add support for resource names v2

* fix go tests

Author: kevin11-allen-nttd

README.md

@@ -120,13 +120,16 @@ No providers.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_resource_names"></a> [resource\_names](#module\_resource\_names) | terraform.registry.launch.nttdata.com/module_library/resource_name/launch | ~> 1.0 |
+| <a name="module_resource_names_v2"></a> [resource\_names\_v2](#module\_resource\_names\_v2) | terraform.registry.launch.nttdata.com/module_library/resource_name/launch | ~> 2.0 |
 | <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform.registry.launch.nttdata.com/module_primitive/resource_group/azurerm | ~> 1.0 |
 | <a name="module_network"></a> [network](#module\_network) | terraform.registry.launch.nttdata.com/module_primitive/virtual_network/azurerm | ~> 3.0 |
 | <a name="module_subnets"></a> [subnets](#module\_subnets) | terraform.registry.launch.nttdata.com/module_primitive/virtual_network_subnet/azurerm | ~> 1.0 |
 | <a name="module_private_dns_zones"></a> [private\_dns\_zones](#module\_private\_dns\_zones) | terraform.registry.launch.nttdata.com/module_primitive/private_dns_zone/azurerm | ~> 1.0 |
 | <a name="module_private_dns_zone_vnet_links"></a> [private\_dns\_zone\_vnet\_links](#module\_private\_dns\_zone\_vnet\_links) | terraform.registry.launch.nttdata.com/module_primitive/private_dns_vnet_link/azurerm | ~> 1.0 |
 | <a name="module_private_endpoint_resource_names"></a> [private\_endpoint\_resource\_names](#module\_private\_endpoint\_resource\_names) | terraform.registry.launch.nttdata.com/module_library/resource_name/launch | ~> 1.0 |
+| <a name="module_private_endpoint_resource_names_v2"></a> [private\_endpoint\_resource\_names\_v2](#module\_private\_endpoint\_resource\_names\_v2) | terraform.registry.launch.nttdata.com/module_library/resource_name/launch | ~> 2.0 |
 | <a name="module_private_service_connection_resource_names"></a> [private\_service\_connection\_resource\_names](#module\_private\_service\_connection\_resource\_names) | terraform.registry.launch.nttdata.com/module_library/resource_name/launch | ~> 1.0 |
+| <a name="module_private_service_connection_resource_names_v2"></a> [private\_service\_connection\_resource\_names\_v2](#module\_private\_service\_connection\_resource\_names\_v2) | terraform.registry.launch.nttdata.com/module_library/resource_name/launch | ~> 2.0 |
 | <a name="module_private_endpoints"></a> [private\_endpoints](#module\_private\_endpoints) | terraform.registry.launch.nttdata.com/module_primitive/private_endpoint/azurerm | ~> 1.0 |
 | <a name="module_route_tables"></a> [route\_tables](#module\_route\_tables) | terraform.registry.launch.nttdata.com/module_primitive/route_table/azurerm | ~> 1.0 |
 | <a name="module_routes"></a> [routes](#module\_routes) | terraform.registry.launch.nttdata.com/module_primitive/route/azurerm | ~> 1.0 |
@@ -159,6 +162,7 @@ No resources.
 | <a name="input_routes"></a> [routes](#input\_routes) | A mapping of routes to create. | <pre>map(object({<br>    name                   = string<br>    route_table_alias      = string<br>    address_prefix         = string<br>    next_hop_type          = string<br>    next_hop_in_ip_address = optional(string, null)<br>  }))</pre> | `{}` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | Tags to be applied to all resources that are created by this module. | `map(string)` | `{}` | no |
 | <a name="input_resource_names_map"></a> [resource\_names\_map](#input\_resource\_names\_map) | A map of key to resource\_name that will be used by tf-launch-module\_library-resource\_name to generate resource names | <pre>map(object({<br>    name       = string<br>    max_length = optional(number, 60)<br>  }))</pre> | <pre>{<br>  "monitor_private_link_scope": {<br>    "max_length": 80,<br>    "name": "ampls"<br>  },<br>  "monitor_private_link_scope_private_endpoint": {<br>    "max_length": 80,<br>    "name": "amplspe"<br>  },<br>  "resource_group": {<br>    "max_length": 80,<br>    "name": "rg"<br>  },<br>  "virtual_network": {<br>    "max_length": 80,<br>    "name": "vnet"<br>  }<br>}</pre> | no |
+| <a name="input_resource_names_version"></a> [resource\_names\_version](#input\_resource\_names\_version) | Major version of the resource names module to use | `string` | `"1"` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | Environment in which the resource should be provisioned like dev, qa, prod etc. | `string` | `"sandbox"` | no |
 | <a name="input_class_env"></a> [class\_env](#input\_class\_env) | Environment where resource is going to be deployed. For example. dev, qa, uat | `string` | `null` | no |
 | <a name="input_environment_number"></a> [environment\_number](#input\_environment\_number) | The environment count for the respective environment. Defaults to 000. Increments in value of 1 | `string` | `"000"` | no |

locals.tf

@@ -4,8 +4,10 @@ locals {
   }
   tags = merge(local.default_tags, var.tags)
 
-  resource_group_name  = module.resource_names["resource_group"].standard
-  virtual_network_name = module.resource_names["virtual_network"].standard
+  use_v2_resource_names = (var.resource_names_version == "2")
+
+  resource_group_name  = local.use_v2_resource_names ? module.resource_names_v2["resource_group"].standard : module.resource_names["resource_group"].standard
+  virtual_network_name = local.use_v2_resource_names ? module.resource_names_v2["virtual_network"].standard : module.resource_names["virtual_network"].standard
 
   transformed_subnets = {
     for subnet_alias, subnet_definition in var.subnets :

main.tf

@@ -27,6 +27,23 @@ module "resource_names" {
   use_azure_region_abbr   = true
 }
 
+module "resource_names_v2" {
+  source  = "terraform.registry.launch.nttdata.com/module_library/resource_name/launch"
+  version = "~> 2.0"
+
+  for_each = local.use_v2_resource_names ? var.resource_names_map : {}
+
+  region                  = join("", split("-", var.location))
+  class_env               = coalesce(var.class_env, var.environment)
+  cloud_resource_type     = each.value.name
+  instance_env            = coalesce(var.instance_env, var.environment_number)
+  instance_resource       = coalesce(var.instance_resource, var.resource_number)
+  maximum_length          = each.value.max_length
+  logical_product_family  = var.logical_product_family
+  logical_product_service = var.logical_product_service
+  use_azure_region_abbr   = true
+}
+
 module "resource_group" {
   source  = "terraform.registry.launch.nttdata.com/module_primitive/resource_group/azurerm"
   version = "~> 1.0"
@@ -124,6 +141,23 @@ module "private_endpoint_resource_names" {
   use_azure_region_abbr   = true
 }
 
+module "private_endpoint_resource_names_v2" {
+  source  = "terraform.registry.launch.nttdata.com/module_library/resource_name/launch"
+  version = "~> 2.0"
+
+  for_each = local.use_v2_resource_names ? var.private_endpoints : {}
+
+  region                  = join("", split("-", var.location))
+  class_env               = var.environment
+  cloud_resource_type     = var.private_endpoint_resource_names_map["private_endpoint"].name
+  instance_env            = var.environment_number
+  instance_resource       = var.resource_number
+  maximum_length          = var.private_endpoint_resource_names_map["private_endpoint"].max_length
+  logical_product_family  = var.logical_product_family
+  logical_product_service = each.key
+  use_azure_region_abbr   = true
+}
+
 module "private_service_connection_resource_names" {
   source  = "terraform.registry.launch.nttdata.com/module_library/resource_name/launch"
   version = "~> 1.0"
@@ -141,17 +175,34 @@ module "private_service_connection_resource_names" {
   use_azure_region_abbr   = true
 }
 
+module "private_service_connection_resource_names_v2" {
+  source  = "terraform.registry.launch.nttdata.com/module_library/resource_name/launch"
+  version = "~> 2.0"
+
+  for_each = local.use_v2_resource_names ? var.private_endpoints : {}
+
+  region                  = join("", split("-", var.location))
+  class_env               = var.environment
+  cloud_resource_type     = var.private_endpoint_resource_names_map["private_service_connection"].name
+  instance_env            = var.environment_number
+  instance_resource       = var.resource_number
+  maximum_length          = var.private_endpoint_resource_names_map["private_service_connection"].max_length
+  logical_product_family  = var.logical_product_family
+  logical_product_service = each.key
+  use_azure_region_abbr   = true
+}
+
 module "private_endpoints" {
   source  = "terraform.registry.launch.nttdata.com/module_primitive/private_endpoint/azurerm"
   version = "~> 1.0"
 
   for_each = var.private_endpoints
 
   region                          = var.location
-  endpoint_name                   = module.private_endpoint_resource_names[each.key].standard
+  endpoint_name                   = local.use_v2_resource_names ? module.private_endpoint_resource_names_v2[each.key].standard : module.private_endpoint_resource_names[each.key].standard
   is_manual_connection            = false
   resource_group_name             = module.resource_group.name
-  private_service_connection_name = module.private_service_connection_resource_names[each.key].standard
+  private_service_connection_name = local.use_v2_resource_names ? module.private_service_connection_resource_names_v2[each.key].standard : module.private_service_connection_resource_names[each.key].standard
   private_connection_resource_id  = each.value.target_resource_id
   subresource_names               = each.value.private_link_subresource_names
   subnet_id                       = module.subnets[each.value.subnet_name].id

tests/post_deploy_functional/main_test.go

@@ -38,6 +38,9 @@ func TestVnetModule(t *testing.T) {
 			"with_private_endpoint": {
 				"IS_TERRAFORM_IDEMPOTENT_APPLY": false,
 			},
+			"with_private_link_scope": {
+				"IS_TERRAFORM_IDEMPOTENT_APPLY": false,
+			},
 		}).
 		Build()
 

tests/post_deploy_functional_readonly/main_test.go

@@ -38,6 +38,9 @@ func TestVnetModule(t *testing.T) {
 			"with_private_endpoint": {
 				"IS_TERRAFORM_IDEMPOTENT_APPLY": false,
 			},
+			"with_private_link_scope": {
+				"IS_TERRAFORM_IDEMPOTENT_APPLY": false,
+			},
 		}).
 		Build()
 

variables.tf

@@ -204,6 +204,12 @@ variable "resource_names_map" {
   }
 }
 
+variable "resource_names_version" {
+  description = "Major version of the resource names module to use"
+  type        = string
+  default     = "1"
+}
+
 // TODO: remove this in favor of `class_env` next major release
 variable "environment" {
   description = "Environment in which the resource should be provisioned like dev, qa, prod etc."