From e0b4aee444bc2dfefb7417756ed9166486c24c8d Mon Sep 17 00:00:00 2001 From: Matt White Date: Wed, 30 Mar 2022 11:25:40 +0100 Subject: [PATCH] v1.1.4 --- README.md | 13 +++++++++++-- locals.tf | 2 +- terraform.tf | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a7c93d980..0076cc5f8 100644 --- a/README.md +++ b/README.md @@ -109,10 +109,12 @@ Please refer to the [Deploy Identity Resources][wiki_deploy_identity_resources] ## Terraform versions -This module has been tested using Terraform `0.15.0` and AzureRM Provider `2.77.0` as a baseline, and various versions to up the most recent at the time of release. +This module has been tested using Terraform `0.15.0` and AzureRM Provider `2.96.0` as a baseline, and various versions to up `v2.99.0`. In some cases, individual versions of the AzureRM provider may cause errors. If this happens, we advise upgrading to the latest version and checking our [troubleshooting][wiki_troubleshooting] guide before [raising an issue](https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/issues). +> Note that currently azurerm provider version `v3.0.0` and above are not supported by this module. + ## Usage As a basic starting point, we recommend starting with the following configuration in your root module. @@ -132,7 +134,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 2.77.0" + version = ">= 2.96.0" } } } @@ -198,16 +200,21 @@ For the latest examples, please refer to our [Examples][wiki_examples] guide on - [Deploy Connectivity Resources][wiki_deploy_connectivity_resources] - [Deploy Identity Resources][wiki_deploy_identity_resources] - [Deploy Management Resources][wiki_deploy_management_resources] + - [Assign a Built-in Policy][wiki_assign_a_built_in_policy] - [Examples - Level 300][wiki_examples_level_300] - [Deploy Connectivity Resources With Custom Settings][wiki_deploy_connectivity_resources_custom] - [Deploy Identity Resources With Custom Settings][wiki_deploy_identity_resources_custom] - [Deploy Management Resources With Custom Settings][wiki_deploy_management_resources_custom] - [Expand Built-in Archetype Definitions][wiki_expand_built_in_archetype_definitions] + - [Create Custom Policies, Policy Sets and Assignments][wiki_create_custom_policies_policy_sets_and_assignments] - [Override Module Role Assignments][wiki_override_module_role_assignments] - [Deploy Using Module Nesting][wiki_deploy_using_module_nesting] ## Release Notes +Release `v1.1.4` is a hotfix release to add a `azurerm` provider verison constraint of `< 3.0.0`. +This is a workaround for the resource schema changes as reported in issue [#309](https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/issues/309). + Release `v1.1.3` is a hotfix relating to support for using YAML with archetype extensions and exclusions. Release `v1.1.2` introduces the following changes: @@ -382,3 +389,5 @@ Replace `./` with `https://github.com/Azure/terraform-azurerm-caf-enterprise-sca [wiki_contributing_to_documentation]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/Contributing-to-Documentation "Wiki - Contributing to Documentation" [wiki_expand_built_in_archetype_definitions]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Expand-Built-in-Archetype-Definitions "Wiki - Expand Built-in Archetype Definitions" [wiki_override_module_role_assignments]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Override-Module-Role-Assignments "Wiki - Override Module Role Assignments" +[wiki_create_custom_policies_policy_sets_and_assignments]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Create-Custom-Policies-Policy-Sets-and-Assignments "Wiki - Create Custom Policies, Policy Sets and Assignments" +[wiki_assign_a_built_in_policy]: https://github.com/Azure/terraform-azurerm-caf-enterprise-scale/wiki/%5BExamples%5D-Assign-a-Built-in-Policy "Wiki - Assign a Built-in Policy" diff --git a/locals.tf b/locals.tf index fbb3ccaf4..8432e9bb8 100644 --- a/locals.tf +++ b/locals.tf @@ -48,7 +48,7 @@ locals { # tag blocks for each sub-module locals { base_module_tags = { - deployedBy = "terraform/azure/caf-enterprise-scale/v1.1.3" + deployedBy = "terraform/azure/caf-enterprise-scale/v1.1.4" } connectivity_resources_tags = merge( local.disable_base_module_tags ? local.empty_map : local.base_module_tags, diff --git a/terraform.tf b/terraform.tf index 8af259507..4dd2bb9c4 100644 --- a/terraform.tf +++ b/terraform.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 2.77.0" + version = ">= 2.77.0, < 3.0.0" configuration_aliases = [ azurerm.connectivity, azurerm.management,