oh lawd

solita · Apr 25, 2024 · 3df1084 · 3df1084
1 parent e6266a5
commit 3df1084
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/main.tf b/main.tf
@@ -18,19 +18,19 @@ module "network" {
 } */
 
 module "function_app" {
-  source      = "./modules/FunctionApp"
-  tags        = var.tags
-  rg          = var.rg
-  location    = var.location
-  private_storage_name = module.storage.private_storage_name
-  private_storage_key = module.storage.private_storage_key
-  private_storage_account_id          = module.storage.private_storage_account_id
-  public_storage_account_id = module.storage.public_storage_account_id
-  env         = var.env
-  prefix      = var.prefix
-  instru_key  = module.monitoring.instrumentation_key
-  conn_string = module.monitoring.conn_string
-  func_subnet_id = module.network.function_subnet_id
+  source                     = "./modules/FunctionApp"
+  tags                       = var.tags
+  rg                         = var.rg
+  location                   = var.location
+  private_storage_name       = module.storage.private_storage_name
+  private_storage_key        = module.storage.private_storage_key
+  private_storage_account_id = module.storage.private_storage_account_id
+  public_storage_account_id  = module.storage.public_storage_account_id
+  env                        = var.env
+  prefix                     = var.prefix
+  instru_key                 = module.monitoring.instrumentation_key
+  conn_string                = module.monitoring.conn_string
+  func_subnet_id             = module.network.function_subnet_id
 }
 
 /* module "eventgrid" {
@@ -48,28 +48,28 @@ module "function_app" {
 } */
 
 module "storage" {
-  source   = "./modules/Storage"
-  tags     = var.tags
-  rg       = var.rg
-  prefix   = var.prefix
-  location = var.location
-  env      = var.env
-  fe_subnet_id = module.network.frontend_subnet_id
-  be_subnet_id = module.network.backend_subnet_id
+  source         = "./modules/Storage"
+  tags           = var.tags
+  rg             = var.rg
+  prefix         = var.prefix
+  location       = var.location
+  env            = var.env
+  fe_subnet_id   = module.network.frontend_subnet_id
+  be_subnet_id   = module.network.backend_subnet_id
   comp_subnet_id = module.network.compute_subnet_id
   func_subnet_id = module.network.function_subnet_id
   #private_dns_zone_blob_id = module.network.private_dns_zone_blob_id
 }
 
 module "container" {
-  source   = "./modules/Container"
-  tags     = var.tags
-  rg       = var.rg
-  location = var.location
-  prefix   = var.prefix
-  env      = var.env
-  fe_subnet_id = module.network.frontend_subnet_id
-  be_subnet_id = module.network.backend_subnet_id
+  source         = "./modules/Container"
+  tags           = var.tags
+  rg             = var.rg
+  location       = var.location
+  prefix         = var.prefix
+  env            = var.env
+  fe_subnet_id   = module.network.frontend_subnet_id
+  be_subnet_id   = module.network.backend_subnet_id
   comp_subnet_id = module.network.compute_subnet_id
 }
 

diff --git a/modules/FunctionApp/main.tf b/modules/FunctionApp/main.tf
@@ -50,7 +50,7 @@ resource "azurerm_eventgrid_system_topic_event_subscription" "event_subscription
     system_topic = azurerm_eventgrid_system_topic.eventgrid_topic.name
     resource_group_name = var.rg
     azure_function_endpoint {
-    function_id                       = azurerm_linux_function_app.function_app.name
+    function_id                       = azurerm_linux_function_app.function_app.id
     max_events_per_batch              = 1
     preferred_batch_size_in_kilobytes = 64
   }