diff --git a/operations/app/terraform/modules/storage/candidate_slot.tf b/operations/app/terraform/modules/storage/candidate_slot.tf index 6fa9feadd23..4750011c859 100644 --- a/operations/app/terraform/modules/storage/candidate_slot.tf +++ b/operations/app/terraform/modules/storage/candidate_slot.tf @@ -8,7 +8,7 @@ resource "azurerm_storage_account" "storage_account_candidate" { account_replication_type = "GRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false - enable_https_traffic_only = true + https_traffic_only_enabled = true local_user_enabled = false network_rules { @@ -38,6 +38,13 @@ resource "azurerm_storage_account" "storage_account_candidate" { tags = { environment = var.environment } + + timeouts { + create = var.timeout_create + read = var.timeout_read + delete = var.timeout_delete + update = var.timeout_update + } } module "storageaccount_candidate_blob_private_endpoint" { @@ -155,7 +162,7 @@ resource "azurerm_storage_account" "storage_partner_candidate" { account_replication_type = "GRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false - enable_https_traffic_only = true + https_traffic_only_enabled = true local_user_enabled = false network_rules { @@ -191,6 +198,13 @@ resource "azurerm_storage_account" "storage_partner_candidate" { tags = { environment = var.environment } + + timeouts { + create = var.timeout_create + read = var.timeout_read + delete = var.timeout_delete + update = var.timeout_update + } } # Grant the storage account Key Vault access, to access encryption keys diff --git a/operations/app/terraform/modules/storage/main.tf b/operations/app/terraform/modules/storage/main.tf index 1170df1cf1b..db07e43d920 100644 --- a/operations/app/terraform/modules/storage/main.tf +++ b/operations/app/terraform/modules/storage/main.tf @@ -8,7 +8,7 @@ resource "azurerm_storage_account" "storage_account" { account_replication_type = "GRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false - enable_https_traffic_only = true + https_traffic_only_enabled = true local_user_enabled = false network_rules { @@ -173,7 +173,7 @@ resource "azurerm_storage_account" "storage_public" { account_replication_type = "GRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false - enable_https_traffic_only = true + https_traffic_only_enabled = true local_user_enabled = false static_website { @@ -223,7 +223,7 @@ resource "azurerm_storage_account" "storage_partner" { account_replication_type = "GRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false - enable_https_traffic_only = true + https_traffic_only_enabled = true local_user_enabled = false network_rules { diff --git a/operations/app/terraform/modules/storage/trial_frontends.tf b/operations/app/terraform/modules/storage/trial_frontends.tf index 0ff68c67d35..43b5ee7eda2 100644 --- a/operations/app/terraform/modules/storage/trial_frontends.tf +++ b/operations/app/terraform/modules/storage/trial_frontends.tf @@ -9,7 +9,7 @@ resource "azurerm_storage_account" "storage_trials" { account_replication_type = "LRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false - enable_https_traffic_only = true + https_traffic_only_enabled = true local_user_enabled = false static_website { @@ -28,4 +28,11 @@ resource "azurerm_storage_account" "storage_trials" { tags = { environment = var.environment } + + timeouts { + create = var.timeout_create + read = var.timeout_read + delete = var.timeout_delete + update = var.timeout_update + } }