From 243525d5eaf3c6b2b03c4591289802d4889cea88 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sun, 4 Sep 2022 15:34:36 +0200 Subject: [PATCH 1/9] Updated AVD Workspace to new dependency approach --- .../ms.desktopvirtualization.workspaces.yml | 3 +- .../.test/default/dependencies.bicep | 40 +++++++++ .../.test/default/deploy.test.bicep | 81 +++++++++++++++++++ .../workspaces/.test/min/deploy.test.bicep | 37 +++++++++ .../workspaces/.test/parameters.json | 51 ------------ .../workspaces/readme.md | 73 ++++++++++++----- 6 files changed, 214 insertions(+), 71 deletions(-) create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/default/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/parameters.json diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml index 5b55277835..9ddd91422e 100644 --- a/.github/workflows/ms.desktopvirtualization.workspaces.yml +++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml @@ -106,8 +106,7 @@ jobs: - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' + templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.resourceGroupName }}' subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep new file mode 100644 index 0000000000..61d7ae5ec3 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep @@ -0,0 +1,40 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +@description('Required. The name of the Application Group to create.') +param applicationGroupName string + +@description('Required. The name of the Host Pool to create.') +param hostPoolName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2021-07-12' = { + name: hostPoolName + location: location + properties: { + hostPoolType: 'Pooled' + loadBalancerType: 'BreadthFirst' + preferredAppGroupType: 'Desktop' + } +} + +resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2021-07-12' = { + name: applicationGroupName + properties: { + applicationGroupType: 'Desktop' + hostPoolArmPath: hostPool.id + } +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + +@description('The resource ID of the created Application Group.') +output applicationGroupResourceId string = applicationGroup.id diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/deploy.test.bicep new file mode 100644 index 0000000000..7a596ba26e --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/deploy.test.bicep @@ -0,0 +1,81 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'dvwdef' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + managedIdentityName: 'dep-<>-msi-${serviceShort}' + applicationGroupName: 'dep-<>-appGroup-${serviceShort}' + hostPoolName: 'dep-<>-hp-${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + appGroupResourceIds: [ + resourceGroupResources.outputs.applicationGroupResourceId + ] + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId + diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId + diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId + diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName + location: location + lock: 'CanNotDelete' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + workspaceDescription: 'This is my first AVD Workspace' + workspaceFriendlyName: 'My first AVD Workspace' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..8c10f7d96b --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep @@ -0,0 +1,37 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'dvwmin' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/parameters.json b/modules/Microsoft.DesktopVirtualization/workspaces/.test/parameters.json deleted file mode 100644 index 5ffb007078..0000000000 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/parameters.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-avdws-x-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "location": { - "value": "westeurope" - }, - "appGroupResourceIds": { - "value": [ - "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.DesktopVirtualization/applicationgroups/adp-<>-az-avdag-x-001" - ] - }, - "workspaceFriendlyName": { - "value": "My first AVD Workspace" - }, - "workspaceDescription": { - "value": "This is my first AVD Workspace" - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "diagnosticLogsRetentionInDays": { - "value": 7 - }, - "diagnosticStorageAccountId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001" - }, - "diagnosticWorkspaceId": { - "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" - }, - "diagnosticEventHubAuthorizationRuleId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" - }, - "diagnosticEventHubName": { - "value": "adp-<>-az-evh-x-001" - } - } -} diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md index 6bdf767b58..e792898e38 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md +++ b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md @@ -165,7 +165,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Parameters

+

Example 1: Default

@@ -173,25 +173,25 @@ The following module usage examples are retrieved from the content of the files ```bicep module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Workspaces' + name: '${uniqueString(deployment().name)}-test-dvwdef' params: { // Required parameters - name: '<>-az-avdws-x-001' + name: '<>dvwdef001' // Non-required parameters appGroupResourceIds: [ - '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.DesktopVirtualization/applicationgroups/adp-<>-az-avdag-x-001' + '' ] - diagnosticEventHubAuthorizationRuleId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey' - diagnosticEventHubName: 'adp-<>-az-evh-x-001' + diagnosticEventHubAuthorizationRuleId: '' + diagnosticEventHubName: '' diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001' - diagnosticWorkspaceId: '/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001' - location: 'westeurope' + diagnosticStorageAccountId: '' + diagnosticWorkspaceId: '' + location: '' lock: 'CanNotDelete' roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -216,31 +216,31 @@ module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = "parameters": { // Required parameters "name": { - "value": "<>-az-avdws-x-001" + "value": "<>dvwdef001" }, // Non-required parameters "appGroupResourceIds": { "value": [ - "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.DesktopVirtualization/applicationgroups/adp-<>-az-avdag-x-001" + "" ] }, "diagnosticEventHubAuthorizationRuleId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" + "value": "" }, "diagnosticEventHubName": { - "value": "adp-<>-az-evh-x-001" + "value": "" }, "diagnosticLogsRetentionInDays": { "value": 7 }, "diagnosticStorageAccountId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001" + "value": "" }, "diagnosticWorkspaceId": { - "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" + "value": "" }, "location": { - "value": "westeurope" + "value": "" }, "lock": { "value": "CanNotDelete" @@ -249,7 +249,7 @@ module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -267,3 +267,40 @@ module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' =

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-dvwmin' + params: { + name: '<>dvwmin001' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "name": { + "value": "<>dvwmin001" + } + } +} +``` + +
+

From 5931f76877c54941c4d966153dbc9fb7e99e6d09 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sun, 4 Sep 2022 15:51:05 +0200 Subject: [PATCH 2/9] Update to latest --- .../workspaces/.test/default/dependencies.bicep | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep index 61d7ae5ec3..6120c25d3d 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep @@ -27,6 +27,7 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2021-07-12' = { resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2021-07-12' = { name: applicationGroupName + location: location properties: { applicationGroupType: 'Desktop' hostPoolArmPath: hostPool.id From 0d21013864ce46536afb6133da956092d113dc1f Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 8 Sep 2022 19:22:20 +0200 Subject: [PATCH 3/9] Updated folder default to common. --- .../workspaces/.test/{default => common}/dependencies.bicep | 0 .../workspaces/.test/{default => common}/deploy.test.bicep | 0 modules/Microsoft.DesktopVirtualization/workspaces/readme.md | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename modules/Microsoft.DesktopVirtualization/workspaces/.test/{default => common}/dependencies.bicep (100%) rename modules/Microsoft.DesktopVirtualization/workspaces/.test/{default => common}/deploy.test.bicep (100%) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/default/dependencies.bicep rename to modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/default/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/default/deploy.test.bicep rename to modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md index e792898e38..ee50f6429a 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md +++ b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md @@ -165,7 +165,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Default

+

Example 1: Common

From 0df70ead4460c17556d7d6efc9db3b08ed65b1a2 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 12:53:05 +0200 Subject: [PATCH 4/9] Update to latest --- .../workspaces/.test/common/deploy.test.bicep | 4 ++-- .../workspaces/.test/min/deploy.test.bicep | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep index 7a596ba26e..0c0a867710 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep @@ -10,8 +10,8 @@ param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceS @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') -param serviceShort string = 'dvwdef' +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'dvwcom' // =========== // // Deployments // diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep index 8c10f7d96b..a4a4797bc1 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceS @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') param serviceShort string = 'dvwmin' // =========== // From 79041aeaac24e12ba2fae5b9addf93217bf499f4 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:06:23 +0200 Subject: [PATCH 5/9] Update to latest --- .../workspaces/.test/common/deploy.test.bicep | 6 +++--- .../workspaces/.test/min/deploy.test.bicep | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep index 0c0a867710..77c5bd3d6a 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'dvwcom' // =========== // diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep index a4a4797bc1..2dbd887275 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'dvwmin' // =========== // From 801c6d4eb9c1cd5d361a3d9bae33de2712b8c2ae Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 14:19:56 +0200 Subject: [PATCH 6/9] Update to latest --- .../Microsoft.DesktopVirtualization/workspaces/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md index 1fda1ed9c1..290355565e 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md +++ b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md @@ -174,10 +174,10 @@ The following module usage examples are retrieved from the content of the files ```bicep module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-test-dvwdef' + name: '${uniqueString(deployment().name)}-test-dvwcom' params: { // Required parameters - name: '<>dvwdef001' + name: '<>dvwcom001' // Non-required parameters appGroupResourceIds: [ '' @@ -217,7 +217,7 @@ module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = "parameters": { // Required parameters "name": { - "value": "<>dvwdef001" + "value": "<>dvwcom001" }, // Non-required parameters "appGroupResourceIds": { From fc0aa6e7b7542c3449d9cc2abc838fb2e99ba65e Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 00:07:19 +0200 Subject: [PATCH 7/9] Update modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep --- .../workspaces/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep index 77c5bd3d6a..7a93cc7b2d 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg' From a0502fc7ef290186bb281dbecd26f53220cf66ad Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 00:07:32 +0200 Subject: [PATCH 8/9] Update modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep --- .../workspaces/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep index 2dbd887275..fa5ba4c120 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.desktopvirtualization.workspaces-${serviceShort}-rg' From 732c1250eebefc32332287c8aa924f34ddbf753d Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 11 Oct 2022 12:00:18 +0200 Subject: [PATCH 9/9] Fixed param --- modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep | 2 +- modules/Microsoft.DesktopVirtualization/workspaces/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep index 8879c53f78..170d25415e 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep +++ b/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep @@ -4,7 +4,7 @@ param name string @description('Optional. Location for all resources.') param location string = resourceGroup().location -@description('Required. Resource IDs for the existing Application groups this workspace will group together.') +@description('Optional. Resource IDs for the existing Application groups this workspace will group together.') param appGroupResourceIds array = [] @description('Optional. The friendly name of the Workspace to be created.') diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md index 649ab65ad5..5ff787971b 100644 --- a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md +++ b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md @@ -25,13 +25,13 @@ This module deploys an Azure virtual desktop workspace. | Parameter Name | Type | Description | | :-- | :-- | :-- | -| `appGroupResourceIds` | array | Resource IDs for the existing Application groups this workspace will group together. | | `name` | string | The name of the workspace to be attach to new Application Group. | **Optional parameters** | Parameter Name | Type | Default Value | Allowed Values | Description | | :-- | :-- | :-- | :-- | :-- | +| `appGroupResourceIds` | array | `[]` | | Resource IDs for the existing Application groups this workspace will group together. | | `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogCategoriesToEnable` | array | `[Checkpoint, Error, Feed, Management]` | `[Checkpoint, Error, Feed, Management]` | The name of logs that will be streamed. |