From 6eddf88fbcbf145dbc8a3d3b1655ac34a15a6346 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 10:12:49 +0100 Subject: [PATCH 01/17] Update to latest --- docs/wiki/UtilitiesConversionScript.md | 23 +++++---- docs/wiki/UtilitiesSetModuleReadMe.md | 69 ++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 11 deletions(-) create mode 100644 docs/wiki/UtilitiesSetModuleReadMe.md diff --git a/docs/wiki/UtilitiesConversionScript.md b/docs/wiki/UtilitiesConversionScript.md index 215b1bb191..77f6a12b51 100644 --- a/docs/wiki/UtilitiesConversionScript.md +++ b/docs/wiki/UtilitiesConversionScript.md @@ -16,7 +16,7 @@ This page documents the conversion utility and how to use it. --- # Location -`You can find the script under /utilities/tools/ConvertTo-ARMTemplate.ps1` +You can find the script under `/utilities/tools/ConvertTo-ARMTemplate.ps1` # What it does @@ -27,26 +27,27 @@ by using the following steps. 1. Remove bicep metadata from json 1. Remove bicep files and folders 1. Update pipeline files - Replace .bicep with .json in pipeline files + # How to use it The script can be called with the following parameters: | name | description | |-|-| -| -Path | The path to the root of the repo. | -| -ConvertChildren | Convert child resource modules to bicep. | -| -SkipMetadataCleanup | Skip Cleanup of bicep metadata from json files | -| -SkipBicepCleanUp | Skip removal of bicep files and folders | -| -SkipPipelineUpdate | Skip replacing .bicep with .json in pipeline files | +| `Path` | The path to the root of the repo. | +| `ConvertChildren` | Convert child resource modules to bicep. | +| `SkipMetadataCleanup` | Skip Cleanup of bicep metadata from json files | +| `SkipBicepCleanUp` | Skip removal of bicep files and folders | +| `SkipPipelineUpdate` | Skip replacing .bicep with .json in pipeline files | -## Examples +## Example 1: Convert top level bicep modules to json based ARM template, cleaning up all bicep files and folders and updating the workflow files to use the json files -Converts top level bicep modules to json based ARM template, cleaning up all bicep files and folders and updating the workflow files to use the json files. ```powershell -. .\utilities\tools\ConvertTo-ARMTemplate.ps1 +. ./utilities/tools/ConvertTo-ARMTemplate.ps1 ``` -Only converts top level bicep modules to json based ARM template, keeping metadata in json, keeping all bicep files and folders, and not updating workflows. +## Example 2: Only convert top level bicep modules to json based ARM template, keeping metadata in json, keeping all bicep files and folders, and not updating workflows + ```powershell -. .\utilities\tools\ConvertTo-ARMTemplate.ps1 -ConvertChildren -SkipMetadataCleanup -SkipBicepCleanUp -SkipWorkflowUpdate +. ./utilities/tools/ConvertTo-ARMTemplate.ps1 -ConvertChildren -SkipMetadataCleanup -SkipBicepCleanUp -SkipWorkflowUpdate ``` diff --git a/docs/wiki/UtilitiesSetModuleReadMe.md b/docs/wiki/UtilitiesSetModuleReadMe.md new file mode 100644 index 0000000000..be4f9a0711 --- /dev/null +++ b/docs/wiki/UtilitiesSetModuleReadMe.md @@ -0,0 +1,69 @@ +# Module ReadMe Generation Script + +Use this script to generate most parts of a templates ReadMe file. It will take care of all aspects but the description & module-specific parameter usage examples. However, the latter are added for default cases such as `tags` or `roleAssignments` if the corresponding parameter exists in the provided template. + +For further information about the parameter usage blocks, please refer to the [section](#special-case-parameter-usage-section) below. + +--- + +### _Navigation_ + +- [Location](#location) +- [What it does](#what-it-does) + - [Special case: 'Parameter Usage' section](#special-case-parameter-usage-section) +- [How to use it](#how-to-use-it) + - [Examples](#examples) + +--- +# Location + +You can find the script under `/utilities/tools/Set-ModuleReadMe.ps1` + +# What it does + +1. Using the provided template path, the script first makes sure to convert it to ARM if necessary (i.e. if a path to a bicep file was provided) +1. If the intended readMe file does not yet exist in the expected path, it is generated with a skeleton (with e.g. a generated header name, etc.) +1. It then goes through all sections defined as `SectionsToRefresh` (by default all) and refreshes the section content (for example for the `Parameters`) based on the values in the ARM template. It detects sections by their header and regenerates always the full section. +1. Once all are refreshed, the current ReadMe file is overwritten. **Note:** The script can be invoked with a `WhatIf` in combination with `Verbose` to just receive an console-output of the updated content. + +## Special case: 'Parameter Usage' section + +# How to use it + +The script can be called with the following parameters: + +| name | description | +|-|-| +| `TemplateFilePath` | The path to the template to update | +| `ReadMeFilePath` | The path to the readme to update. If not provided assumes a 'readme.md' file in the same folder as the template | +| `SectionsToRefresh` | Optional. The sections to update. By default it refreshes all that are supported.

