From ac5485c33575484a8c9ae0b7fc5df0efb14ae802 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 1 Dec 2021 09:42:38 +0100 Subject: [PATCH 1/4] First commit --- arm/Microsoft.Authorization/policyDefinitions/deploy.bicep | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arm/Microsoft.Authorization/policyDefinitions/deploy.bicep b/arm/Microsoft.Authorization/policyDefinitions/deploy.bicep index 1e6fdf5d90..006841f57b 100644 --- a/arm/Microsoft.Authorization/policyDefinitions/deploy.bicep +++ b/arm/Microsoft.Authorization/policyDefinitions/deploy.bicep @@ -70,7 +70,9 @@ module policyDefinition_sub '.bicep/nested_policyDefinitions_sub.bicep' = if (em @sys.description('Policy Definition Name') output policyDefinitionName string = !empty(managementGroupId) ? policyDefinition_mg.outputs.policyDefinitionName : policyDefinition_sub.outputs.policyDefinitionName + @sys.description('Policy Definition resource ID') output policyDefinitionResourceId string = !empty(managementGroupId) ? policyDefinition_mg.outputs.policyDefinitionResourceId : policyDefinition_sub.outputs.policyDefinitionResourceId + @sys.description('Policy Definition Role Definition IDs') output roleDefinitionIds array = !empty(managementGroupId) ? policyDefinition_mg.outputs.roleDefinitionIds : policyDefinition_sub.outputs.roleDefinitionIds From 3c9ebd37831df71ef44115adb53f5de7403cbc16 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 1 Dec 2021 09:43:33 +0100 Subject: [PATCH 2/4] Update to latest --- .github/workflows/platform.dependencies.yml | 25 --------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml index a7f29f3649..e31f200ff7 100644 --- a/.github/workflows/platform.dependencies.yml +++ b/.github/workflows/platform.dependencies.yml @@ -49,7 +49,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -78,7 +77,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -107,7 +105,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -136,7 +133,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -165,7 +161,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -195,7 +190,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -264,7 +258,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -293,7 +286,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -322,7 +314,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -352,7 +343,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -389,7 +379,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -421,7 +410,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -453,7 +441,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -484,7 +471,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -515,7 +501,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -546,7 +531,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -577,7 +561,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -608,7 +591,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -684,7 +666,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -747,7 +728,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -776,7 +756,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/.bicep/nested_rbac_sub.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -813,7 +792,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -844,7 +822,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -873,7 +850,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' @@ -904,7 +880,6 @@ jobs: - name: 'Deploy module' uses: ./.github/actions/templates/deployModule with: - moduleName: '${{ env.moduleName }}' templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep' parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}' location: '${{ env.defaultLocation }}' From 2822c55c75680a86135eaee1751763994e63be88 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 1 Dec 2021 12:56:29 +0100 Subject: [PATCH 3/4] Removed env var --- .github/workflows/platform.dependencies.yml | 25 --------------------- 1 file changed, 25 deletions(-) diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml index e31f200ff7..837aaf1322 100644 --- a/.github/workflows/platform.dependencies.yml +++ b/.github/workflows/platform.dependencies.yml @@ -34,7 +34,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy resource group' env: - moduleName: resourceGroups namespace: 'Microsoft.Resources\resourceGroups' strategy: fail-fast: false @@ -61,7 +60,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy user assigned identity' env: - moduleName: userAssignedIdentities namespace: 'Microsoft.ManagedIdentity\userAssignedIdentities' needs: - job_deploy_rg @@ -89,7 +87,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy private bicep registry' env: - moduleName: registries namespace: 'Microsoft.ContainerRegistry\registries' needs: - job_deploy_rg @@ -117,7 +114,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy eventhub' env: - moduleName: namespaces namespace: 'Microsoft.EventHub\namespaces' needs: - job_deploy_rg @@ -145,7 +141,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy log analytics workspace' env: - moduleName: workspaces namespace: 'Microsoft.OperationalInsights\workspaces' needs: - job_deploy_rg @@ -173,7 +168,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy storage account' env: - moduleName: storageAccounts namespace: 'Microsoft.Storage\storageAccounts' needs: - job_deploy_rg @@ -242,7 +236,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy shared image gallery and definition' env: - moduleName: galleries namespace: 'Microsoft.Compute\galleries' needs: - job_deploy_rg @@ -270,7 +263,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy action groups' env: - moduleName: actionGroups namespace: 'Microsoft.Insights\actionGroups' needs: - job_deploy_rg @@ -298,7 +290,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy application security groups' env: - moduleName: applicationSecurityGroups namespace: 'Microsoft.Network\applicationSecurityGroups' needs: - job_deploy_rg @@ -327,7 +318,6 @@ jobs: name: 'Deploy sqlmi route tables' if: github.event.inputs.deploySqlMiDependencies == 'true' env: - moduleName: routeTables namespace: 'Microsoft.Network\routeTables' needs: - job_deploy_rg @@ -355,7 +345,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy network security groups' env: - moduleName: networkSecurityGroups namespace: 'Microsoft.Network\networkSecurityGroups' needs: - job_deploy_sa @@ -392,7 +381,6 @@ jobs: name: 'Deploy sqlmi network security group' if: github.event.inputs.deploySqlMiDependencies == 'true' env: - moduleName: networkSecurityGroups namespace: 'Microsoft.Network\networkSecurityGroups' needs: - job_deploy_sa @@ -422,7 +410,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy public IP addresses' env: - moduleName: publicIPAddresses namespace: 'Microsoft.Network\publicIPAddresses' needs: - job_deploy_sa @@ -453,7 +440,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy application insight' env: - moduleName: components namespace: 'Microsoft.Insights\components' needs: - job_deploy_sa @@ -483,7 +469,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy automation account' env: - moduleName: automationAccounts namespace: 'Microsoft.Automation\automationAccounts' needs: - job_deploy_sa @@ -513,7 +498,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy AVD host pool' env: - moduleName: hostpools namespace: 'Microsoft.DesktopVirtualization\hostpools' needs: - job_deploy_sa @@ -543,7 +527,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy recovery services vault' env: - moduleName: vaults namespace: 'Microsoft.RecoveryServices\vaults' needs: - job_deploy_sa @@ -573,7 +556,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy key vaults' env: - moduleName: vaults namespace: 'Microsoft.KeyVault\vaults' needs: - job_deploy_sa @@ -648,7 +630,6 @@ jobs: name: 'Deploy sqlmi key vault' if: github.event.inputs.deploySqlMiDependencies == 'true' env: - moduleName: vaults namespace: 'Microsoft.KeyVault\vaults' needs: - job_deploy_sa @@ -712,7 +693,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy AVD application group' env: - moduleName: applicationgroups namespace: 'Microsoft.DesktopVirtualization\applicationgroups' needs: - job_deploy_avdhp @@ -740,7 +720,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy role assignments' env: - moduleName: roleAssignments namespace: 'Microsoft.Authorization\roleAssignments' needs: - job_deploy_msi @@ -768,7 +747,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy virtual networks' env: - moduleName: virtualNetworks namespace: 'Microsoft.Network\virtualNetworks' needs: - job_deploy_nsg @@ -805,7 +783,6 @@ jobs: name: 'Deploy sqlmi virtual network' if: github.event.inputs.deploySqlMiDependencies == 'true' env: - moduleName: virtualNetworks namespace: 'Microsoft.Network\virtualNetworks' needs: - job_deploy_sqlmi_udr @@ -834,7 +811,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy private DNS zones' env: - moduleName: privateDnsZones namespace: 'Microsoft.Network\privateDnsZones' needs: - job_deploy_vnet @@ -862,7 +838,6 @@ jobs: runs-on: ubuntu-20.04 name: 'Deploy virtual machines' env: - moduleName: virtualMachines namespace: 'Microsoft.Compute\virtualMachines' needs: - job_deploy_kv_secrets From 8df03bdba63b4298180402b05b2ef614e7af7762 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 1 Dec 2021 13:30:28 +0100 Subject: [PATCH 4/4] Update to latest --- .../virtualMachines/parameters/parameters.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json index 2725541c74..84dc57111a 100644 --- a/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Compute/virtualMachines/parameters/parameters.json @@ -16,6 +16,9 @@ "version": "latest" } }, + "osType": { + "value": "Windows" + }, "osDisk": { "value": { "createOption": "fromImage", @@ -49,8 +52,10 @@ } ] }, - "enableNetworkWatcherWindows": { - "value": true + "extensionNetworkWatcherAgentConfig": { + "value": { + "enabled": true + } } } }