Merge branch 'main' into joshi/updateswaggerrenderer

microsoft · Jul 7, 2024 · 5a15940 · 5a15940
2 parents a8e682b + 23b5e69
commit 5a15940
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/deployment/terraform/resources/storage_account.tf b/deployment/terraform/resources/storage_account.tf
@@ -9,7 +9,7 @@ resource "azurerm_storage_account" "pc" {
 
   network_rules {
     default_action             = "Deny"
-    virtual_network_subnet_ids = [azurerm_subnet.node_subnet.id, azurerm_subnet.function_subnet.id]
+    virtual_network_subnet_ids = [azurerm_subnet.node_subnet.id, azurerm_subnet.function_subnet.id, data.azurerm_subnet.sas_node_subnet.id]
   }
 
   # Disabling shared access keys breaks terraform's ability to do subsequent

diff --git a/deployment/terraform/resources/variables.tf b/deployment/terraform/resources/variables.tf
@@ -144,6 +144,17 @@ variable "func_storage_account_url" {
   type = string
 }
 
+variable "sas_node_subnet_name" {
+  type = string
+}
+
+variable "sas_node_subnet_virtual_network_name" {
+  type = string
+}
+
+variable "sas_node_subnet_resource_group_name" {
+  type = string
+}
 # -----------------
 # Local variables
 

diff --git a/deployment/terraform/resources/vnet.tf b/deployment/terraform/resources/vnet.tf
@@ -26,6 +26,12 @@ resource "azurerm_subnet" "cache_subnet" {
   service_endpoints    = []
 }
 
+data "azurerm_subnet" "sas_node_subnet" {
+  name                 = var.sas_node_subnet_name
+  virtual_network_name = var.sas_node_subnet_virtual_network_name
+  resource_group_name  = var.sas_node_subnet_resource_group_name
+}
+
 resource "azurerm_subnet" "function_subnet" {
   name                 = "${local.prefix}-functions-subnet"
   virtual_network_name = azurerm_virtual_network.pc.name

diff --git a/deployment/terraform/staging/main.tf b/deployment/terraform/staging/main.tf
@@ -26,6 +26,10 @@ module "resources" {
   prod_log_analytics_workspace_id   = "78d48390-b6bb-49a9-b7fd-a86f6522e9c4"
   func_storage_account_url          = "https://pctapisstagingsa.table.core.windows.net/"
   banned_ip_table                   = "blobstoragebannedip"
+
+  sas_node_subnet_name                 = "pct-sas-westeurope-staging-node-subnet"
+  sas_node_subnet_virtual_network_name = "pct-sas-westeurope-staging-network"
+  sas_node_subnet_resource_group_name  = "pct-sas-westeurope-staging_rg"
 }
 
 terraform {