External module bug fixes (#186)

* run command type fixes

* app gw waf fix

* vmss example waf fix

* vmss exception

Author: jchancellor-ms

README.md

@@ -1388,8 +1388,9 @@ The following arguments are supported:
  - `object_id` (Optional): The object ID of the managed identity.
 
  A parameter block supports the following arguments:
- - `name` (Required): The run parameter name.
- - `value` (Required): The run parameter value.
+ - `map_key` (Required): A unique key for the parameter within the `run_commands` map.
+  - `name` (Required): The run parameter name. This should be unique for each parameter.
+  - `value` (Required): The run parameter value.
 
  A script\_uri\_managed\_identity block supports the following arguments:
  - `client_id` (Optional): The client ID of the managed identity.
@@ -1427,10 +1428,10 @@ map(object({
       object_id = optional(string)
     }))
     output_blob_uri = optional(string)
-    parameters = optional(list(object({
+    parameters = optional(map(object({
       name  = string
       value = string
-    })), [])
+    })), {})
 
     timeouts = optional(object({
       create = optional(string)
@@ -1451,22 +1452,22 @@ Default: `{}`
 Description: The `run_commands_secrets` variable defines the configuration for Virtual Machine Run Command Sensitive values. This requires that the `run_commands_secrets` map key match the `run_commands` map key.  
 The following arguments are supported:
 
- - `protected_parameters` (Optional): A list of protected\_parameter blocks as defined below. The protected parameters used by the script.
- - `run_as_password` (Optional): Specifies the user account password on the VM when executing the Virtual Machine Run Command.
- - `run_as_user` (Optional): Specifies the user account on the VM when executing the Virtual Machine Run Command.
+ - `protected_parameters` (Optional): A map of protected\_parameter blocks as defined below. The protected parameters used by the script.
+  - `map_key` (Required): A unique key for the parameter within the `run_commands` map.
+    - `name` (Required): The run parameter name. This should be unique for each protected parameter.
+    - `value` (Required): The run parameter value.
 
- A protected\_parameter block supports the following arguments:
- - `name` (Required): The run parameter name.
- - `value` (Required): The run parameter value.
+  - `run_as_password` (Optional): Specifies the user account password on the VM when executing the Virtual Machine Run Command.
+  - `run_as_user` (Optional): Specifies the user account on the VM when executing the Virtual Machine Run Command.
 
 Type:
 
 ```hcl
 map(object({
-    protected_parameters = optional(list(object({
+    protected_parameters = optional(map(object({
       name  = string
       value = string
-    })), [])
+    })), {})
     run_as_password = optional(string)
     run_as_user     = optional(string)
   }))

examples/linux_default/README.md

@@ -84,7 +84,6 @@ module "vm_sku" {
 
   location      = azurerm_resource_group.this_rg.location
   cache_results = true
-
   vm_filters = {
     min_vcpus                      = 2
     max_vcpus                      = 2
@@ -101,11 +100,10 @@ module "natgateway" {
   source  = "Azure/avm-res-network-natgateway/azurerm"
   version = "0.2.1"
 
-  name                = module.naming.nat_gateway.name_unique
-  enable_telemetry    = true
   location            = azurerm_resource_group.this_rg.location
+  name                = module.naming.nat_gateway.name_unique
   resource_group_name = azurerm_resource_group.this_rg.name
-
+  enable_telemetry    = true
   public_ips = {
     public_ip_1 = {
       name = "nat_gw_pip1"
@@ -117,11 +115,10 @@ module "vnet" {
   source  = "Azure/avm-res-network-virtualnetwork/azurerm"
   version = "=0.8.1"
 
-  resource_group_name = azurerm_resource_group.this_rg.name
   address_space       = ["10.0.0.0/16"]
-  name                = module.naming.virtual_network.name_unique
   location            = azurerm_resource_group.this_rg.location
-
+  resource_group_name = azurerm_resource_group.this_rg.name
+  name                = module.naming.virtual_network.name_unique
   subnets = {
     vm_subnet_1 = {
       name             = "${module.naming.subnet.name_unique}-1"
@@ -169,68 +166,60 @@ resource "azurerm_bastion_host" "bastion" {
 data "azurerm_client_config" "current" {}
 
 module "avm_res_keyvault_vault" {
-  source              = "Azure/avm-res-keyvault-vault/azurerm"
-  version             = "=0.10.0"
-  tenant_id           = data.azurerm_client_config.current.tenant_id
+  source  = "Azure/avm-res-keyvault-vault/azurerm"
+  version = "=0.10.0"
+
+  location            = azurerm_resource_group.this_rg.location
   name                = "${module.naming.key_vault.name_unique}-linux-default"
   resource_group_name = azurerm_resource_group.this_rg.name
-  location            = azurerm_resource_group.this_rg.location
+  tenant_id           = data.azurerm_client_config.current.tenant_id
   network_acls = {
     default_action = "Allow"
   }
-
   role_assignments = {
     deployment_user_secrets = {
       role_definition_id_or_name = "Key Vault Secrets Officer"
       principal_id               = data.azurerm_client_config.current.object_id
     }
   }
-
+  tags = local.tags
   wait_for_rbac_before_secret_operations = {
     create = "60s"
   }
-
-  tags = local.tags
 }
 
 module "testvm" {
   source = "../../"
-  #source = "Azure/avm-res-compute-virtualmachine/azurerm"
-  #version = "0.19.0"
 
-  enable_telemetry    = var.enable_telemetry
-  location            = azurerm_resource_group.this_rg.location
+  location = azurerm_resource_group.this_rg.location
+  name     = module.naming.virtual_machine.name_unique
+  network_interfaces = {
+    network_interface_1 = {
+      name = module.naming.network_interface.name_unique
+      ip_configurations = {
+        ip_configuration_1 = {
+          name                          = "${module.naming.network_interface.name_unique}-ipconfig1"
+          private_ip_subnet_resource_id = module.vnet.subnets["vm_subnet_1"].resource_id
+        }
+      }
+    }
+  }
   resource_group_name = azurerm_resource_group.this_rg.name
-  os_type             = "Linux"
-  name                = module.naming.virtual_machine.name_unique
-  sku_size            = module.vm_sku.sku
   zone                = random_integer.zone_index.result
-
   account_credentials = {
     key_vault_configuration = {
       resource_id = module.avm_res_keyvault_vault.resource_id
     }
   }
-
+  enable_telemetry = var.enable_telemetry
+  os_type          = "Linux"
+  sku_size         = module.vm_sku.sku
   source_image_reference = {
     publisher = "Canonical"
     offer     = "0001-com-ubuntu-server-focal"
     sku       = "20_04-lts-gen2"
     version   = "latest"
   }
-
-  network_interfaces = {
-    network_interface_1 = {
-      name = module.naming.network_interface.name_unique
-      ip_configurations = {
-        ip_configuration_1 = {
-          name                          = "${module.naming.network_interface.name_unique}-ipconfig1"
-          private_ip_subnet_resource_id = module.vnet.subnets["vm_subnet_1"].resource_id
-        }
-      }
-    }
-  }
-
   tags = local.tags
 
   depends_on = [

examples/linux_default/main.tf

@@ -66,7 +66,6 @@ module "vm_sku" {
 
   location      = azurerm_resource_group.this_rg.location
   cache_results = true
-
   vm_filters = {
     min_vcpus                      = 2
     max_vcpus                      = 2
@@ -83,11 +82,10 @@ module "natgateway" {
   source  = "Azure/avm-res-network-natgateway/azurerm"
   version = "0.2.1"
 
-  name                = module.naming.nat_gateway.name_unique
-  enable_telemetry    = true
   location            = azurerm_resource_group.this_rg.location
+  name                = module.naming.nat_gateway.name_unique
   resource_group_name = azurerm_resource_group.this_rg.name
-
+  enable_telemetry    = true
   public_ips = {
     public_ip_1 = {
       name = "nat_gw_pip1"
@@ -99,11 +97,10 @@ module "vnet" {
   source  = "Azure/avm-res-network-virtualnetwork/azurerm"
   version = "=0.8.1"
 
-  resource_group_name = azurerm_resource_group.this_rg.name
   address_space       = ["10.0.0.0/16"]
-  name                = module.naming.virtual_network.name_unique
   location            = azurerm_resource_group.this_rg.location
-
+  resource_group_name = azurerm_resource_group.this_rg.name
+  name                = module.naming.virtual_network.name_unique
   subnets = {
     vm_subnet_1 = {
       name             = "${module.naming.subnet.name_unique}-1"
@@ -151,68 +148,60 @@ resource "azurerm_bastion_host" "bastion" {
 data "azurerm_client_config" "current" {}
 
 module "avm_res_keyvault_vault" {
-  source              = "Azure/avm-res-keyvault-vault/azurerm"
-  version             = "=0.10.0"
-  tenant_id           = data.azurerm_client_config.current.tenant_id
+  source  = "Azure/avm-res-keyvault-vault/azurerm"
+  version = "=0.10.0"
+
+  location            = azurerm_resource_group.this_rg.location
   name                = "${module.naming.key_vault.name_unique}-linux-default"
   resource_group_name = azurerm_resource_group.this_rg.name
-  location            = azurerm_resource_group.this_rg.location
+  tenant_id           = data.azurerm_client_config.current.tenant_id
   network_acls = {
     default_action = "Allow"
   }
-
   role_assignments = {
     deployment_user_secrets = {
       role_definition_id_or_name = "Key Vault Secrets Officer"
       principal_id               = data.azurerm_client_config.current.object_id
     }
   }
-
+  tags = local.tags
   wait_for_rbac_before_secret_operations = {
     create = "60s"
   }
-
-  tags = local.tags
 }
 
 module "testvm" {
   source = "../../"
-  #source = "Azure/avm-res-compute-virtualmachine/azurerm"
-  #version = "0.19.0"
 
-  enable_telemetry    = var.enable_telemetry
-  location            = azurerm_resource_group.this_rg.location
+  location = azurerm_resource_group.this_rg.location
+  name     = module.naming.virtual_machine.name_unique
+  network_interfaces = {
+    network_interface_1 = {
+      name = module.naming.network_interface.name_unique
+      ip_configurations = {
+        ip_configuration_1 = {
+          name                          = "${module.naming.network_interface.name_unique}-ipconfig1"
+          private_ip_subnet_resource_id = module.vnet.subnets["vm_subnet_1"].resource_id
+        }
+      }
+    }
+  }
   resource_group_name = azurerm_resource_group.this_rg.name
-  os_type             = "Linux"
-  name                = module.naming.virtual_machine.name_unique
-  sku_size            = module.vm_sku.sku
   zone                = random_integer.zone_index.result
-
   account_credentials = {
     key_vault_configuration = {
       resource_id = module.avm_res_keyvault_vault.resource_id
     }
   }
-
+  enable_telemetry = var.enable_telemetry
+  os_type          = "Linux"
+  sku_size         = module.vm_sku.sku
   source_image_reference = {
     publisher = "Canonical"
     offer     = "0001-com-ubuntu-server-focal"
     sku       = "20_04-lts-gen2"
     version   = "latest"
   }
-
-  network_interfaces = {
-    network_interface_1 = {
-      name = module.naming.network_interface.name_unique
-      ip_configurations = {
-        ip_configuration_1 = {
-          name                          = "${module.naming.network_interface.name_unique}-ipconfig1"
-          private_ip_subnet_resource_id = module.vnet.subnets["vm_subnet_1"].resource_id
-        }
-      }
-    }
-  }
-
   tags = local.tags
 
   depends_on = [