Currently supports: 'Resource Types', 'Parameters', 'Outputs', 'Template references' | + + +## Example 1: Generate the Module ReadMe for the module 'LoadBalancer' +```powershell +. './utilities/tools/Set-ModuleReadMe.ps1' +Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/deploy.bicep' +``` + +## Example 2: Generate the Module ReadMe only for specific sections + +```powershell +. './utilities/tools/Set-ModuleReadMe.ps1' +Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/deploy.bicep' -SectionsToRefresh @('Parameters', 'Outputs') +``` +Updates only the sections `Parameters` & `Outputs`. Other sections remain untouched. + +## Example 3: Generate the Module ReadMe files into a specific folder path + +```powershell +. './utilities/tools/Set-ModuleReadMe.ps1' +Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/deploy.bicep' -ReadMeFilePath 'C:/differentFolder' +``` +Generates the ReadMe into a folder in path `C:/differentFolder` + +## Example 4: Generate the Module ReadMe for any template in a folder path +```powershell +. './utilities/tools/Set-ModuleReadMe.ps1' +$templatePaths = (Get-ChildItem 'C:/Microsoft.Network' -Filter 'deploy.bicep' -Recurse).FullName +$templatePaths | ForEach-Object { Set-ModuleReadMe -TemplateFilePath $_ } +``` From dd54232ae2fba62cb26381ba0c79fe330778a7ca Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 10:30:58 +0100 Subject: [PATCH 02/17] Update to latest --- docs/wiki/UtilitiesSetModuleReadMe.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/wiki/UtilitiesSetModuleReadMe.md b/docs/wiki/UtilitiesSetModuleReadMe.md index be4f9a0711..cd297928f8 100644 --- a/docs/wiki/UtilitiesSetModuleReadMe.md +++ b/docs/wiki/UtilitiesSetModuleReadMe.md @@ -28,6 +28,16 @@ You can find the script under `/utilities/tools/Set-ModuleReadMe.ps1` ## Special case: 'Parameter Usage' section +The 'Parameter Usage' examples are located just beneath the 'Parameters' table. They are intended to show how to use complex objects/arrays that can be provided as parameters (excluding child-resources as they have their own readMe). + +For the most part, this section is to be populated manually. However, for a specific set of common parameters, we automatically add their example to the readMe if the parameter exists in the template. At the time of this writing these are: +- Private Endpoints +- Role Assignments +- Tags +- User Assigned Identities + +To be able to change this list with minimum effort, the script reads the content from markdown files in the folder: `utilities/tools/moduleReadMeSource`. + # How to use it The script can be called with the following parameters: From fb84cbeb049de2fabb6cf7e905f160e2baa78771 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 13:00:18 +0100 Subject: [PATCH 03/17] Update to latest --- docs/wiki/UtilitiesSetModuleReadMe.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/wiki/UtilitiesSetModuleReadMe.md b/docs/wiki/UtilitiesSetModuleReadMe.md index cd297928f8..304b2f0591 100644 --- a/docs/wiki/UtilitiesSetModuleReadMe.md +++ b/docs/wiki/UtilitiesSetModuleReadMe.md @@ -36,7 +36,15 @@ For the most part, this section is to be populated manually. However, for a spec - Tags - User Assigned Identities -To be able to change this list with minimum effort, the script reads the content from markdown files in the folder: `utilities/tools/moduleReadMeSource`. +To be able to change this list with minimum effort, the script reads the content from markdown files in the folder: `utilities/tools/moduleReadMeSource` and matches their title against the parameters of the template file. If a match is found, it's content is added to the readme alongside the generated header. This means, if you want to add another case, you just need to add a new file to the `moduleReadMeSource` folder and follow the naming pattern `resourceUsage-.md`. + +For example, the content of file `resourceUsage-roleAssignments.md` in folder `moduleReadMeSource` is added to a template's readMe if it contains a parameter `roleAssignments`. The combined result is: + +```markdown +### Parameter Usage: `roleAssignments` + +<[resourceUsage-roleAssignments.md] file content> +``` # How to use it From 7e531e8b25f2d36d329c26932c39004238b68b10 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 13:50:11 +0100 Subject: [PATCH 04/17] Update to latest --- .../pipelineTemplates/module.jobs.publish.yml | 57 ++++++------ .../pipelineVariables/global.variables.yml | 1 + .../templates/publishModule/action.yml | 14 +-- .github/variables/global.variables.json | 4 + .../workflows/ms.analysisservices.servers.yml | 1 + .../workflows/ms.apimanagement.service.yml | 1 + .../ms.authorization.policyassignments.yml | 1 + .../ms.authorization.policydefinitions.yml | 1 + .../ms.authorization.policyexemptions.yml | 1 + .../ms.authorization.policysetdefinitions.yml | 1 + .../ms.authorization.roleassignments.yml | 1 + .../ms.authorization.roledefinitions.yml | 1 + .github/workflows/ms.automanage.accounts.yml | 1 + .../ms.automation.automationaccounts.yml | 1 + .github/workflows/ms.batch.batchaccounts.yml | 1 + .../ms.cognitiveservices.accounts.yml | 1 + .../workflows/ms.compute.availabilitysets.yml | 1 + .../ms.compute.diskencryptionsets.yml | 1 + .github/workflows/ms.compute.galleries.yml | 1 + .github/workflows/ms.compute.images.yml | 1 + .../ms.compute.proximityplacementgroups.yml | 1 + .../workflows/ms.compute.virtualmachines.yml | 1 + .../ms.compute.virtualmachinescalesets.yml | 1 + .github/workflows/ms.consumption.budgets.yml | 1 + .../ms.containerinstance.containergroups.yml | 1 + .../ms.containerregistry.registries.yml | 1 + .../ms.containerservice.managedclusters.yml | 1 + .../workflows/ms.databricks.workspaces.yml | 1 + .../workflows/ms.datafactory.factories.yml | 1 + ...esktopvirtualization.applicationgroups.yml | 1 + .../ms.desktopvirtualization.hostpools.yml | 1 + .../ms.desktopvirtualization.workspaces.yml | 1 + .../ms.documentdb.databaseaccounts.yml | 1 + .github/workflows/ms.eventgrid.topics.yml | 1 + .github/workflows/ms.eventhub.namespaces.yml | 1 + .github/workflows/ms.healthbot.healthbots.yml | 1 + .../workflows/ms.insights.actiongroups.yml | 1 + .../ms.insights.activitylogalerts.yml | 1 + .github/workflows/ms.insights.components.yml | 1 + .../ms.insights.diagnosticsettings.yml | 1 + .../workflows/ms.insights.metricalerts.yml | 1 + .../ms.insights.privatelinkscopes.yml | 1 + .../ms.insights.scheduledqueryrules.yml | 1 + .github/workflows/ms.keyvault.vaults.yml | 1 + .github/workflows/ms.logic.workflows.yml | 1 + .../ms.machinelearningservices.workspaces.yml | 1 + ...managedidentity.userassignedidentities.yml | 1 + ...anagedservices.registrationdefinitions.yml | 1 + .../ms.management.managementgroups.yml | 1 + .../workflows/ms.netapp.netappaccounts.yml | 1 + .../ms.network.applicationgateways.yml | 1 + .../ms.network.applicationsecuritygroups.yml | 1 + .../workflows/ms.network.azurefirewalls.yml | 1 + .github/workflows/ms.network.bastionhosts.yml | 1 + .github/workflows/ms.network.connections.yml | 1 + .../ms.network.ddosprotectionplans.yml | 1 + .../ms.network.expressroutecircuits.yml | 1 + .../workflows/ms.network.firewallpolicies.yml | 1 + .github/workflows/ms.network.ipgroups.yml | 1 + .../workflows/ms.network.loadbalancers.yml | 1 + .../ms.network.localnetworkgateways.yml | 1 + .github/workflows/ms.network.natgateways.yml | 1 + .../ms.network.networksecuritygroups.yml | 1 + .../workflows/ms.network.networkwatchers.yml | 1 + .../workflows/ms.network.privatednszones.yml | 1 + .../workflows/ms.network.privateendpoints.yml | 1 + .../ms.network.publicipaddresses.yml | 1 + .../workflows/ms.network.publicipprefixes.yml | 1 + .github/workflows/ms.network.routetables.yml | 1 + .../ms.network.trafficmanagerprofiles.yml | 1 + .../ms.network.virtualnetworkgateways.yml | 1 + .../workflows/ms.network.virtualnetworks.yml | 1 + .github/workflows/ms.network.virtualwans.yml | 1 + .../ms.operationalinsights.workspaces.yml | 1 + .../workflows/ms.recoveryservices.vaults.yml | 1 + .../ms.resources.deploymentscripts.yml | 1 + .../workflows/ms.resources.resourcegroups.yml | 1 + .../ms.security.azuresecuritycenter.yml | 1 + .../workflows/ms.servicebus.namespaces.yml | 1 + .github/workflows/ms.sql.managedinstances.yml | 1 + .github/workflows/ms.sql.servers.yml | 1 + .../workflows/ms.storage.storageaccounts.yml | 1 + ...ms.virtualmachineimages.imagetemplates.yml | 1 + .github/workflows/ms.web.connections.yml | 1 + .../workflows/ms.web.hostingenvironments.yml | 1 + .github/workflows/ms.web.serverfarms.yml | 1 + .github/workflows/ms.web.sites.yml | 1 + docs/wiki/PipelinesDesign.md | 1 + docs/wiki/UtilitiesSetModuleReadMe.md | 87 ------------------- .../Publish-ModuleToPrivateBicepRegistry.ps1 | 14 +++ 90 files changed, 142 insertions(+), 119 deletions(-) delete mode 100644 docs/wiki/UtilitiesSetModuleReadMe.md diff --git a/.azuredevops/pipelineTemplates/module.jobs.publish.yml b/.azuredevops/pipelineTemplates/module.jobs.publish.yml index 2bbb8f6245..c0ca0111d7 100644 --- a/.azuredevops/pipelineTemplates/module.jobs.publish.yml +++ b/.azuredevops/pipelineTemplates/module.jobs.publish.yml @@ -18,28 +18,29 @@ ## ## NOTE: If you don't need to overwrite a shared value, you can IGNORE this section ## -## |==================================================================================================================================================================================================================| -## | Parameter | Default Value | Description | Example | -## |---------------------------------|--------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------| -## | displayName | 'Publish module' | Name for the pipeline job | 'Publish KeyVault' | -## | serviceConnection | '$(serviceConnection)' | The service connection that connects to Azure | 'demo-internal' | -## | poolName | '$(poolName)' | You can provide either a [poolname] or [vmImage] to run the job on | 'Custom Deployment Pool' | -## | vmImage | '$(vmImage)' | You can provide either a [poolname] or [vmImage] to run the job on | 'ubuntu20.04' | -## | defaultJobTimeoutInMinutes | 120 | The timeout for the job in this pipeline | 120 | -## | versionOption | '$(versionOption)' | The mode to handle the version increments [major|minor|patch|custom]. | 'patch' | -## | moduleVersion | '$(moduleVersion)' | The version to enforce if [versionOption] is set to [custom] | '1.0.0' | -## | modulePath | '$(modulePath)' | The path to the module to deploy. E.g. [c:/KeyVault] | 'c:/KeyVault' | -## | templateSpecsRGName | '$(templateSpecsRGName)' | Required to publish to template spec. ResourceGroup of the template spec to publish to | 'mgmt-rg' | -## | templateSpecsRGLocation | '$(templateSpecsRGLocation)' | Required to publish to template spec. Location of the template spec resource group | 'West Europe' | -## | templateSpecsDescription | '$(templateSpecsDescription)' | Required to publish to template spec. Description of the template spec to publish to | 'IaCs module' | -## | vstsFeedName | '$(vstsFeedName)' | Required to publish to a DevOps feed. Name to the feed to publish to. | 'modules' | -## | vstsProject | '$(System.TeamProject)' | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty. | 'iacs' | -## | bicepRegistryName | '$(bicepRegistryName)' | Required to publish to the private bicep registry. Name of the hosting container registry | 'adpsxxazacrx001' | -## | bicepRegistryRGName | '$(bicepRegistryRGName)' | Required to publish to the private bicep registry. Resource group of the hosting container registry | 'artifacts-rg' | -## | vstsOrganization | '$(vstsOrganization)' | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed. | 'servicescode' | -## | azurePowerShellVersion | '$(azurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, one of the example values. | 'latestVersion' or 'OtherVersion' | -## | preferredAzurePowerShellVersion | '$(preferredAzurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, either an empty string or specific version. | '4.4.0' | -## |==================================================================================================================================================================================================================| +## |======================================================================================================================================================================================================================| +## | Parameter | Default Value | Description | Example | +## |---------------------------------|--------------------------------------|---------------------------------------------------------------------------------------------------------|-----------------------------------| +## | displayName | 'Publish module' | Name for the pipeline job | 'Publish KeyVault' | +## | serviceConnection | '$(serviceConnection)' | The service connection that connects to Azure | 'demo-internal' | +## | poolName | '$(poolName)' | You can provide either a [poolname] or [vmImage] to run the job on | 'Custom Deployment Pool' | +## | vmImage | '$(vmImage)' | You can provide either a [poolname] or [vmImage] to run the job on | 'ubuntu20.04' | +## | defaultJobTimeoutInMinutes | 120 | The timeout for the job in this pipeline | 120 | +## | versionOption | '$(versionOption)' | The mode to handle the version increments [major|minor|patch|custom]. | 'patch' | +## | moduleVersion | '$(moduleVersion)' | The version to enforce if [versionOption] is set to [custom] | '1.0.0' | +## | modulePath | '$(modulePath)' | The path to the module to deploy. E.g. [c:/KeyVault] | 'c:/KeyVault' | +## | templateSpecsRGName | '$(templateSpecsRGName)' | Required to publish to template spec. ResourceGroup of the template spec to publish to | 'mgmt-rg' | +## | templateSpecsRGLocation | '$(templateSpecsRGLocation)' | Required to publish to template spec. Location of the template spec resource group | 'West Europe' | +## | templateSpecsDescription | '$(templateSpecsDescription)' | Required to publish to template spec. Description of the template spec to publish to | 'IaCs module' | +## | vstsFeedName | '$(vstsFeedName)' | Required to publish to a DevOps feed. Name to the feed to publish to. | 'modules' | +## | vstsProject | '$(System.TeamProject)' | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty. | 'iacs' | +## | bicepRegistryName | '$(bicepRegistryName)' | Required to publish to the private bicep registry. Name of the hosting container registry | 'adpsxxazacrx001' | +## | bicepRegistryRGName | '$(bicepRegistryRGName)' | Required to publish to the private bicep registry. Resource group of the hosting container registry | 'artifacts-rg' | +## | bicepRegistryRgLocation | '$(bicepRegistryRgLocation)' | Required to publish to the private bicep registry. Location of the RG of the hosting container registry | 'West Europe' | +## | vstsOrganization | '$(vstsOrganization)' | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed. | 'servicescode' | +## | azurePowerShellVersion | '$(azurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, one of the example values. | 'latestVersion' or 'OtherVersion' | +## | preferredAzurePowerShellVersion | '$(preferredAzurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, either an empty string or specific version. | '4.4.0' | +## |======================================================================================================================================================================================================================| ## ##---------------------------------------------## @@ -72,6 +73,7 @@ parameters: ## Private-Bicep-Registry-related bicepRegistryName: '$(bicepRegistryName)' bicepRegistryRGName: '$(bicepRegistryRGName)' + bicepRegistryRgLocation: '$(bicepRegistryRgLocation)' ##---------------------------------------------## ## TEMPLATE LOGIC ## @@ -238,11 +240,12 @@ jobs: . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1') $functionInput = @{ - templateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep' - bicepRegistryName = '${{ parameters.bicepRegistryName }}' - bicepRegistryRgName = '${{ parameters.bicepRegistryRgName }}' - customVersion = '${{ parameters.customVersion }}' - versioningOption = '${{ parameters.versioningOption }}' + templateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep' + bicepRegistryName = '${{ parameters.bicepRegistryName }}' + bicepRegistryRgName = '${{ parameters.bicepRegistryRgName }}' + bicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}' + customVersion = '${{ parameters.customVersion }}' + versioningOption = '${{ parameters.versioningOption }}' } Write-Verbose "Invoke task with" -Verbose diff --git a/.azuredevops/pipelineVariables/global.variables.yml b/.azuredevops/pipelineVariables/global.variables.yml index 271181c2c7..8c8a259d0f 100644 --- a/.azuredevops/pipelineVariables/global.variables.yml +++ b/.azuredevops/pipelineVariables/global.variables.yml @@ -48,6 +48,7 @@ variables: bicepRegistryDoPublish: true # Set to true, if you would like to publish module templates to a bicep registry bicepRegistryName: adpsxxazacrx001 # The name of the bicep registry (ACR) to publish to. If it does not exist, it will be created. bicepRegistryRGName: 'artifacts-rg' # The resource group that hosts the private bicep registry (ACR) + bicepRegistryRgLocation: 'West Europe' # The location of the resource group to publish to ###################################### # Azure PowerShell Version diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml index 873aa8358d..de08822334 100644 --- a/.github/actions/templates/publishModule/action.yml +++ b/.github/actions/templates/publishModule/action.yml @@ -30,6 +30,9 @@ inputs: description: 'Required to publish to private bicep registry. ResourceGroup of the container registry to publish to' required: false bicepRegistryRgName: + description: 'Required to publish to private bicep registry. Name of the container registry resource group' + required: false + bicepRegistryRgLocation: description: 'Required to publish to private bicep registry. Location of the container registry resource group' required: false bicepRegistryDoPublish: @@ -95,11 +98,12 @@ runs: . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1') $functionInput = @{ - templateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}" - bicepRegistryName = '${{ inputs.bicepRegistryName }}' - bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}' - customVersion = '${{ inputs.customVersion }}' - versioningOption = '${{ inputs.versioningOption }}' + templateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}" + bicepRegistryName = '${{ inputs.bicepRegistryName }}' + bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}' + bicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}' + customVersion = '${{ inputs.customVersion }}' + versioningOption = '${{ inputs.versioningOption }}' } Write-Verbose "Invoke task with" -Verbose diff --git a/.github/variables/global.variables.json b/.github/variables/global.variables.json index 715fcca4ad..1f20a00491 100644 --- a/.github/variables/global.variables.json +++ b/.github/variables/global.variables.json @@ -32,6 +32,10 @@ "name": "bicepRegistryRGName", "value": "artifacts-rg" }, + { + "name": "bicepRegistryRgLocation", + "value": "WestEurope" + }, { "name": "bicepRegistryDoPublish", "value": "true" diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml index f829b11381..c99ceea129 100644 --- a/.github/workflows/ms.analysisservices.servers.yml +++ b/.github/workflows/ms.analysisservices.servers.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml index a01321c6c1..0acd8622a1 100644 --- a/.github/workflows/ms.apimanagement.service.yml +++ b/.github/workflows/ms.apimanagement.service.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml index 807dc8c79f..fc4117e346 100644 --- a/.github/workflows/ms.authorization.policyassignments.yml +++ b/.github/workflows/ms.authorization.policyassignments.yml @@ -147,4 +147,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml index dac45d4d67..4a92059827 100644 --- a/.github/workflows/ms.authorization.policydefinitions.yml +++ b/.github/workflows/ms.authorization.policydefinitions.yml @@ -147,4 +147,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml index a727664f22..e61317771a 100644 --- a/.github/workflows/ms.authorization.policyexemptions.yml +++ b/.github/workflows/ms.authorization.policyexemptions.yml @@ -147,4 +147,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml index 7a2221643e..49b470cf54 100644 --- a/.github/workflows/ms.authorization.policysetdefinitions.yml +++ b/.github/workflows/ms.authorization.policysetdefinitions.yml @@ -147,4 +147,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml index 2588eb8e9b..8f558fdc61 100644 --- a/.github/workflows/ms.authorization.roleassignments.yml +++ b/.github/workflows/ms.authorization.roleassignments.yml @@ -147,4 +147,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml index 9bed74d884..c0f2d66a51 100644 --- a/.github/workflows/ms.authorization.roledefinitions.yml +++ b/.github/workflows/ms.authorization.roledefinitions.yml @@ -147,4 +147,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.automanage.accounts.yml b/.github/workflows/ms.automanage.accounts.yml index 84c26bf8c1..bde3575184 100644 --- a/.github/workflows/ms.automanage.accounts.yml +++ b/.github/workflows/ms.automanage.accounts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml index 052a931b4d..b87fd08439 100644 --- a/.github/workflows/ms.automation.automationaccounts.yml +++ b/.github/workflows/ms.automation.automationaccounts.yml @@ -144,4 +144,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml index 66b7571b51..60d612a8d6 100644 --- a/.github/workflows/ms.batch.batchaccounts.yml +++ b/.github/workflows/ms.batch.batchaccounts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml index e26ad99ef7..9ebcdd3cca 100644 --- a/.github/workflows/ms.cognitiveservices.accounts.yml +++ b/.github/workflows/ms.cognitiveservices.accounts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml index ce99b174f6..1c9f802067 100644 --- a/.github/workflows/ms.compute.availabilitysets.yml +++ b/.github/workflows/ms.compute.availabilitysets.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml index 0bb047ba5f..6a70aa4075 100644 --- a/.github/workflows/ms.compute.diskencryptionsets.yml +++ b/.github/workflows/ms.compute.diskencryptionsets.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml index a852916a7b..ddbd43a5e8 100644 --- a/.github/workflows/ms.compute.galleries.yml +++ b/.github/workflows/ms.compute.galleries.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml index f75e9aa6f7..2121abf05c 100644 --- a/.github/workflows/ms.compute.images.yml +++ b/.github/workflows/ms.compute.images.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml index 3d26a0d036..63cc4cf8b6 100644 --- a/.github/workflows/ms.compute.proximityplacementgroups.yml +++ b/.github/workflows/ms.compute.proximityplacementgroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml index 42a8b445f5..a353b99156 100644 --- a/.github/workflows/ms.compute.virtualmachines.yml +++ b/.github/workflows/ms.compute.virtualmachines.yml @@ -149,4 +149,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml index dd5040bf85..fc0e039bbd 100644 --- a/.github/workflows/ms.compute.virtualmachinescalesets.yml +++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml @@ -149,4 +149,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml index 4cfd18d262..fd8876512f 100644 --- a/.github/workflows/ms.consumption.budgets.yml +++ b/.github/workflows/ms.consumption.budgets.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml index 09b51e5548..0c57cd4258 100644 --- a/.github/workflows/ms.containerinstance.containergroups.yml +++ b/.github/workflows/ms.containerinstance.containergroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml index 1eb6d6e33c..97ac7afaa9 100644 --- a/.github/workflows/ms.containerregistry.registries.yml +++ b/.github/workflows/ms.containerregistry.registries.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml index 0cd66a7f51..9f9b415ad5 100644 --- a/.github/workflows/ms.containerservice.managedclusters.yml +++ b/.github/workflows/ms.containerservice.managedclusters.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml index 22631c81ea..97cff997ce 100644 --- a/.github/workflows/ms.databricks.workspaces.yml +++ b/.github/workflows/ms.databricks.workspaces.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml index 0f9112e34f..dbb25f5939 100644 --- a/.github/workflows/ms.datafactory.factories.yml +++ b/.github/workflows/ms.datafactory.factories.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml index adae50f1da..4aaadda381 100644 --- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml +++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml index 6aba4acf80..257e283f8a 100644 --- a/.github/workflows/ms.desktopvirtualization.hostpools.yml +++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml index 6f9be7b24f..b3537ef1d7 100644 --- a/.github/workflows/ms.desktopvirtualization.workspaces.yml +++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml index 2b1c24a3c0..52ea4f5be6 100644 --- a/.github/workflows/ms.documentdb.databaseaccounts.yml +++ b/.github/workflows/ms.documentdb.databaseaccounts.yml @@ -148,4 +148,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml index f843043293..2912bd329d 100644 --- a/.github/workflows/ms.eventgrid.topics.yml +++ b/.github/workflows/ms.eventgrid.topics.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml index d75cdd3be7..12d793dfbd 100644 --- a/.github/workflows/ms.eventhub.namespaces.yml +++ b/.github/workflows/ms.eventhub.namespaces.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml index 0047825e84..e18c281b61 100644 --- a/.github/workflows/ms.healthbot.healthbots.yml +++ b/.github/workflows/ms.healthbot.healthbots.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml index 23abe736d4..e559612537 100644 --- a/.github/workflows/ms.insights.actiongroups.yml +++ b/.github/workflows/ms.insights.actiongroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml index bb89ac436b..683899c25f 100644 --- a/.github/workflows/ms.insights.activitylogalerts.yml +++ b/.github/workflows/ms.insights.activitylogalerts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml index 4544a9aa99..62d534e519 100644 --- a/.github/workflows/ms.insights.components.yml +++ b/.github/workflows/ms.insights.components.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml index c02d276fb4..7f8a78bea7 100644 --- a/.github/workflows/ms.insights.diagnosticsettings.yml +++ b/.github/workflows/ms.insights.diagnosticsettings.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml index 54fad14894..d9873716e0 100644 --- a/.github/workflows/ms.insights.metricalerts.yml +++ b/.github/workflows/ms.insights.metricalerts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml index 3feacddf26..b252620f35 100644 --- a/.github/workflows/ms.insights.privatelinkscopes.yml +++ b/.github/workflows/ms.insights.privatelinkscopes.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml index f12280b6a0..af9f9766b1 100644 --- a/.github/workflows/ms.insights.scheduledqueryrules.yml +++ b/.github/workflows/ms.insights.scheduledqueryrules.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml index 29c7e503e8..12ab4c2233 100644 --- a/.github/workflows/ms.keyvault.vaults.yml +++ b/.github/workflows/ms.keyvault.vaults.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml index 90c8cb09ab..1d2ecdd6df 100644 --- a/.github/workflows/ms.logic.workflows.yml +++ b/.github/workflows/ms.logic.workflows.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml index ec2b16377a..9594332ae3 100644 --- a/.github/workflows/ms.machinelearningservices.workspaces.yml +++ b/.github/workflows/ms.machinelearningservices.workspaces.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml index b561c62f21..5e92031fa2 100644 --- a/.github/workflows/ms.managedidentity.userassignedidentities.yml +++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml index bef468bbc7..8e5df6e199 100644 --- a/.github/workflows/ms.managedservices.registrationdefinitions.yml +++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml index ef9ba91c73..b10520e08e 100644 --- a/.github/workflows/ms.management.managementgroups.yml +++ b/.github/workflows/ms.management.managementgroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml index 7cdebd44b2..d94fb9aa48 100644 --- a/.github/workflows/ms.netapp.netappaccounts.yml +++ b/.github/workflows/ms.netapp.netappaccounts.yml @@ -148,4 +148,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml index f871a9e912..c1eb765b93 100644 --- a/.github/workflows/ms.network.applicationgateways.yml +++ b/.github/workflows/ms.network.applicationgateways.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml index 4aa06be3e4..3a1c7c0a44 100644 --- a/.github/workflows/ms.network.applicationsecuritygroups.yml +++ b/.github/workflows/ms.network.applicationsecuritygroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml index 8c837abf50..1404cb4367 100644 --- a/.github/workflows/ms.network.azurefirewalls.yml +++ b/.github/workflows/ms.network.azurefirewalls.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml index dafae468b5..d85dc19a88 100644 --- a/.github/workflows/ms.network.bastionhosts.yml +++ b/.github/workflows/ms.network.bastionhosts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml index 9c232f1143..5853506d11 100644 --- a/.github/workflows/ms.network.connections.yml +++ b/.github/workflows/ms.network.connections.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml index 792e730746..8bbe0b5ba2 100644 --- a/.github/workflows/ms.network.ddosprotectionplans.yml +++ b/.github/workflows/ms.network.ddosprotectionplans.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml index 938edb0f76..bc549635d7 100644 --- a/.github/workflows/ms.network.expressroutecircuits.yml +++ b/.github/workflows/ms.network.expressroutecircuits.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml index a70e24e39f..5ec28420f2 100644 --- a/.github/workflows/ms.network.firewallpolicies.yml +++ b/.github/workflows/ms.network.firewallpolicies.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml index 781fe05f2d..8bd74e9c69 100644 --- a/.github/workflows/ms.network.ipgroups.yml +++ b/.github/workflows/ms.network.ipgroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml index e07a033ab5..0d1fc9f0d5 100644 --- a/.github/workflows/ms.network.loadbalancers.yml +++ b/.github/workflows/ms.network.loadbalancers.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml index 4b125ca9be..db19b75b95 100644 --- a/.github/workflows/ms.network.localnetworkgateways.yml +++ b/.github/workflows/ms.network.localnetworkgateways.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml index b8c1d7d1d3..74ca4dfc0d 100644 --- a/.github/workflows/ms.network.natgateways.yml +++ b/.github/workflows/ms.network.natgateways.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml index 117b84751e..ddfefd2739 100644 --- a/.github/workflows/ms.network.networksecuritygroups.yml +++ b/.github/workflows/ms.network.networksecuritygroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml index fcbd072031..597352ac87 100644 --- a/.github/workflows/ms.network.networkwatchers.yml +++ b/.github/workflows/ms.network.networkwatchers.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml index c3931c47cb..eecc0027e1 100644 --- a/.github/workflows/ms.network.privatednszones.yml +++ b/.github/workflows/ms.network.privatednszones.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml index c7dbfb10d9..cb135a4b05 100644 --- a/.github/workflows/ms.network.privateendpoints.yml +++ b/.github/workflows/ms.network.privateendpoints.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml index 3aec89696d..b565b7e81d 100644 --- a/.github/workflows/ms.network.publicipaddresses.yml +++ b/.github/workflows/ms.network.publicipaddresses.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml index 8902c3c1a9..2dedd6fa0b 100644 --- a/.github/workflows/ms.network.publicipprefixes.yml +++ b/.github/workflows/ms.network.publicipprefixes.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml index 720ab115ff..c10feca3fb 100644 --- a/.github/workflows/ms.network.routetables.yml +++ b/.github/workflows/ms.network.routetables.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml index 3f94fc9306..388768c0cc 100644 --- a/.github/workflows/ms.network.trafficmanagerprofiles.yml +++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml index f34e8fd9eb..4d827dd5dd 100644 --- a/.github/workflows/ms.network.virtualnetworkgateways.yml +++ b/.github/workflows/ms.network.virtualnetworkgateways.yml @@ -144,4 +144,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml index 064ecfa296..81e877e76b 100644 --- a/.github/workflows/ms.network.virtualnetworks.yml +++ b/.github/workflows/ms.network.virtualnetworks.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml index 7b6a234fff..3532fc57f6 100644 --- a/.github/workflows/ms.network.virtualwans.yml +++ b/.github/workflows/ms.network.virtualwans.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml index 76ad944d58..8304815609 100644 --- a/.github/workflows/ms.operationalinsights.workspaces.yml +++ b/.github/workflows/ms.operationalinsights.workspaces.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml index 88b98ad3c4..c2baccd7c6 100644 --- a/.github/workflows/ms.recoveryservices.vaults.yml +++ b/.github/workflows/ms.recoveryservices.vaults.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml index 3f1228cdf0..fbbf16df72 100644 --- a/.github/workflows/ms.resources.deploymentscripts.yml +++ b/.github/workflows/ms.resources.deploymentscripts.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml index fc77121d0d..91f4c5c002 100644 --- a/.github/workflows/ms.resources.resourcegroups.yml +++ b/.github/workflows/ms.resources.resourcegroups.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml index 9407128bcb..962286702a 100644 --- a/.github/workflows/ms.security.azuresecuritycenter.yml +++ b/.github/workflows/ms.security.azuresecuritycenter.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml index 71aa607be8..97ba4cf68c 100644 --- a/.github/workflows/ms.servicebus.namespaces.yml +++ b/.github/workflows/ms.servicebus.namespaces.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml index 764f56ce2b..6195eefd6f 100644 --- a/.github/workflows/ms.sql.managedinstances.yml +++ b/.github/workflows/ms.sql.managedinstances.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml index 34d6ea7296..2c7304ae8d 100644 --- a/.github/workflows/ms.sql.servers.yml +++ b/.github/workflows/ms.sql.servers.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml index 39e2a88b21..df763612ad 100644 --- a/.github/workflows/ms.storage.storageaccounts.yml +++ b/.github/workflows/ms.storage.storageaccounts.yml @@ -144,4 +144,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml index 18850e2817..99431e7f19 100644 --- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml +++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml index 29a320c023..0e536b7aff 100644 --- a/.github/workflows/ms.web.connections.yml +++ b/.github/workflows/ms.web.connections.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml index 3ab8864652..494a6cbd6e 100644 --- a/.github/workflows/ms.web.hostingenvironments.yml +++ b/.github/workflows/ms.web.hostingenvironments.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml index 32b3bc6581..4a096c284f 100644 --- a/.github/workflows/ms.web.serverfarms.yml +++ b/.github/workflows/ms.web.serverfarms.yml @@ -143,4 +143,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml index 775cd8ad66..a4cce46c74 100644 --- a/.github/workflows/ms.web.sites.yml +++ b/.github/workflows/ms.web.sites.yml @@ -149,4 +149,5 @@ jobs: templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}' bicepRegistryName: '${{ env.bicepRegistryName }}' bicepRegistryRGName: '${{ env.bicepRegistryRGName }}' + bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}' bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}' diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md index dbe0085441..8ed29f928e 100644 --- a/docs/wiki/PipelinesDesign.md +++ b/docs/wiki/PipelinesDesign.md @@ -162,6 +162,7 @@ The primary pipeline variable file hosts the fundamental pipeline configuration | - | - | - | | `bicepRegistryName` | "adpsxxazacrx001" | The container registry to publish bicep templates to | | `bicepRegistryRGName` | "artifacts-rg" | The resource group of the container registry to publish bicep templates to. Is used to create a new container registry if not yet existing | +| `bicepRegistryRGName` | "artifacts-rg" | The location of the resource group of the container registry to publish bicep templates to. Is used to create a new resource group if not yet existing | | `bicepRegistryDoPublish` | "true" | A central switch to enable/disable publishing to the private bicep registry | ### Tokens Replacement diff --git a/docs/wiki/UtilitiesSetModuleReadMe.md b/docs/wiki/UtilitiesSetModuleReadMe.md deleted file mode 100644 index 304b2f0591..0000000000 --- a/docs/wiki/UtilitiesSetModuleReadMe.md +++ /dev/null @@ -1,87 +0,0 @@ -# Module ReadMe Generation Script - -Use this script to generate most parts of a templates ReadMe file. It will take care of all aspects but the description & module-specific parameter usage examples. However, the latter are added for default cases such as `tags` or `roleAssignments` if the corresponding parameter exists in the provided template. - -For further information about the parameter usage blocks, please refer to the [section](#special-case-parameter-usage-section) below. - ---- - -### _Navigation_ - -- [Location](#location) -- [What it does](#what-it-does) - - [Special case: 'Parameter Usage' section](#special-case-parameter-usage-section) -- [How to use it](#how-to-use-it) - - [Examples](#examples) - ---- -# Location - -You can find the script under `/utilities/tools/Set-ModuleReadMe.ps1` - -# What it does - -1. Using the provided template path, the script first makes sure to convert it to ARM if necessary (i.e. if a path to a bicep file was provided) -1. If the intended readMe file does not yet exist in the expected path, it is generated with a skeleton (with e.g. a generated header name, etc.) -1. It then goes through all sections defined as `SectionsToRefresh` (by default all) and refreshes the section content (for example for the `Parameters`) based on the values in the ARM template. It detects sections by their header and regenerates always the full section. -1. Once all are refreshed, the current ReadMe file is overwritten. **Note:** The script can be invoked with a `WhatIf` in combination with `Verbose` to just receive an console-output of the updated content. - -## Special case: 'Parameter Usage' section - -The 'Parameter Usage' examples are located just beneath the 'Parameters' table. They are intended to show how to use complex objects/arrays that can be provided as parameters (excluding child-resources as they have their own readMe). - -For the most part, this section is to be populated manually. However, for a specific set of common parameters, we automatically add their example to the readMe if the parameter exists in the template. At the time of this writing these are: -- Private Endpoints -- Role Assignments -- Tags -- User Assigned Identities - -To be able to change this list with minimum effort, the script reads the content from markdown files in the folder: `utilities/tools/moduleReadMeSource` and matches their title against the parameters of the template file. If a match is found, it's content is added to the readme alongside the generated header. This means, if you want to add another case, you just need to add a new file to the `moduleReadMeSource` folder and follow the naming pattern `resourceUsage-.md`. - -For example, the content of file `resourceUsage-roleAssignments.md` in folder `moduleReadMeSource` is added to a template's readMe if it contains a parameter `roleAssignments`. The combined result is: - -```markdown -### Parameter Usage: `roleAssignments` - -<[resourceUsage-roleAssignments.md] file content> -``` - -# How to use it - -The script can be called with the following parameters: - -| name | description | -|-|-| -| `TemplateFilePath` | The path to the template to update | -| `ReadMeFilePath` | The path to the readme to update. If not provided assumes a 'readme.md' file in the same folder as the template | -| `SectionsToRefresh` | Optional. The sections to update. By default it refreshes all that are supported.

