From 955821d9403b9aafa1c79248b231ad23f97003cd Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 2 Jul 2024 14:48:49 +0000 Subject: [PATCH 1/7] 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 2/7] 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 3/7] =?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 d415b4baa7437130be0c1254dec4c3dbb6f2dde6 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 13 Aug 2024 13:11:48 +0000 Subject: [PATCH 4/7] 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 5/7] 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 dd11e6327eef6bd3cc9f8e5c16c5bb44ec9acdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20DELMONT?= Date: Mon, 16 Dec 2024 11:45:43 +0100 Subject: [PATCH 6/7] Add tiering policy for recovery vault backup --- .../101-simple-asrv/configuration.tfvars | 5 +++++ modules/recovery_vault/backup_policies_vm.tf | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/examples/recovery_vault/101-simple-asrv/configuration.tfvars b/examples/recovery_vault/101-simple-asrv/configuration.tfvars index 34e3032ef4..60573e165a 100644 --- a/examples/recovery_vault/101-simple-asrv/configuration.tfvars +++ b/examples/recovery_vault/101-simple-asrv/configuration.tfvars @@ -60,6 +60,11 @@ recovery_vaults = { weeks = ["Last"] months = ["January"] } + tiering_policy = { + mode = "TierAfter" + duration = 3 + duration_type = "Weeks" + } } } diff --git a/modules/recovery_vault/backup_policies_vm.tf b/modules/recovery_vault/backup_policies_vm.tf index da18ae313a..ca39519169 100644 --- a/modules/recovery_vault/backup_policies_vm.tf +++ b/modules/recovery_vault/backup_policies_vm.tf @@ -60,4 +60,15 @@ resource "azurerm_backup_policy_vm" "vm" { months = each.value.retention_yearly.months } } + + dynamic "tiering_policy" { + for_each = lookup(each.value, "tiering_policy", null) == null ? [] : [1] + content { + archived_restore_point { + mode = lookup(each.value.tiering_policy, "mode", null) + duration = try(each.value.tiering_policy.duration, null) + duration_type = try(each.value.tiering_policy.type, null) + } + } + } } From 110f3890c5c445127004619d308f0adebdb52af1 Mon Sep 17 00:00:00 2001 From: kevindelmont <133667252+kevindelmont@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:11:22 +0100 Subject: [PATCH 7/7] fixed duration type --- modules/recovery_vault/backup_policies_vm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/recovery_vault/backup_policies_vm.tf b/modules/recovery_vault/backup_policies_vm.tf index ca39519169..a595328901 100644 --- a/modules/recovery_vault/backup_policies_vm.tf +++ b/modules/recovery_vault/backup_policies_vm.tf @@ -67,7 +67,7 @@ resource "azurerm_backup_policy_vm" "vm" { archived_restore_point { mode = lookup(each.value.tiering_policy, "mode", null) duration = try(each.value.tiering_policy.duration, null) - duration_type = try(each.value.tiering_policy.type, null) + duration_type = try(each.value.tiering_policy.duration_type, null) } } }