Merge branch 'main' of https://github.com/sihbher/avdaccelerator

Azure · Jan 28, 2025 · b32ea4f · b32ea4f
2 parents 9b163a6 + f4a1be4
commit b32ea4f
Show file tree

Hide file tree

Showing 44 changed files with 1,272 additions and 1,155 deletions.
diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/README.md b/avm/1.0.0/res/desktop-virtualization/application-group/README.md
@@ -17,8 +17,8 @@ This module deploys an Azure Virtual Desktop Application Group.
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
 | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
-| `Microsoft.DesktopVirtualization/applicationGroups` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups) |
-| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
+| `Microsoft.DesktopVirtualization/applicationGroups` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups) |
+| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
 | `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
 
 ## Usage examples

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/application/README.md b/avm/1.0.0/res/desktop-virtualization/application-group/application/README.md
@@ -14,7 +14,7 @@ This module deploys an Azure Virtual Desktop Application Group Application.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
+| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
 
 ## Parameters
 

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/application/main.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/application/main.bicep
@@ -37,11 +37,11 @@ param iconPath string = ''
 @sys.description('Optional. Index of the icon.')
 param iconIndex int = 0
 
-resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2023-09-05' existing = {
+resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2024-04-08-preview' existing = {
   name: applicationGroupName
 }
 
-resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2023-09-05' = {
+resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2024-04-08-preview' = {
   name: name
   parent: appGroup
   properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/main.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/main.bicep
@@ -87,11 +87,11 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' =
     }
   }
 
-resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' existing = {
+resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' existing = {
   name: hostpoolName
 }
 
-resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2023-09-05' = {
+resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2024-04-08-preview' = {
   name: name
   location: location
   tags: tags

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/main.json b/avm/1.0.0/res/desktop-virtualization/application-group/main.json
@@ -5,39 +5,14 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.26.54.24096",
-      "templateHash": "11461831707158104939"
+      "version": "0.33.13.18514",
+      "templateHash": "14213682580568647702"
     },
     "name": "Azure Virtual Desktop Application Group",
     "description": "This module deploys an Azure Virtual Desktop Application Group.",
     "owner": "Azure/module-maintainers"
   },
   "definitions": {
-    "lockType": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "nullable": true,
-          "metadata": {
-            "description": "Optional. Specify the name of lock."
-          }
-        },
-        "kind": {
-          "type": "string",
-          "allowedValues": [
-            "CanNotDelete",
-            "None",
-            "ReadOnly"
-          ],
-          "nullable": true,
-          "metadata": {
-            "description": "Optional. Specify the type of lock."
-          }
-        }
-      },
-      "nullable": true
-    },
     "roleAssignmentType": {
       "type": "array",
       "items": {
@@ -265,12 +240,6 @@
         "description": "Optional. Array of role assignments to create."
       }
     },
-    "lock": {
-      "$ref": "#/definitions/lockType",
-      "metadata": {
-        "description": "Optional. The lock settings of the service."
-      }
-    },
     "enableTelemetry": {
       "type": "bool",
       "defaultValue": true,
@@ -335,12 +304,12 @@
     "appGroup_hostpool": {
       "existing": true,
       "type": "Microsoft.DesktopVirtualization/hostPools",
-      "apiVersion": "2022-09-09",
+      "apiVersion": "2024-04-08-preview",
       "name": "[parameters('hostpoolName')]"
     },
     "appGroup": {
       "type": "Microsoft.DesktopVirtualization/applicationGroups",
-      "apiVersion": "2023-09-05",
+      "apiVersion": "2024-04-08-preview",
       "name": "[parameters('name')]",
       "location": "[parameters('location')]",
       "tags": "[parameters('tags')]",
@@ -349,24 +318,7 @@
         "friendlyName": "[parameters('friendlyName')]",
         "description": "[parameters('description')]",
         "applicationGroupType": "[parameters('applicationGroupType')]"
-      },
-      "dependsOn": [
-        "appGroup_hostpool"
-      ]
-    },
-    "appGroup_lock": {
-      "condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
-      "type": "Microsoft.Authorization/locks",
-      "apiVersion": "2020-05-01",
-      "scope": "[format('Microsoft.DesktopVirtualization/applicationGroups/{0}', parameters('name'))]",
-      "name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
-      "properties": {
-        "level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
-        "notes": "[if(equals(tryGet(parameters('lock'), 'kind'), 'CanNotDelete'), 'Cannot delete resource or child resources.', 'Cannot delete or modify the resource or child resources.')]"
-      },
-      "dependsOn": [
-        "appGroup"
-      ]
+      }
     },
     "appGroup_roleAssignments": {
       "copy": {
@@ -459,8 +411,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.26.54.24096",
-              "templateHash": "11159515031632739969"
+              "version": "0.33.13.18514",
+              "templateHash": "12429020349302903087"
             },
             "name": "Azure Virtual Desktop Application Group Application",
             "description": "This module deploys an Azure Virtual Desktop Application Group Application.",
@@ -542,7 +494,7 @@
           "resources": [
             {
               "type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
-              "apiVersion": "2023-09-05",
+              "apiVersion": "2024-04-08-preview",
               "name": "[format('{0}/{1}', parameters('applicationGroupName'), parameters('name'))]",
               "properties": {
                 "description": "[parameters('description')]",
@@ -613,7 +565,7 @@
       "metadata": {
         "description": "The location of the scaling plan."
       },
-      "value": "[reference('appGroup', '2023-09-05', 'full').location]"
+      "value": "[reference('appGroup', '2024-04-08-preview', 'full').location]"
     }
   }
 }
diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/defaults/dependencies.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/defaults/dependencies.bicep
@@ -4,7 +4,7 @@ param location string = resourceGroup().location
 @description('Required. The name of the Host Pool to create.')
 param hostPoolName string
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
   name: hostPoolName
   location: location
   properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/max/dependencies.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/max/dependencies.bicep
@@ -12,7 +12,7 @@ resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-
   location: location
 }
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
   name: hostPoolName
   location: location
   properties: {

diff --git a/...0.0/res/desktop-virtualization/application-group/tests/e2e/waf-aligned/dependencies.bicep b/...0.0/res/desktop-virtualization/application-group/tests/e2e/waf-aligned/dependencies.bicep
@@ -4,7 +4,7 @@ param location string = resourceGroup().location
 @description('Required. The name of the Host Pool to create.')
 param hostPoolName string
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
   name: hostPoolName
   location: location
   properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/host-pool/README.md b/avm/1.0.0/res/desktop-virtualization/host-pool/README.md
@@ -17,7 +17,7 @@ This module deploys an Azure Virtual Desktop Host Pool
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
 | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
-| `Microsoft.DesktopVirtualization/hostPools` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/hostPools) |
+| `Microsoft.DesktopVirtualization/hostPools` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/hostPools) |
 | `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
 | `Microsoft.Network/privateEndpoints` | [2023-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-04-01/privateEndpoints) |
 | `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | [2023-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-04-01/privateEndpoints/privateDnsZoneGroups) |

diff --git a/avm/1.0.0/res/desktop-virtualization/host-pool/main.bicep b/avm/1.0.0/res/desktop-virtualization/host-pool/main.bicep
@@ -176,7 +176,7 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' =
     }
   }
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
   name: name
   location: location
   tags: tags