feat: v1.3.0

Author: radomarina

.gitignore

@@ -0,0 +1,3 @@
+.idea
+.terraform
+.terraform.lock.hcl

eventdriven.tf

@@ -1,13 +1,13 @@
 resource "azurerm_resource_group" "current" {
-  count    = var.eventdriven_enabled && var.existing_resource_group_name == "" ? 1 : 0
+  count    = var.existing_resource_group_name == "" ? 1 : 0
   provider = azurerm.deployment_subscription
   location = var.location
   name     = "${module.naming.resource_group.name}-${var.prefix}firefly${var.suffix}"
   tags     = local.tags
 }
 
 resource "azurerm_storage_account" "current" {
-  count                            = var.eventdriven_enabled && var.existing_storage_account_id == "" ? 1 : 0
+  count                            = var.existing_storage_account_id == "" ? 1 : 0
   provider                         = azurerm.deployment_subscription
   account_replication_type         = "LRS"
   cross_tenant_replication_enabled = false
@@ -26,7 +26,7 @@ resource "azurerm_storage_account" "current" {
 }
 
 resource "azurerm_eventgrid_system_topic" "current" {
-  count                  = var.eventdriven_enabled && var.existing_eventgrid_topic_name == "" ? 1 : 0
+  count                  = var.existing_eventgrid_topic_name == "" ? 1 : 0
   provider               = azurerm.deployment_subscription
   name                   = "${module.naming.eventgrid_topic.name}-${var.prefix}firefly${var.suffix}"
   location               = var.location
@@ -37,7 +37,7 @@ resource "azurerm_eventgrid_system_topic" "current" {
 }
 
 resource "azurerm_eventgrid_system_topic_event_subscription" "current" {
-  count                = var.eventdriven_enabled && var.existing_eventgrid_topic_name == "" ? 1 : 0
+  count                = var.existing_eventgrid_topic_name == "" ? 1 : 0
   provider             = azurerm.deployment_subscription
   name                 = "${module.naming.eventgrid_event_subscription.name}-${var.prefix}firefly${var.suffix}"
   resource_group_name  = local.resource_group_name
@@ -56,7 +56,6 @@ resource "azurerm_eventgrid_system_topic_event_subscription" "current" {
 }
 
 resource "azurerm_role_definition" "FireflyStorageAccountBlobReader" {
-  count    = var.eventdriven_enabled ? 1 : 0
   provider = azurerm.deployment_subscription
 
   name        = "${module.naming.role_definition.name}-${var.prefix}FireflyStorageAccountBlobReader-${var.subscription_id}${var.suffix}"
@@ -74,7 +73,6 @@ resource "azurerm_role_definition" "FireflyStorageAccountBlobReader" {
 }
 
 resource "azurerm_role_assignment" "FireflyStorageAccountBlobReader" {
-  count    = var.eventdriven_enabled ? 1 : 0
   provider = azurerm.deployment_subscription
 
   principal_id         = azuread_service_principal.current.id
@@ -100,7 +98,7 @@ EOT
 }
 
 resource "azurerm_monitor_diagnostic_setting" "current" {
-  for_each           = var.eventdriven_enabled ? local.kv_filtered_subscriptions : {}
+  for_each           = local.kv_filtered_subscriptions
   provider           = azurerm.deployment_subscription
   name               = "${module.naming.monitor_diagnostic_setting.name}-${var.prefix}firefly${each.key}${var.suffix}"
   target_resource_id = "/subscriptions/${each.key}"

locals.tf

@@ -1,14 +1,14 @@
 locals {
   filtered_subscriptions    = [for subscription in data.azurerm_subscriptions.current.subscriptions : subscription if !contains(keys(subscription.tags), "disable_firefly_discovery") && subscription.state == "Enabled"]
-  kv_filtered_subscriptions = var.eventdriven_auto_discover && length(local.filtered_subscriptions) > 0 ? { for subscription in local.filtered_subscriptions : subscription.subscription_id => subscription.display_name } : { "${var.subscription_id}" = data.azurerm_subscription.current.display_name }
+  kv_filtered_subscriptions = var.auto_discover_enabled && length(local.filtered_subscriptions) > 0 ? { for subscription in local.filtered_subscriptions : subscription.subscription_id => subscription.display_name } : { "${var.subscription_id}" = data.azurerm_subscription.current.display_name }
 
   resource_group_id   = var.existing_resource_group_name != "" ? var.existing_resource_group_name : azurerm_resource_group.current[0].id
   resource_group_name = var.existing_resource_group_name != "" ? var.existing_resource_group_name : azurerm_resource_group.current[0].name
   storage_account_id  = var.existing_storage_account_id != "" ? var.existing_storage_account_id : azurerm_storage_account.current[0].id
 
 
   eventgrid_system_topic_name = var.existing_eventgrid_topic_name != "" ? var.existing_eventgrid_topic_name : azurerm_eventgrid_system_topic.current[0].name
-  subscription_suffix         = var.eventdriven_auto_discover ? "" : "-${var.subscription_id}"
+  subscription_suffix         = var.auto_discover_enabled ? "" : "-${var.subscription_id}"
   tags = merge(var.tags, {
     "firefly" = "true"
   })

permission.tf

@@ -1,6 +1,6 @@
 locals {
   management_group_id = var.management_group_id != "" ? "/providers/Microsoft.Management/managementGroups/${var.management_group_id}" : data.azurerm_management_group.current.id
-  scope               = var.eventdriven_auto_discover != "" ? local.management_group_id : "/subscriptions/${var.subscription_id}"
+  scope               = var.auto_discover_enabled != "" ? local.management_group_id : "/subscriptions/${var.subscription_id}"
 }
 
 resource "azuread_application_registration" "current" {