Fixed friendly name for AVD feed workspace (#904)

* Updated outputs for names & description for friendly name * Updated outputs to work around output limit * Updated params * Simplified value passed to deployment * Compiled bicep changes
Azure · Feb 21, 2024 · 4792380 · 4792380
1 parent 5dcb1ca
commit 4792380
Show file tree

Hide file tree

Showing 5 changed files with 404 additions and 703 deletions.
diff --git a/src/bicep/add-ons/azureVirtualDesktop/modules/controlPlane/controlPlane.bicep b/src/bicep/add-ons/azureVirtualDesktop/modules/controlPlane/controlPlane.bicep
@@ -30,11 +30,11 @@ param tags object
 param timestamp string
 param validationEnvironment bool
 param vmTemplate string
-param workspaceFriendlyName string
-param workspaceFeedName string
 param workspaceFeedDiagnoticSettingName string
+param workspaceFeedName string
 param workspaceFeedNetworkInterfaceName string
 param workspaceFeedPrivateEndpointName string
+param workspaceFriendlyName string
 param workspacePublicNetworkAccess string
 
 module hostPool 'hostPool.bicep' = {
@@ -90,7 +90,6 @@ module workspace 'workspace.bicep' = {
     avdPrivateDnsZoneResourceId: avdPrivateDnsZoneResourceId
     deploymentUserAssignedIdentityClientId: deploymentUserAssignedIdentityClientId
     existing: existingFeedWorkspace
-    friendlyName: workspaceFriendlyName
     hostPoolName: hostPoolName
     locationControlPlane: locationControlPlane
     locationVirtualMachines: locationVirtualMachines
@@ -105,6 +104,7 @@ module workspace 'workspace.bicep' = {
     workspaceFeedName: workspaceFeedName
     workspaceFeedNetworkInterfaceName: workspaceFeedNetworkInterfaceName
     workspaceFeedPrivateEndpointName: workspaceFeedPrivateEndpointName
+    workspaceFriendlyName: workspaceFriendlyName
     workspacePublicNetworkAccess: workspacePublicNetworkAccess
   }
 }
diff --git a/src/bicep/add-ons/azureVirtualDesktop/modules/controlPlane/workspace.bicep b/src/bicep/add-ons/azureVirtualDesktop/modules/controlPlane/workspace.bicep
@@ -3,7 +3,6 @@ param artifactsUri string
 param avdPrivateDnsZoneResourceId string
 param deploymentUserAssignedIdentityClientId string
 param existing bool
-param friendlyName string
 param hostPoolName string
 param locationControlPlane string
 param locationVirtualMachines string
@@ -18,6 +17,7 @@ param workspaceFeedDiagnoticSettingName string
 param workspaceFeedName string
 param workspaceFeedNetworkInterfaceName string
 param workspaceFeedPrivateEndpointName string
+param workspaceFriendlyName string
 param workspacePublicNetworkAccess string
 
 module addApplicationGroups '../common/customScriptExtensions.bicep' = if (existing) {
@@ -44,7 +44,7 @@ resource workspace 'Microsoft.DesktopVirtualization/workspaces@2023-09-05' = if
   tags: {}
   properties: {
     applicationGroupReferences: applicationGroupReferences
-    friendlyName: empty(friendlyName) ? hostPoolName : '${friendlyName} (${locationControlPlane})'
+    friendlyName: workspaceFriendlyName
     publicNetworkAccess: workspacePublicNetworkAccess
   }
 }