Currently supports: 'Resource Types', 'Parameters', 'Outputs', 'Template references' | - - -## Example 1: Generate the Module ReadMe for the module 'LoadBalancer' -```powershell -. './utilities/tools/Set-ModuleReadMe.ps1' -Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/deploy.bicep' -``` - -## Example 2: Generate the Module ReadMe only for specific sections - -```powershell -. './utilities/tools/Set-ModuleReadMe.ps1' -Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/deploy.bicep' -SectionsToRefresh @('Parameters', 'Outputs') -``` -Updates only the sections `Parameters` & `Outputs`. Other sections remain untouched. - -## Example 3: Generate the Module ReadMe files into a specific folder path - -```powershell -. './utilities/tools/Set-ModuleReadMe.ps1' -Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/deploy.bicep' -ReadMeFilePath 'C:/differentFolder' -``` -Generates the ReadMe into a folder in path `C:/differentFolder` - -## Example 4: Generate the Module ReadMe for any template in a folder path -```powershell -. './utilities/tools/Set-ModuleReadMe.ps1' -$templatePaths = (Get-ChildItem 'C:/Microsoft.Network' -Filter 'deploy.bicep' -Recurse).FullName -$templatePaths | ForEach-Object { Set-ModuleReadMe -TemplateFilePath $_ } -``` diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index c0901576fd..7e4959fead 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -17,6 +17,9 @@ Mandatory. Name of the private bicep registry to publish to. .PARAMETER bicepRegistryRgName Mandatory. ResourceGroup of the private bicep registry to publish to. +.PARAMETER bicepRegistryRgLocation +Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing. + .PARAMETER customVersion Optional. A custom version that can be provided by the UI. '-' represents an empty value. @@ -38,6 +41,9 @@ function Publish-ModuleToPrivateBicepRegistry { [Parameter(Mandatory)] [string] $bicepRegistryRgName, + [Parameter(Mandatory = $false)] + [string] $bicepRegistryRgLocation, + [Parameter(Mandatory)] [string] $bicepRegistryName, @@ -61,6 +67,14 @@ function Publish-ModuleToPrivateBicepRegistry { throw "The template in path [$templateFilePath] is no bicep template." } + # Resource Group + if (-not (Get-AzResourceGroup -Name $bicepRegistryRgName -ErrorAction 'SilentlyContinue')) { + if ($PSCmdlet.ShouldProcess("Resource group [$bicepRegistryRgName] to location [$bicepRegistryRgLocation]", 'Deploy')) { + New-AzResourceGroup -Name $bicepRegistryRgName -Location $bicepRegistryRgLocation + } + } + + # Registry if (-not (Get-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -ErrorAction 'SilentlyContinue')) { if ($PSCmdlet.ShouldProcess("Container Registry [$bicepRegistryName] to resource group [$bicepRegistryRgName]", 'Deploy')) { From 38c982e9186106ee42ae4c06e839c04bb965e3bc Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 13:52:03 +0100 Subject: [PATCH 05/17] Update to latest --- ...reDevOpsPipelines.ps1 => Register-AzureDevOpsPipeline.ps1} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename utilities/tools/{Register-AzureDevOpsPipelines.ps1 => Register-AzureDevOpsPipeline.ps1} (99%) diff --git a/utilities/tools/Register-AzureDevOpsPipelines.ps1 b/utilities/tools/Register-AzureDevOpsPipeline.ps1 similarity index 99% rename from utilities/tools/Register-AzureDevOpsPipelines.ps1 rename to utilities/tools/Register-AzureDevOpsPipeline.ps1 index bee6cb2411..f98bcfd3ab 100644 --- a/utilities/tools/Register-AzureDevOpsPipelines.ps1 +++ b/utilities/tools/Register-AzureDevOpsPipeline.ps1 @@ -64,7 +64,7 @@ $inputObject = @{ GitHubPAT = '' AzureDevOpsPAT = '' } -Register-AzureDevOpsPipelines @inputObject +Register-AzureDevOpsPipeline @inputObject Registers all pipelines in the default path in the DevOps project [Contoso/CICD] by leveraging the given AzureDevOpsPAT and creating a service connection to GitHub using the provided GitHubPAT @@ -80,7 +80,7 @@ The steps you'd want to follow are - Service connection(s) used in the pipeline(s) - Agent pool(s) used in the pipeline(s) if not using the default available agents #> -function Register-AzureDevOpsPipelines { +function Register-AzureDevOpsPipeline { [CmdletBinding(SupportsShouldProcess)] param ( From f76fb8e0091d20e3a3d3afef4ea972839960998d Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 13:57:06 +0100 Subject: [PATCH 06/17] Temp excluded publish condition to test --- .azuredevops/modulePipelines/ms.analysisservices.servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml index 395a1dba9e..de273deb3a 100644 --- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml +++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml @@ -55,7 +55,7 @@ stages: - stage: Publishing displayName: Publish module - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + # condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) jobs: - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml parameters: From 503a27ab39380cbb5997527d1625fa5dd03ed70d Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 13:57:33 +0100 Subject: [PATCH 07/17] Update to latest --- .github/workflows/ms.analysisservices.servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml index c99ceea129..be691cfede 100644 --- a/.github/workflows/ms.analysisservices.servers.yml +++ b/.github/workflows/ms.analysisservices.servers.yml @@ -117,7 +117,7 @@ jobs: ############### job_publish_module: name: 'Publish module' - if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) + # if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) runs-on: ubuntu-20.04 needs: - job_set_workflow_param From 325c47660b61af3f9f8abe7f606989126be72aaf Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 13:58:28 +0100 Subject: [PATCH 08/17] Disabled jobs --- .../workflows/ms.analysisservices.servers.yml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml index be691cfede..b26d635b24 100644 --- a/.github/workflows/ms.analysisservices.servers.yml +++ b/.github/workflows/ms.analysisservices.servers.yml @@ -63,54 +63,54 @@ jobs: versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }} customVersion: ${{ steps.get-workflow-param.outputs.customVersion }} - #################### - # Pester Tests # - #################### - job_module_pester_validation: - runs-on: ubuntu-20.04 - name: 'Pester tests' - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: 'Run tests' - uses: ./.github/actions/templates/validateModulePester - with: - modulePath: '${{ env.modulePath }}' + # #################### + # # Pester Tests # + # #################### + # job_module_pester_validation: + # runs-on: ubuntu-20.04 + # name: 'Pester tests' + # steps: + # - name: 'Checkout' + # uses: actions/checkout@v2 + # with: + # fetch-depth: 0 + # - name: 'Run tests' + # uses: ./.github/actions/templates/validateModulePester + # with: + # modulePath: '${{ env.modulePath }}' - #################### - # Deployment tests # - #################### - job_module_deploy_validation: - runs-on: ubuntu-20.04 - name: 'Deployment tests' - needs: - - job_set_workflow_param - - job_module_pester_validation - strategy: - fail-fast: false - matrix: - parameterFilePaths: ['min.parameters.json', 'parameters.json'] - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set environment variables - uses: deep-mm/set-variables@v1.0 - with: - variableFileName: 'global.variables' - - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]' - uses: ./.github/actions/templates/validateModuleDeployment - with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}' - location: '${{ env.defaultLocation }}' - resourceGroupName: '${{ env.resourceGroupName }}' - subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}' + # #################### + # # Deployment tests # + # #################### + # job_module_deploy_validation: + # runs-on: ubuntu-20.04 + # name: 'Deployment tests' + # needs: + # - job_set_workflow_param + # - job_module_pester_validation + # strategy: + # fail-fast: false + # matrix: + # parameterFilePaths: ['min.parameters.json', 'parameters.json'] + # steps: + # - name: 'Checkout' + # uses: actions/checkout@v2 + # with: + # fetch-depth: 0 + # - name: Set environment variables + # uses: deep-mm/set-variables@v1.0 + # with: + # variableFileName: 'global.variables' + # - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]' + # uses: ./.github/actions/templates/validateModuleDeployment + # with: + # templateFilePath: '${{ env.modulePath }}/deploy.bicep' + # parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}' + # location: '${{ env.defaultLocation }}' + # resourceGroupName: '${{ env.resourceGroupName }}' + # subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' + # managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' + # removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}' ############### # PUBLISH # @@ -121,7 +121,7 @@ jobs: runs-on: ubuntu-20.04 needs: - job_set_workflow_param - - job_module_deploy_validation + # - job_module_deploy_validation steps: - name: 'Checkout' uses: actions/checkout@v2 From 226888dd1495186c5c67114919fd0f3a46bedb35 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:00:22 +0100 Subject: [PATCH 09/17] Disabled ado condition --- .../ms.analysisservices.servers.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml index de273deb3a..3379fa4cc6 100644 --- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml +++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml @@ -37,21 +37,21 @@ variables: - name: modulePath value: '/arm/Microsoft.AnalysisServices/servers' -stages: - - stage: Validation - displayName: Pester tests - jobs: - - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml + # stages: + # - stage: Validation + # displayName: Pester tests + # jobs: + # - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml - - stage: Deployment - displayName: Deployment tests - jobs: - - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml - parameters: - removeDeployment: '${{ parameters.removeDeployment }}' - deploymentBlocks: - - path: $(modulePath)/.parameters/min.parameters.json - - path: $(modulePath)/.parameters/parameters.json + # - stage: Deployment + # displayName: Deployment tests + # jobs: + # - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml + # parameters: + # removeDeployment: '${{ parameters.removeDeployment }}' + # deploymentBlocks: + # - path: $(modulePath)/.parameters/min.parameters.json + # - path: $(modulePath)/.parameters/parameters.json - stage: Publishing displayName: Publish module From 49be9227f63e7bc39ed57f27c4612129aca94d9a Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:01:24 +0100 Subject: [PATCH 10/17] Update to latest --- .azuredevops/modulePipelines/ms.analysisservices.servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml index 3379fa4cc6..cd9ada4b5f 100644 --- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml +++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml @@ -37,7 +37,7 @@ variables: - name: modulePath value: '/arm/Microsoft.AnalysisServices/servers' - # stages: + stages: # - stage: Validation # displayName: Pester tests # jobs: From 2523e9e559ef99234829e7252095c874f1711c6f Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:01:58 +0100 Subject: [PATCH 11/17] Update to latest --- .azuredevops/modulePipelines/ms.analysisservices.servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml index cd9ada4b5f..e344208f6b 100644 --- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml +++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml @@ -37,7 +37,7 @@ variables: - name: modulePath value: '/arm/Microsoft.AnalysisServices/servers' - stages: +stages: # - stage: Validation # displayName: Pester tests # jobs: From a106be62e885e5e6c33b0773b55417ff94ae52ba Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:08:42 +0100 Subject: [PATCH 12/17] Re-enabled original conditions & pipeline --- .../ms.analysisservices.servers.yml | 28 +++--- .../workflows/ms.analysisservices.servers.yml | 98 +++++++++---------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml index e344208f6b..395a1dba9e 100644 --- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml +++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml @@ -38,24 +38,24 @@ variables: value: '/arm/Microsoft.AnalysisServices/servers' stages: - # - stage: Validation - # displayName: Pester tests - # jobs: - # - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml + - stage: Validation + displayName: Pester tests + jobs: + - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml - # - stage: Deployment - # displayName: Deployment tests - # jobs: - # - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml - # parameters: - # removeDeployment: '${{ parameters.removeDeployment }}' - # deploymentBlocks: - # - path: $(modulePath)/.parameters/min.parameters.json - # - path: $(modulePath)/.parameters/parameters.json + - stage: Deployment + displayName: Deployment tests + jobs: + - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml + parameters: + removeDeployment: '${{ parameters.removeDeployment }}' + deploymentBlocks: + - path: $(modulePath)/.parameters/min.parameters.json + - path: $(modulePath)/.parameters/parameters.json - stage: Publishing displayName: Publish module - # condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) jobs: - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml parameters: diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml index b26d635b24..c99ceea129 100644 --- a/.github/workflows/ms.analysisservices.servers.yml +++ b/.github/workflows/ms.analysisservices.servers.yml @@ -63,65 +63,65 @@ jobs: versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }} customVersion: ${{ steps.get-workflow-param.outputs.customVersion }} - # #################### - # # Pester Tests # - # #################### - # job_module_pester_validation: - # runs-on: ubuntu-20.04 - # name: 'Pester tests' - # steps: - # - name: 'Checkout' - # uses: actions/checkout@v2 - # with: - # fetch-depth: 0 - # - name: 'Run tests' - # uses: ./.github/actions/templates/validateModulePester - # with: - # modulePath: '${{ env.modulePath }}' + #################### + # Pester Tests # + #################### + job_module_pester_validation: + runs-on: ubuntu-20.04 + name: 'Pester tests' + steps: + - name: 'Checkout' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: 'Run tests' + uses: ./.github/actions/templates/validateModulePester + with: + modulePath: '${{ env.modulePath }}' - # #################### - # # Deployment tests # - # #################### - # job_module_deploy_validation: - # runs-on: ubuntu-20.04 - # name: 'Deployment tests' - # needs: - # - job_set_workflow_param - # - job_module_pester_validation - # strategy: - # fail-fast: false - # matrix: - # parameterFilePaths: ['min.parameters.json', 'parameters.json'] - # steps: - # - name: 'Checkout' - # uses: actions/checkout@v2 - # with: - # fetch-depth: 0 - # - name: Set environment variables - # uses: deep-mm/set-variables@v1.0 - # with: - # variableFileName: 'global.variables' - # - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]' - # uses: ./.github/actions/templates/validateModuleDeployment - # with: - # templateFilePath: '${{ env.modulePath }}/deploy.bicep' - # parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}' - # location: '${{ env.defaultLocation }}' - # resourceGroupName: '${{ env.resourceGroupName }}' - # subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - # managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - # removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}' + #################### + # Deployment tests # + #################### + job_module_deploy_validation: + runs-on: ubuntu-20.04 + name: 'Deployment tests' + needs: + - job_set_workflow_param + - job_module_pester_validation + strategy: + fail-fast: false + matrix: + parameterFilePaths: ['min.parameters.json', 'parameters.json'] + steps: + - name: 'Checkout' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set environment variables + uses: deep-mm/set-variables@v1.0 + with: + variableFileName: 'global.variables' + - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]' + uses: ./.github/actions/templates/validateModuleDeployment + with: + templateFilePath: '${{ env.modulePath }}/deploy.bicep' + parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}' + location: '${{ env.defaultLocation }}' + resourceGroupName: '${{ env.resourceGroupName }}' + subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' + managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' + removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}' ############### # PUBLISH # ############### job_publish_module: name: 'Publish module' - # if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) + if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) runs-on: ubuntu-20.04 needs: - job_set_workflow_param - # - job_module_deploy_validation + - job_module_deploy_validation steps: - name: 'Checkout' uses: actions/checkout@v2 From d474ac752e5dade7cb5474bd49a86b6a37fbdbaa Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:11:38 +0100 Subject: [PATCH 13/17] Update to latest --- .../Publish-ModuleToPrivateBicepRegistry.ps1 | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 7e4959fead..752fab7b7f 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -17,9 +17,6 @@ Mandatory. Name of the private bicep registry to publish to. .PARAMETER bicepRegistryRgName Mandatory. ResourceGroup of the private bicep registry to publish to. -.PARAMETER bicepRegistryRgLocation -Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing. - .PARAMETER customVersion Optional. A custom version that can be provided by the UI. '-' represents an empty value. @@ -41,9 +38,6 @@ function Publish-ModuleToPrivateBicepRegistry { [Parameter(Mandatory)] [string] $bicepRegistryRgName, - [Parameter(Mandatory = $false)] - [string] $bicepRegistryRgLocation, - [Parameter(Mandatory)] [string] $bicepRegistryName, @@ -67,14 +61,6 @@ function Publish-ModuleToPrivateBicepRegistry { throw "The template in path [$templateFilePath] is no bicep template." } - # Resource Group - if (-not (Get-AzResourceGroup -Name $bicepRegistryRgName -ErrorAction 'SilentlyContinue')) { - if ($PSCmdlet.ShouldProcess("Resource group [$bicepRegistryRgName] to location [$bicepRegistryRgLocation]", 'Deploy')) { - New-AzResourceGroup -Name $bicepRegistryRgName -Location $bicepRegistryRgLocation - } - } - - # Registry if (-not (Get-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -ErrorAction 'SilentlyContinue')) { if ($PSCmdlet.ShouldProcess("Container Registry [$bicepRegistryName] to resource group [$bicepRegistryRgName]", 'Deploy')) { @@ -86,8 +72,7 @@ function Publish-ModuleToPrivateBicepRegistry { ## FIND AVAILABLE VERSION ## ################################# # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep - $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1] - $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower() + $ $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower() if (-not ($repositories = Get-AzContainerRegistryRepository -RegistryName $bicepRegistryName -ErrorAction 'SilentlyContinue')) { # No repositories yet @@ -154,3 +139,17 @@ function Publish-ModuleToPrivateBicepRegistry { Write-Debug ('{0} exited' -f $MyInvocation.MyCommand) } } + ############################################# + ## Publish to private bicep registry ## + ############################################# + $publishingTarget = 'br:{0}.azurecr.io/{1}:{2}' -f $bicepRegistryName, $moduleRegistryIdentifier, $newVersion + if ($PSCmdlet.ShouldProcess("Private bicep registry entry [$moduleRegistryIdentifier] version [$newVersion] to registry [$bicepRegistryName]", 'Publish')) { + bicep publish $templateFilePath --target $publishingTarget + } + Write-Verbose 'Publish complete' + } + + end { + Write-Debug ('{0} exited' -f $MyInvocation.MyCommand) + } +} From a172a104d6be281123529df9414a058ddd783028 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:11:45 +0100 Subject: [PATCH 14/17] Update to latest --- .../resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 752fab7b7f..206083efdc 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -72,7 +72,7 @@ function Publish-ModuleToPrivateBicepRegistry { ## FIND AVAILABLE VERSION ## ################################# # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep - $ $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower() + $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower() if (-not ($repositories = Get-AzContainerRegistryRepository -RegistryName $bicepRegistryName -ErrorAction 'SilentlyContinue')) { # No repositories yet @@ -138,7 +138,7 @@ function Publish-ModuleToPrivateBicepRegistry { end { Write-Debug ('{0} exited' -f $MyInvocation.MyCommand) } -} +} } ############################################# ## Publish to private bicep registry ## ############################################# From a607cdf282983ccdef5c02ba2abff8df11cc1fa6 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:11:58 +0100 Subject: [PATCH 15/17] Update to latest --- .../Publish-ModuleToPrivateBicepRegistry.ps1 | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 206083efdc..370ea05a84 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -17,6 +17,9 @@ Mandatory. Name of the private bicep registry to publish to. .PARAMETER bicepRegistryRgName Mandatory. ResourceGroup of the private bicep registry to publish to. +.PARAMETER bicepRegistryRgLocation +Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing. + .PARAMETER customVersion Optional. A custom version that can be provided by the UI. '-' represents an empty value. @@ -38,6 +41,9 @@ function Publish-ModuleToPrivateBicepRegistry { [Parameter(Mandatory)] [string] $bicepRegistryRgName, + [Parameter(Mandatory = $false)] + [string] $bicepRegistryRgLocation, + [Parameter(Mandatory)] [string] $bicepRegistryName, @@ -61,6 +67,13 @@ function Publish-ModuleToPrivateBicepRegistry { throw "The template in path [$templateFilePath] is no bicep template." } + # Resource Group + if (-not (Get-AzResourceGroup -Name $bicepRegistryRgName -ErrorAction 'SilentlyContinue')) { + if ($PSCmdlet.ShouldProcess("Resource group [$bicepRegistryRgName] to location [$bicepRegistryRgLocation]", 'Deploy')) { + New-AzResourceGroup -Name $bicepRegistryRgName -Location $bicepRegistryRgLocation + } + } + # Registry if (-not (Get-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -ErrorAction 'SilentlyContinue')) { if ($PSCmdlet.ShouldProcess("Container Registry [$bicepRegistryName] to resource group [$bicepRegistryRgName]", 'Deploy')) { @@ -72,6 +85,7 @@ function Publish-ModuleToPrivateBicepRegistry { ## FIND AVAILABLE VERSION ## ################################# # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep + $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1] $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower() if (-not ($repositories = Get-AzContainerRegistryRepository -RegistryName $bicepRegistryName -ErrorAction 'SilentlyContinue')) { @@ -124,21 +138,8 @@ function Publish-ModuleToPrivateBicepRegistry { if ($newVersionObject -lt $latestVersion -or $newVersionObject -eq $latestVersion) { throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the private bicep registry [{2}]' -f $newVersionObject.ToString(), $latestVersion.ToString(), $bicepRegistryName) } - - ############################################# - ## Publish to private bicep registry ## - ############################################# - $publishingTarget = 'br:{0}.azurecr.io/{1}:{2}' -f $bicepRegistryName, $moduleRegistryIdentifier, $newVersion - if ($PSCmdlet.ShouldProcess("Private bicep registry entry [$moduleRegistryIdentifier] version [$newVersion] to registry [$bicepRegistryName]", 'Publish')) { - bicep publish $templateFilePath --target $publishingTarget - } - Write-Verbose 'Publish complete' } - - end { - Write-Debug ('{0} exited' -f $MyInvocation.MyCommand) - } -} } +} ############################################# ## Publish to private bicep registry ## ############################################# From 6267af3b74cfe2322fbc976f103855d0dec9238a Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:12:29 +0100 Subject: [PATCH 16/17] Update to latest --- .../resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 370ea05a84..0165dd26a5 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -138,8 +138,7 @@ function Publish-ModuleToPrivateBicepRegistry { if ($newVersionObject -lt $latestVersion -or $newVersionObject -eq $latestVersion) { throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the private bicep registry [{2}]' -f $newVersionObject.ToString(), $latestVersion.ToString(), $bicepRegistryName) } - } -} + ############################################# ## Publish to private bicep registry ## ############################################# From 0152a44fecba74063c611fd96420103ffb82dfc5 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 23 Dec 2021 14:13:44 +0100 Subject: [PATCH 17/17] Undid unrelated wiki changes --- docs/wiki/UtilitiesConversionScript.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/docs/wiki/UtilitiesConversionScript.md b/docs/wiki/UtilitiesConversionScript.md index 77f6a12b51..215b1bb191 100644 --- a/docs/wiki/UtilitiesConversionScript.md +++ b/docs/wiki/UtilitiesConversionScript.md @@ -16,7 +16,7 @@ This page documents the conversion utility and how to use it. --- # Location -You can find the script under `/utilities/tools/ConvertTo-ARMTemplate.ps1` +`You can find the script under /utilities/tools/ConvertTo-ARMTemplate.ps1` # What it does @@ -27,27 +27,26 @@ by using the following steps. 1. Remove bicep metadata from json 1. Remove bicep files and folders 1. Update pipeline files - Replace .bicep with .json in pipeline files - # How to use it The script can be called with the following parameters: | name | description | |-|-| -| `Path` | The path to the root of the repo. | -| `ConvertChildren` | Convert child resource modules to bicep. | -| `SkipMetadataCleanup` | Skip Cleanup of bicep metadata from json files | -| `SkipBicepCleanUp` | Skip removal of bicep files and folders | -| `SkipPipelineUpdate` | Skip replacing .bicep with .json in pipeline files | +| -Path | The path to the root of the repo. | +| -ConvertChildren | Convert child resource modules to bicep. | +| -SkipMetadataCleanup | Skip Cleanup of bicep metadata from json files | +| -SkipBicepCleanUp | Skip removal of bicep files and folders | +| -SkipPipelineUpdate | Skip replacing .bicep with .json in pipeline files | -## Example 1: Convert top level bicep modules to json based ARM template, cleaning up all bicep files and folders and updating the workflow files to use the json files +## Examples +Converts top level bicep modules to json based ARM template, cleaning up all bicep files and folders and updating the workflow files to use the json files. ```powershell -. ./utilities/tools/ConvertTo-ARMTemplate.ps1 +. .\utilities\tools\ConvertTo-ARMTemplate.ps1 ``` -## Example 2: Only convert top level bicep modules to json based ARM template, keeping metadata in json, keeping all bicep files and folders, and not updating workflows - +Only converts top level bicep modules to json based ARM template, keeping metadata in json, keeping all bicep files and folders, and not updating workflows. ```powershell -. ./utilities/tools/ConvertTo-ARMTemplate.ps1 -ConvertChildren -SkipMetadataCleanup -SkipBicepCleanUp -SkipWorkflowUpdate +. .\utilities\tools\ConvertTo-ARMTemplate.ps1 -ConvertChildren -SkipMetadataCleanup -SkipBicepCleanUp -SkipWorkflowUpdate ```