From 79f8863b9215af4244dfe9d8a32c585c0586bbb6 Mon Sep 17 00:00:00 2001 From: Jack Tracey <41163455+jtracey93@users.noreply.github.com> Date: Tue, 25 Jul 2023 15:29:21 +0100 Subject: [PATCH] Prep for `v0.16.0` and Fix #585 (#586) * version changes * fix #585 * additional fixes --- docs/wiki/Accelerator.md | 8 ++++---- ...policy_assignment_es_deny_resource_locations.tmpl.json | 7 ++----- .../policy_assignment_es_deny_rsg_locations.tmpl.json | 7 +++++-- ...policy_assignment_es_deny_resource_locations.tmpl.json | 3 --- .../policy_assignment_es_deny_rsg_locations.tmpl.json | 7 +++++-- version.json | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/wiki/Accelerator.md b/docs/wiki/Accelerator.md index 7be1bb85a..240bbe3fc 100644 --- a/docs/wiki/Accelerator.md +++ b/docs/wiki/Accelerator.md @@ -267,16 +267,16 @@ With the ALZ Accelerator framework, we have designed the pipelines and directory 1. Using the ALZ PowerShell Module, there is a cmdlet called `Get-ALZBicepRelease`. This will download a specified release version from the remote ALZ-Bicep repository and pull down to the local directory where your Accelerator framework was initially deployed. - Here is an example of using the cmdlet to pull down version v0.15.0: + Here is an example of using the cmdlet to pull down version v0.16.0: ```powershell - Get-ALZGithubRelease -githubRepoUrl "https://github.com/Azure/ALZ-Bicep" -releases "v0.15.0" -directoryForReleases "C:\Repos\ALZ\accelerator\upstream-releases\" + Get-ALZGithubRelease -githubRepoUrl "https://github.com/Azure/ALZ-Bicep" -releases "v0.16.0" -directoryForReleases "C:\Repos\ALZ\accelerator\upstream-releases\" ``` -1. Once the ALZ Bicep release has been downloaded, you will need to update `upstream-releases-version` within the environment variables file (.env) with the version number of the release that you just downloaded. For example, if you downloaded v0.15.0, you would update the file with the following: +1. Once the ALZ Bicep release has been downloaded, you will need to update `upstream-releases-version` within the environment variables file (.env) with the version number of the release that you just downloaded. For example, if you downloaded v0.16.0, you would update the file with the following: ```text - UPSTREAM_RELEASE_VERSION="v0.15.0" + UPSTREAM_RELEASE_VERSION="v0.16.0" ``` 1. You can now deploy the updated modules. diff --git a/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json b/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json index ef3f7cddc..8987d21d7 100644 --- a/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json +++ b/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json @@ -7,13 +7,10 @@ "displayName": "Limit allowed locations for Resources", "notScopes": [], "parameters": { - "effect": { - "value": "deny" - }, "listOfAllowedLocations": { "value": [ - "uksouth", - "ukwest" + "chinanorth", + "chinaeast" ] } }, diff --git a/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json b/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json index bb368ceb3..85ce629b1 100644 --- a/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json +++ b/infra-as-code/bicep/modules/policy/assignments/lib/china/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json @@ -7,8 +7,11 @@ "displayName": "Limit allowed locations for Resource Groups", "notScopes": [], "parameters": { - "effect": { - "value": "deny" + "listOfAllowedLocations": { + "value": [ + "chinanorth", + "chinaeast" + ] } }, "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e765b5de-1225-4ba3-bd56-1ac6695af988", diff --git a/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json b/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json index ef3f7cddc..ce36f684c 100644 --- a/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json +++ b/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_resource_locations.tmpl.json @@ -7,9 +7,6 @@ "displayName": "Limit allowed locations for Resources", "notScopes": [], "parameters": { - "effect": { - "value": "deny" - }, "listOfAllowedLocations": { "value": [ "uksouth", diff --git a/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json b/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json index bb368ceb3..bf27cdbbf 100644 --- a/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json +++ b/infra-as-code/bicep/modules/policy/assignments/lib/policy_assignments/policy_assignment_es_deny_rsg_locations.tmpl.json @@ -7,8 +7,11 @@ "displayName": "Limit allowed locations for Resource Groups", "notScopes": [], "parameters": { - "effect": { - "value": "deny" + "listOfAllowedLocations": { + "value": [ + "uksouth", + "ukwest" + ] } }, "policyDefinitionId": "/providers/Microsoft.Authorization/policyDefinitions/e765b5de-1225-4ba3-bd56-1ac6695af988", diff --git a/version.json b/version.json index 96e9a0312..69b3c808d 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { - "version": "0.15.0", - "gitTag": "v0.15.0", - "releaseNotes": "https://github.com/Azure/ALZ-Bicep/releases/tag/v0.15.0", - "releaseDateTimeUTC": "20230621T1142433932Z" + "version": "0.16.0", + "gitTag": "v0.16.0", + "releaseNotes": "https://github.com/Azure/ALZ-Bicep/releases/tag/v0.16.0", + "releaseDateTimeUTC": "20230725T1242492634Z" }