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" } ] } diff --git a/modules/storage_account/management_policy/management_policy.tf b/modules/storage_account/management_policy/management_policy.tf index 71a51d32b3..3ee6b45bcc 100644 --- a/modules/storage_account/management_policy/management_policy.tf +++ b/modules/storage_account/management_policy/management_policy.tf @@ -34,10 +34,18 @@ resource "azurerm_storage_management_policy" "mgmt_policy" { content { tier_to_cool_after_days_since_modification_greater_than = try(base_blob.value.tier_to_cool_after_days_since_modification_greater_than, null) tier_to_cool_after_days_since_last_access_time_greater_than = try(base_blob.value.tier_to_cool_after_days_since_last_access_time_greater_than, null) + tier_to_cool_after_days_since_creation_greater_than = try(base_blob.value.tier_to_cool_after_days_since_creation_greater_than, null) + auto_tier_to_hot_from_cool_enabled = try(base_blob.value.auto_tier_to_hot_from_cool_enabled, null) tier_to_archive_after_days_since_modification_greater_than = try(base_blob.value.tier_to_archive_after_days_since_modification_greater_than, null) tier_to_archive_after_days_since_last_access_time_greater_than = try(base_blob.value.tier_to_archive_after_days_since_last_access_time_greater_than, null) + tier_to_archive_after_days_since_creation_greater_than = try(base_blob.value.tier_to_archive_after_days_since_creation_greater_than, null) + tier_to_archive_after_days_since_last_tier_change_greater_than = try(base_blob.value.tier_to_archive_after_days_since_last_tier_change_greater_than, null) + tier_to_cold_after_days_since_modification_greater_than = try(base_blob.value.tier_to_cold_after_days_since_modification_greater_than, null) + tier_to_cold_after_days_since_last_access_time_greater_than = try(base_blob.value.tier_to_cold_after_days_since_last_access_time_greater_than, null) + tier_to_cold_after_days_since_creation_greater_than = try(base_blob.value.tier_to_cold_after_days_since_creation_greater_than, null) delete_after_days_since_modification_greater_than = try(base_blob.value.delete_after_days_since_modification_greater_than, null) delete_after_days_since_last_access_time_greater_than = try(base_blob.value.delete_after_days_since_last_access_time_greater_than, null) + delete_after_days_since_creation_greater_than = try(base_blob.value.delete_after_days_since_creation_greater_than, null) } } @@ -45,9 +53,11 @@ resource "azurerm_storage_management_policy" "mgmt_policy" { for_each = try(rule.value.actions.snapshot, {}) content { - change_tier_to_archive_after_days_since_creation = try(snapshot.value.change_tier_to_archive_after_days_since_creation, null) - change_tier_to_cool_after_days_since_creation = try(snapshot.value.change_tier_to_cool_after_days_since_creation, null) - delete_after_days_since_creation_greater_than = try(snapshot.value.delete_after_days_since_creation_greater_than, null) + change_tier_to_archive_after_days_since_creation = try(snapshot.value.change_tier_to_archive_after_days_since_creation, null) + tier_to_archive_after_days_since_last_tier_change_greater_than = try(snapshot.value.tier_to_archive_after_days_since_last_tier_change_greater_than, null) + change_tier_to_cool_after_days_since_creation = try(snapshot.value.change_tier_to_cool_after_days_since_creation, null) + tier_to_cold_after_days_since_creation_greater_than = try(snapshot.value.tier_to_cold_after_days_since_creation_greater_than, null) + delete_after_days_since_creation_greater_than = try(snapshot.value.delete_after_days_since_creation_greater_than, null) } } @@ -55,12 +65,14 @@ resource "azurerm_storage_management_policy" "mgmt_policy" { for_each = try(rule.value.actions.version, {}) content { - change_tier_to_archive_after_days_since_creation = try(version.value.change_tier_to_archive_after_days_since_creation, null) - change_tier_to_cool_after_days_since_creation = try(version.value.change_tier_to_cool_after_days_since_creation, null) - delete_after_days_since_creation = try(version.value.delete_after_days_since_creation, null) + change_tier_to_archive_after_days_since_creation = try(version.value.change_tier_to_archive_after_days_since_creation, null) + tier_to_archive_after_days_since_last_tier_change_greater_than = try(version.value.tier_to_archive_after_days_since_last_tier_change_greater_than, null) + change_tier_to_cool_after_days_since_creation = try(version.value.change_tier_to_cool_after_days_since_creation, null) + tier_to_cold_after_days_since_creation_greater_than = try(version.value.tier_to_cold_after_days_since_creation_greater_than, null) + delete_after_days_since_creation = try(version.value.delete_after_days_since_creation, null) } } } } } -} \ No newline at end of file +}