Merge pull request #16250 from CDCgov/ms/devsecops/tf-timeouts

add timeouts to other instances of azurerm_storage_account
CDCgov · Oct 17, 2024 · 2bc83f9 · 2bc83f9
2 parents a5a4b64 + 423be11
commit 2bc83f9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
+  }
 }