From 955821d9403b9aafa1c79248b231ad23f97003cd Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 2 Jul 2024 14:48:49 +0000 Subject: [PATCH 01/10] Apply terraform fmt --- .../configuration.tfvars | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars index 79f8ab921a..62c98ec3e1 100644 --- a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars +++ b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars @@ -27,14 +27,14 @@ cognitive_services_account = { # lz_key = "examples" key = "test-rg" } - name = "cs-test-1" - kind = "OpenAI" - sku_name = "S0" + name = "cs-test-1" + kind = "OpenAI" + sku_name = "S0" public_network_access_enabled = true identity = { type = "SystemAssigned, UserAssigned" // Can be "SystemAssigned, UserAssigned" or "SystemAssigned" or "UserAssigned" - key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned" + key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned" } tags = { From 79b2fdb48e53fb20a16a3349b52ecdad13f21216 Mon Sep 17 00:00:00 2001 From: kevindelmont <133667252+kevindelmont@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:29:42 +0200 Subject: [PATCH 02/10] add public_network_access_enabled for azurerm_postgresql_flexible_server (#21) add new argument public_network_access_enabled = try(var.settings.public_network_access_enabled, null) --- modules/databases/postgresql_flexible_server/server.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/databases/postgresql_flexible_server/server.tf b/modules/databases/postgresql_flexible_server/server.tf index 5a97256436..d912bdd8f8 100644 --- a/modules/databases/postgresql_flexible_server/server.tf +++ b/modules/databases/postgresql_flexible_server/server.tf @@ -17,6 +17,8 @@ resource "azurerm_postgresql_flexible_server" "postgresql" { zone = try(var.settings.zone, null) storage_mb = try(var.settings.storage_mb, null) + public_network_access_enabled = try(var.settings.public_network_access_enabled, null) + delegated_subnet_id = var.remote_objects.subnet_id private_dns_zone_id = var.remote_objects.private_dns_zone_id From 9b057facff6f7094e95c21b1ed1edbf280193715 Mon Sep 17 00:00:00 2001 From: kevindelmont <133667252+kevindelmont@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:37:59 +0200 Subject: [PATCH 03/10] =?UTF-8?q?Revert=20"add=20public=5Fnetwork=5Faccess?= =?UTF-8?q?=5Fenabled=20for=20azurerm=5Fpostgresql=5Fflexible=5Fser?= =?UTF-8?q?=E2=80=A6"=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 79b2fdb48e53fb20a16a3349b52ecdad13f21216. --- modules/databases/postgresql_flexible_server/server.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/databases/postgresql_flexible_server/server.tf b/modules/databases/postgresql_flexible_server/server.tf index d912bdd8f8..5a97256436 100644 --- a/modules/databases/postgresql_flexible_server/server.tf +++ b/modules/databases/postgresql_flexible_server/server.tf @@ -17,8 +17,6 @@ resource "azurerm_postgresql_flexible_server" "postgresql" { zone = try(var.settings.zone, null) storage_mb = try(var.settings.storage_mb, null) - public_network_access_enabled = try(var.settings.public_network_access_enabled, null) - delegated_subnet_id = var.remote_objects.subnet_id private_dns_zone_id = var.remote_objects.private_dns_zone_id From e563bc19f5e09970d3a24254e87e0ecb5e115e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20DELMONT?= Date: Wed, 10 Jul 2024 10:45:44 +0200 Subject: [PATCH 04/10] Add module maintenance assignment dynamic scope --- .github/workflows/standalone-scenarios.json | 1 + .../configuration.tfvars | 9 ++- .../configuration.tfvars | 69 +++++++++++++++++++ examples/module.tf | 1 + examples/variables.tf | 5 +- locals.combined_objects.tf | 1 + locals.tf | 1 + maintenance.tf | 16 ++++- .../assignment_dynamic_scope/main.tf | 14 ++++ .../assignment_dynamic_scope/module.tf | 23 +++++++ .../assignment_dynamic_scope/outputs.tf | 4 ++ .../assignment_dynamic_scope/variables.tf | 37 ++++++++++ 12 files changed, 170 insertions(+), 11 deletions(-) create mode 100644 examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars create mode 100644 modules/maintenance/assignment_dynamic_scope/main.tf create mode 100644 modules/maintenance/assignment_dynamic_scope/module.tf create mode 100644 modules/maintenance/assignment_dynamic_scope/outputs.tf create mode 100644 modules/maintenance/assignment_dynamic_scope/variables.tf diff --git a/.github/workflows/standalone-scenarios.json b/.github/workflows/standalone-scenarios.json index 36d5c48490..1ed770aecd 100644 --- a/.github/workflows/standalone-scenarios.json +++ b/.github/workflows/standalone-scenarios.json @@ -67,6 +67,7 @@ "maintenance_configuration/101-maintenance-configuration-schedule", "maintenance_configuration/200-maintenance-configuration-assignment-vm-windows", "maintenance_configuration/201-maintenance-configuration-assignment-vm-linux", + "maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope", "managed_service_identity/100-msi-levels", "maps/101-azure-maps-account", "messaging/eventgrid/100-simple-eventgrid-topic", diff --git a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars index 62c98ec3e1..1202e54c28 100644 --- a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars +++ b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars @@ -27,14 +27,14 @@ cognitive_services_account = { # lz_key = "examples" key = "test-rg" } - name = "cs-test-1" - kind = "OpenAI" - sku_name = "S0" + name = "cs-test-1" + kind = "OpenAI" + sku_name = "S0" public_network_access_enabled = true identity = { type = "SystemAssigned, UserAssigned" // Can be "SystemAssigned, UserAssigned" or "SystemAssigned" or "UserAssigned" - key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned" + key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned" } tags = { @@ -68,4 +68,3 @@ cognitive_services_account = { } } - diff --git a/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars b/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars new file mode 100644 index 0000000000..4950615d46 --- /dev/null +++ b/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars @@ -0,0 +1,69 @@ +global_settings = { + default_region = "region1" + regions = { + region1 = "northeurope" + } +} + +resource_groups = { + rg1 = { + name = "rsg_umc" + region = "region1" + } + rg2 = { + name = "rsg_umc2" + region = "region1" + } +} + +maintenance_configuration = { + mc_re1 = { + name = "example-mc" + region = "region1" + resource_group_key = "rg1" + scope = "InGuestPatch" + in_guest_user_patch_mode = "User" + window = { + start_date_time = "2023-06-08 15:04" + duration = "03:55" + time_zone = "Romance Standard Time" + recur_every = "2Day" + } + + install_patches = { + windows = { + classifications_to_include = ["Critical", "Security"] + # kb_numbers_to_exclude = ["KB123456", "KB789012"] + # kb_numbers_to_include = ["KB345678", "KB901234"] + } + reboot = "IfRequired" + } + # tags = {} # optional + } +} + +maintenance_assignment_dynamic_scope = { + example = { + name = "example-linux-tags" + maintenance_configuration_key = "mc_re1" + resource_group_key = ["rg1", "rg2"] + # resource_group_name = ["rsg_umc","rsg_umc2"] + filter = { + locations = ["West Europe", "France Central"] + os_types = ["Linux"] + resource_types = ["Microsoft.Compute/virtualMachines"] + tag_filter = "All" + tags = { + tag_example = { + tag = "foo" + values = ["barbar"] + } + tag_example2 = { + tag = "foo2" + values = ["barbar2"] + } + } + } + } +} + diff --git a/examples/module.tf b/examples/module.tf index f2fbbc1c6c..819c7bddb0 100644 --- a/examples/module.tf +++ b/examples/module.tf @@ -430,6 +430,7 @@ module "example" { maintenance = { maintenance_configuration = var.maintenance_configuration + maintenance_assignment_dynamic_scope = var.maintenance_assignment_dynamic_scope maintenance_assignment_virtual_machine = var.maintenance_assignment_virtual_machine } search_services = { diff --git a/examples/variables.tf b/examples/variables.tf index 53625d0dd2..ec4714881a 100644 --- a/examples/variables.tf +++ b/examples/variables.tf @@ -1123,10 +1123,7 @@ variable "cosmosdb_role_definitions" { variable "data_sources" { default = {} } -variable "maintenance_configuration" { - default = {} -} -variable "maintenance_assignment_virtual_machine" { +variable "maintenance" { default = {} } variable "search_services" { diff --git a/locals.combined_objects.tf b/locals.combined_objects.tf index 8505d87082..c6deecc4af 100644 --- a/locals.combined_objects.tf +++ b/locals.combined_objects.tf @@ -113,6 +113,7 @@ locals { combined_objects_logic_app_workflow = merge(tomap({ (local.client_config.landingzone_key) = module.logic_app_workflow }), try(var.remote_objects.logic_app_workflow, {}), try(var.data_sources.logic_app_workflow, {})) combined_objects_machine_learning = merge(tomap({ (local.client_config.landingzone_key) = module.machine_learning_workspaces }), try(var.remote_objects.machine_learning_workspaces, {}), try(var.data_sources.machine_learning_workspaces, {})) combined_objects_maintenance_configuration = merge(tomap({ (local.client_config.landingzone_key) = module.maintenance_configuration }), try(var.remote_objects.maintenance_configuration, {})) + combined_objects_maintenance_assignment_dynamic_scope = merge(tomap({ (local.client_config.landingzone_key) = module.maintenance_assignment_dynamic_scope }), try(var.remote_objects.maintenance_assignment_dynamic_scope, {})) combined_objects_maintenance_assignment_virtual_machine = merge(tomap({ (local.client_config.landingzone_key) = module.maintenance_assignment_virtual_machine }), try(var.remote_objects.maintenance_assignment_virtual_machine, {})) combined_objects_managed_identities = merge(tomap({ (local.client_config.landingzone_key) = module.managed_identities }), try(var.remote_objects.managed_identities, {}), try(var.data_sources.managed_identities, {})) combined_objects_maps_accounts = merge(tomap({ (local.client_config.landingzone_key) = module.maps_accounts }), try(var.remote_objects.maps_accounts, {})) diff --git a/locals.tf b/locals.tf index f6038e943f..bddbb3bc9c 100644 --- a/locals.tf +++ b/locals.tf @@ -466,6 +466,7 @@ locals { maintenance = { maintenance_configuration = try(var.maintenance.maintenance_configuration, {}) maintenance_assignment_virtual_machine = try(var.maintenance.maintenance_assignment_virtual_machine, {}) + maintenance_assignment_dynamic_scope = try(var.maintenance.maintenance_assignment_dynamic_scope, {}) } diff --git a/maintenance.tf b/maintenance.tf index 896772c45e..8dfed56244 100644 --- a/maintenance.tf +++ b/maintenance.tf @@ -38,7 +38,19 @@ output "maintenance_assignment_virtual_machine" { } +module "maintenance_assignment_dynamic_scope" { + source = "./modules/maintenance/assignment_dynamic_scope" + for_each = local.maintenance.maintenance_assignment_dynamic_scope + client_config = local.client_config + global_settings = local.global_settings + name = each.value.name + maintenance_configuration_id = can(each.value.maintenance_configuration_id) ? each.value.maintenance_configuration_id : local.combined_objects_maintenance_configuration[try(each.value.lz_key, local.client_config.landingzone_key)][each.value.maintenance_configuration_key].id + # resource_group_name = [for rg_key in each.value.resource_group_key : local.combined_objects_resource_groups[try(each.value.lz_key, local.client_config.landingzone_key)][rg_key].name] + resource_group_name = can(each.value.resource_group_name) ? each.value.resource_group_name : [for rg_key in each.value.resource_group_key : local.combined_objects_resource_groups[try(each.value.lz_key, local.client_config.landingzone_key)][rg_key].name] + settings = each.value +} - - +output "maintenance_assignment_dynamic_scope" { + value = module.maintenance_assignment_dynamic_scope +} diff --git a/modules/maintenance/assignment_dynamic_scope/main.tf b/modules/maintenance/assignment_dynamic_scope/main.tf new file mode 100644 index 0000000000..5c9cab5831 --- /dev/null +++ b/modules/maintenance/assignment_dynamic_scope/main.tf @@ -0,0 +1,14 @@ +terraform { + required_providers { + azurecaf = { + source = "aztfmod/azurecaf" + } + } + +} +locals { + module_tag = { + "module" = basename(abspath(path.module)) + } + tags = merge(var.base_tags, local.module_tag, try(var.tags, null)) +} \ No newline at end of file diff --git a/modules/maintenance/assignment_dynamic_scope/module.tf b/modules/maintenance/assignment_dynamic_scope/module.tf new file mode 100644 index 0000000000..d30d30022d --- /dev/null +++ b/modules/maintenance/assignment_dynamic_scope/module.tf @@ -0,0 +1,23 @@ +resource "azurerm_maintenance_assignment_dynamic_scope" "maintenance_assignment_dynamic_scope" { + name = var.name + maintenance_configuration_id = var.maintenance_configuration_id + + filter { + locations = try(var.settings.filter.locations, []) + os_types = try(var.settings.filter.os_types, []) + resource_groups = try(var.resource_group_name, []) + resource_types = try(var.settings.filter.resource_types, []) + tag_filter = try(var.settings.filter.tag_filter, null) + + dynamic "tags" { + for_each = { + for key, value in try(var.settings.filter.tags, {}) : key => value + } + + content { + tag = tags.value.tag + values = tags.value.values + } + } + } +} diff --git a/modules/maintenance/assignment_dynamic_scope/outputs.tf b/modules/maintenance/assignment_dynamic_scope/outputs.tf new file mode 100644 index 0000000000..c9a315aac3 --- /dev/null +++ b/modules/maintenance/assignment_dynamic_scope/outputs.tf @@ -0,0 +1,4 @@ +output "maintenance_assignment_dynamic_scope_id" { + description = "The ID of the Dynamic Maintenance Assignment." + value = azurerm_maintenance_assignment_dynamic_scope.maintenance_assignment_dynamic_scope.id +} \ No newline at end of file diff --git a/modules/maintenance/assignment_dynamic_scope/variables.tf b/modules/maintenance/assignment_dynamic_scope/variables.tf new file mode 100644 index 0000000000..005a144c14 --- /dev/null +++ b/modules/maintenance/assignment_dynamic_scope/variables.tf @@ -0,0 +1,37 @@ +variable "global_settings" { + description = "Global settings object (see module README.md)" +} + +variable "client_config" { + description = "Client configuration object (see module README.md)." +} + +variable "tags" { + description = "Tags to be used for this resource deployment." + type = map(any) + default = {} +} + +variable "base_tags" { + description = "Base tags for the resource to be inherited from the resource group." + type = map(any) + default = {} +} + +variable "maintenance_configuration_id" { + description = "(Required) Specifies the ID of the Maintenance Configuration Resource. Changing this forces a new resource to be created." + type = string +} + +variable "settings" { + description = "(Required) The configuration for each module" +} + +variable "name" { + description = "(Required) The name which should be used for this Dynamic Maintenance Assignment. Changing this forces a new Dynamic Maintenance Assignment to be created." + type = string +} + +variable "resource_group_name" { + description = "Resource group object" +} \ No newline at end of file From 629f67d563c768b6e577d3be09f528e0c49f5cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20DELMONT?= Date: Wed, 10 Jul 2024 10:47:06 +0200 Subject: [PATCH 05/10] fix --- .../configuration.tfvars | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars index 1202e54c28..79f8ab921a 100644 --- a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars +++ b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars @@ -68,3 +68,4 @@ cognitive_services_account = { } } + From 566b32f2182633fe00e3e5916f060d64190e5205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20DELMONT?= Date: Thu, 18 Jul 2024 14:55:38 +0200 Subject: [PATCH 06/10] fix resource_group filter --- .../configuration.tfvars | 19 ++++++++++++------- maintenance.tf | 10 +++++----- .../assignment_dynamic_scope/main.tf | 4 ++-- .../assignment_dynamic_scope/module.tf | 2 +- .../assignment_dynamic_scope/outputs.tf | 2 +- .../assignment_dynamic_scope/variables.tf | 8 ++++---- 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars b/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars index 4950615d46..7ce629e832 100644 --- a/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars +++ b/examples/maintenance_configuration/300-maintenance-configuration-assignment-dynamic-scope/configuration.tfvars @@ -44,15 +44,20 @@ maintenance_configuration = { maintenance_assignment_dynamic_scope = { example = { - name = "example-linux-tags" + name = "example-windows-tags" maintenance_configuration_key = "mc_re1" - resource_group_key = ["rg1", "rg2"] - # resource_group_name = ["rsg_umc","rsg_umc2"] filter = { - locations = ["West Europe", "France Central"] - os_types = ["Linux"] - resource_types = ["Microsoft.Compute/virtualMachines"] - tag_filter = "All" + # locations = ["France Central","Japan West"] + os_types = ["Windows"] + resource_types = ["Microsoft.Compute/virtualMachines"] + resource_group_key = ["rg1", "rg2"] + # resources_groups = { + # rg1 = { + # lz_key = "test" + # key = ["rg1", "rg2"] + # } + # } + tag_filter = "Any" tags = { tag_example = { tag = "foo" diff --git a/maintenance.tf b/maintenance.tf index 8dfed56244..77593ff295 100644 --- a/maintenance.tf +++ b/maintenance.tf @@ -39,15 +39,15 @@ output "maintenance_assignment_virtual_machine" { module "maintenance_assignment_dynamic_scope" { - source = "./modules/maintenance/assignment_dynamic_scope" - for_each = local.maintenance.maintenance_assignment_dynamic_scope + source = "./modules/maintenance/assignment_dynamic_scope" + depends_on = [module.maintenance_configuration] + for_each = local.maintenance.maintenance_assignment_dynamic_scope client_config = local.client_config global_settings = local.global_settings name = each.value.name - maintenance_configuration_id = can(each.value.maintenance_configuration_id) ? each.value.maintenance_configuration_id : local.combined_objects_maintenance_configuration[try(each.value.lz_key, local.client_config.landingzone_key)][each.value.maintenance_configuration_key].id - # resource_group_name = [for rg_key in each.value.resource_group_key : local.combined_objects_resource_groups[try(each.value.lz_key, local.client_config.landingzone_key)][rg_key].name] - resource_group_name = can(each.value.resource_group_name) ? each.value.resource_group_name : [for rg_key in each.value.resource_group_key : local.combined_objects_resource_groups[try(each.value.lz_key, local.client_config.landingzone_key)][rg_key].name] + maintenance_configuration_id = can(each.value.maintenance_configuration_id) ? each.value.maintenance_configuration_id : local.combined_objects_maintenance_configuration[try(each.value.lz_key, local.client_config.landingzone_key)][each.value.maintenance_configuration_key].id + resource_groups = local.combined_objects_resource_groups settings = each.value } diff --git a/modules/maintenance/assignment_dynamic_scope/main.tf b/modules/maintenance/assignment_dynamic_scope/main.tf index 5c9cab5831..64466a939c 100644 --- a/modules/maintenance/assignment_dynamic_scope/main.tf +++ b/modules/maintenance/assignment_dynamic_scope/main.tf @@ -10,5 +10,5 @@ locals { module_tag = { "module" = basename(abspath(path.module)) } - tags = merge(var.base_tags, local.module_tag, try(var.tags, null)) -} \ No newline at end of file + tags = merge(var.base_tags, local.module_tag, try(var.tags, null)) +} diff --git a/modules/maintenance/assignment_dynamic_scope/module.tf b/modules/maintenance/assignment_dynamic_scope/module.tf index d30d30022d..3d6e4f5c43 100644 --- a/modules/maintenance/assignment_dynamic_scope/module.tf +++ b/modules/maintenance/assignment_dynamic_scope/module.tf @@ -5,7 +5,7 @@ resource "azurerm_maintenance_assignment_dynamic_scope" "maintenance_assignment_ filter { locations = try(var.settings.filter.locations, []) os_types = try(var.settings.filter.os_types, []) - resource_groups = try(var.resource_group_name, []) + resource_groups = try(flatten([for rg_key in var.settings.filter.resource_group_key : var.resource_groups[var.client_config.landingzone_key][rg_key].name]), try(flatten([for rg, rg_data in var.settings.filter.resources_groups : [for key in rg_data.key : var.resource_groups[var.client_config.landingzone_key][key].name]]), try(flatten([for rg, rg_data in var.settings.filter.resources_groups : [for key in rg_data.key : var.resource_groups[rg_data.lz_key][key].name]]), []))) resource_types = try(var.settings.filter.resource_types, []) tag_filter = try(var.settings.filter.tag_filter, null) diff --git a/modules/maintenance/assignment_dynamic_scope/outputs.tf b/modules/maintenance/assignment_dynamic_scope/outputs.tf index c9a315aac3..c6263ff893 100644 --- a/modules/maintenance/assignment_dynamic_scope/outputs.tf +++ b/modules/maintenance/assignment_dynamic_scope/outputs.tf @@ -1,4 +1,4 @@ output "maintenance_assignment_dynamic_scope_id" { description = "The ID of the Dynamic Maintenance Assignment." value = azurerm_maintenance_assignment_dynamic_scope.maintenance_assignment_dynamic_scope.id -} \ No newline at end of file +} diff --git a/modules/maintenance/assignment_dynamic_scope/variables.tf b/modules/maintenance/assignment_dynamic_scope/variables.tf index 005a144c14..9b287e0f8b 100644 --- a/modules/maintenance/assignment_dynamic_scope/variables.tf +++ b/modules/maintenance/assignment_dynamic_scope/variables.tf @@ -2,6 +2,10 @@ variable "global_settings" { description = "Global settings object (see module README.md)" } +variable "resource_groups" { + description = "(Required) The resource group objects where to create the resource." +} + variable "client_config" { description = "Client configuration object (see module README.md)." } @@ -31,7 +35,3 @@ variable "name" { description = "(Required) The name which should be used for this Dynamic Maintenance Assignment. Changing this forces a new Dynamic Maintenance Assignment to be created." type = string } - -variable "resource_group_name" { - description = "Resource group object" -} \ No newline at end of file From d415b4baa7437130be0c1254dec4c3dbb6f2dde6 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 13 Aug 2024 13:11:48 +0000 Subject: [PATCH 07/10] Apply terraform fmt --- .../configuration.tfvars | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars index 79f8ab921a..62c98ec3e1 100644 --- a/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars +++ b/examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars @@ -27,14 +27,14 @@ cognitive_services_account = { # lz_key = "examples" key = "test-rg" } - name = "cs-test-1" - kind = "OpenAI" - sku_name = "S0" + name = "cs-test-1" + kind = "OpenAI" + sku_name = "S0" public_network_access_enabled = true identity = { type = "SystemAssigned, UserAssigned" // Can be "SystemAssigned, UserAssigned" or "SystemAssigned" or "UserAssigned" - key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned" + key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned" } tags = { From d1c6e0970166ba26792ba54315c86c5bb0b94df8 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 11 Sep 2024 12:06:22 +0000 Subject: [PATCH 08/10] Apply terraform fmt --- .../configuration.tfvars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/azuread/107-azuread-application-with-single-page-application/configuration.tfvars b/examples/azuread/107-azuread-application-with-single-page-application/configuration.tfvars index be32857be7..a8a7b91a7e 100644 --- a/examples/azuread/107-azuread-application-with-single-page-application/configuration.tfvars +++ b/examples/azuread/107-azuread-application-with-single-page-application/configuration.tfvars @@ -56,8 +56,8 @@ azuread_applications = { admin_consent_description = "Allow to administer app2." admin_consent_display_name = "Administer app2" enabled = true - type = "Admin" - value = "app2" + type = "Admin" + value = "app2" } ] } From 52538dc0f8f6b073cd931d57504e4a41564467c3 Mon Sep 17 00:00:00 2001 From: kevindelmont <133667252+kevindelmont@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:24:06 +0200 Subject: [PATCH 09/10] Update main.tf --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 605b96986c..62592bce80 100644 --- a/main.tf +++ b/main.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 3.105.0" + version = "~> 3.114.0" configuration_aliases = [ azurerm.vhub ] From 7af17387705974557a34085eed27df819bbf0ca1 Mon Sep 17 00:00:00 2001 From: kevindelmont <133667252+kevindelmont@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:25:51 +0200 Subject: [PATCH 10/10] Update locals.tf --- locals.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locals.tf b/locals.tf index a04d08c61c..f7425d601d 100644 --- a/locals.tf +++ b/locals.tf @@ -197,12 +197,14 @@ locals { app_config = local.combined_objects_app_config azure_container_registries = local.combined_objects_azure_container_registries client_config = tomap({ (local.client_config.landingzone_key) = { config = local.client_config } }) + cosmos_dbs = local.combined_objects_cosmos_dbs keyvaults = local.combined_objects_keyvaults machine_learning_workspaces = local.combined_objects_machine_learning managed_identities = local.combined_objects_managed_identities mssql_databases = local.combined_objects_mssql_databases mssql_servers = local.combined_objects_mssql_servers maintenance_configuration = local.combined_objects_maintenance_configuration + signalr_services = local.combined_objects_signalr_services storage_accounts = local.combined_objects_storage_accounts networking = local.combined_objects_networking }