From 819ab5d409415b99397c7b5ad784ce552a32afd1 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 17 Oct 2024 11:28:54 -0700 Subject: [PATCH] addding timeouts, addressing some drift --- .../app/terraform/modules/sftp/storage.tf | 22 ++++++++++++++++ .../app/terraform/modules/sftp/~inputs.tf | 25 +++++++++++++++++++ .../app/terraform/modules/storage/main.tf | 1 + 3 files changed, 48 insertions(+) diff --git a/operations/app/terraform/modules/sftp/storage.tf b/operations/app/terraform/modules/sftp/storage.tf index 5284414739e..f712935cfa0 100644 --- a/operations/app/terraform/modules/sftp/storage.tf +++ b/operations/app/terraform/modules/sftp/storage.tf @@ -7,6 +7,7 @@ resource "azurerm_storage_account" "sftp" { account_replication_type = "GRS" min_tls_version = "TLS1_2" allow_nested_items_to_be_public = false + large_file_share_enabled = false network_rules { default_action = "Allow" @@ -19,6 +20,13 @@ resource "azurerm_storage_account" "sftp" { tags = { environment = var.environment } + + timeouts { + create = var.timeout_create + read = var.timeout_read + delete = var.timeout_delete + update = var.timeout_update + } } # SSH host keys share @@ -26,6 +34,13 @@ resource "azurerm_storage_share" "sftp_admin" { name = "${var.resource_prefix}-sftp-admin-share" storage_account_name = azurerm_storage_account.sftp.name quota = 1 + + timeouts { + create = var.timeout_create + read = var.timeout_read + delete = var.timeout_delete + update = var.timeout_update + } } # SFTP startup scripts share @@ -33,6 +48,13 @@ resource "azurerm_storage_share" "sftp_scripts" { name = "${var.resource_prefix}-sftp-scripts-share" storage_account_name = azurerm_storage_account.sftp.name quota = 1 + + timeouts { + create = var.timeout_create + read = var.timeout_read + delete = var.timeout_delete + update = var.timeout_update + } } # SFTP startup script diff --git a/operations/app/terraform/modules/sftp/~inputs.tf b/operations/app/terraform/modules/sftp/~inputs.tf index 5b460dbcfea..3d5bdb1e6f4 100644 --- a/operations/app/terraform/modules/sftp/~inputs.tf +++ b/operations/app/terraform/modules/sftp/~inputs.tf @@ -60,3 +60,28 @@ variable "sshinstances" { variable "sftp_dir" { description = "SFTP Script Directory" } + +# TF timeouts for storage operations +variable "timeout_create" { + description = "Timeout for create operations" + type = string + default = "60m" # module default 30m +} + +variable "timeout_read" { + description = "Timeout for read operations" + type = string + default = "60m" # module default 5m +} + +variable "timeout_update" { + description = "Timeout for update operations" + type = string + default = "60m" # module default 30m +} + +variable "timeout_delete" { + description = "Timeout for delete operations" + type = string + default = "60m" # module default 30m +} \ No newline at end of file diff --git a/operations/app/terraform/modules/storage/main.tf b/operations/app/terraform/modules/storage/main.tf index db07e43d920..201bbe55632 100644 --- a/operations/app/terraform/modules/storage/main.tf +++ b/operations/app/terraform/modules/storage/main.tf @@ -175,6 +175,7 @@ resource "azurerm_storage_account" "storage_public" { allow_nested_items_to_be_public = false https_traffic_only_enabled = true local_user_enabled = false + large_file_share_enabled = false static_website { index_document = "index.html"