Added default_desktop_display_name support in azurerm_virtual_desktop… (

#1734) * added default_desktop_display_name support in azurerm_virtual_desktop_application_group * added in integration test * Update .github/workflows/standalone-scenarios.json --------- Co-authored-by: Arnaud Lheureux <[email protected]>
aztfmod · Aug 3, 2023 · ddd6937 · ddd6937
1 parent 1c33fc2
commit ddd6937
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/examples/app_config/101-private-link/configuration.tfvars b/examples/app_config/101-private-link/configuration.tfvars
@@ -49,8 +49,8 @@ vnets = {
     }
     subnets = {
       appconfig_endpoints = {
-        name              = "appconfig"
-        cidr              = ["10.1.100.64/26"]
+        name = "appconfig"
+        cidr = ["10.1.100.64/26"]
       }
       private_link = {
         name                                           = "private-links"

diff --git a/examples/compute/azure_virtual_desktop/wvd_resources/configuration.tfvars b/examples/compute/azure_virtual_desktop/wvd_resources/configuration.tfvars
@@ -17,12 +17,13 @@ resource_groups = {
 
 wvd_application_groups = {
   wvd_app_group_1 = {
-    resource_group_key = "wvd_region1"
-    host_pool_key      = "wvd_hp1"
-    wvd_workspace_key  = "wvd_ws1"
-    name               = "desktopgroup"
-    friendly_name      = "Published Desktop"
-    description        = "A description of my workspace"
+    resource_group_key           = "wvd_region1"
+    host_pool_key                = "wvd_hp1"
+    wvd_workspace_key            = "wvd_ws1"
+    name                         = "desktopgroup"
+    friendly_name                = "Published Desktop"
+    description                  = "A description of my workspace"
+    default_desktop_display_name = "desktopgroup"
     #Type of Virtual Desktop Application Group. Valid options are RemoteApp or Desktop.
     type = "Desktop"
   }
@@ -150,4 +151,4 @@ dynamic_keyvault_secrets = {
       attribute_key = "token"
     }
   }
-}
+}
diff --git a/modules/compute/wvd_application_group/virtual_desktop_application_group.tf b/modules/compute/wvd_application_group/virtual_desktop_application_group.tf
@@ -9,18 +9,18 @@ resource "azurecaf_name" "dag" {
 }
 
 resource "azurerm_virtual_desktop_application_group" "dag" {
-  name                = azurecaf_name.dag.result
-  location            = local.location
-  resource_group_name = local.resource_group_name
-  friendly_name       = try(var.settings.friendly_name, null)
-  description         = try(var.settings.description, null)
-  type                = var.settings.type
-  host_pool_id        = var.host_pool_id
-  tags                = merge(local.tags, try(var.settings.tags, null))
+  name                         = azurecaf_name.dag.result
+  location                     = local.location
+  resource_group_name          = local.resource_group_name
+  friendly_name                = try(var.settings.friendly_name, null)
+  default_desktop_display_name = var.settings.type == "Desktop" ? try(var.settings.default_desktop_display_name, null) : null
+  description                  = try(var.settings.description, null)
+  type                         = var.settings.type
+  host_pool_id                 = var.host_pool_id
+  tags                         = merge(local.tags, try(var.settings.tags, null))
 }
 
 resource "azurerm_virtual_desktop_workspace_application_group_association" "workspaceremoteapp" {
   workspace_id         = var.workspace_id
   application_group_id = azurerm_virtual_desktop_application_group.dag.id
 }
-