Skip to content
This repository has been archived by the owner on Jul 26, 2024. It is now read-only.

Update eslz to 4.2.0 and fix minor issues #491

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Update eslz to 4.2.0 and fix minor issues #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions caf_solution/add-ons/caf_eslz/custom_landing_zones.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ locals {
for key, value in mg_value.subscriptions : local.caf.subscriptions[value.lz_key][value.key].subscription_id
],
try(split(",", data.external.reconcile_susbscription_ids_from_management_groups[mg_id].result.subscription_ids), []),
try(mg_value.subscription_ids, [])
)
mg_value.subscription_ids != null ? mg_value.subscription_ids : [""])
)

}
}

Expand Down
2 changes: 1 addition & 1 deletion caf_solution/add-ons/caf_eslz/enterprise_scale.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module "enterprise_scale" {
source = "Azure/caf-enterprise-scale/azurerm"
version = "3.3.0"
version = "4.2.0"

# source = "/tf/caf/alz"

Expand Down
2 changes: 1 addition & 1 deletion caf_solution/add-ons/caf_eslz/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.35.0"
version = "~> 3.54.0"
}
}
required_version = ">= 1.3.5"
Expand Down
2 changes: 1 addition & 1 deletion caf_solution/add-ons/caf_eslz/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ variable "custom_landing_zones" {
object({
display_name = string
parent_management_group_id = string
subscription_ids = list(string)
subscription_ids = optional(list(string))
subscriptions = map(
object({
lz_key = string
Expand Down