feat: bump 1.2.0 - fix naming module

Author: radomarina

eventdriven.tf

@@ -1,7 +1,7 @@
 resource "azurerm_resource_group" "current" {
   count    = var.eventdriven_enabled && var.existing_resource_group_name == "" ? 1 : 0
   location = var.location
-  name     = "${var.prefix}${module.naming.resource_group}firefly${var.suffix}"
+  name     = "${module.naming.resource_group.name}-${var.prefix}firefly${var.suffix}"
   tags     = local.tags
 }
 
@@ -11,14 +11,14 @@ resource "azurerm_storage_account" "current" {
   cross_tenant_replication_enabled = false
   account_tier                     = "Standard"
   location                         = var.location
-  name                             = "${var.prefix != "" ? regex("\\w+", var.prefix) : ""}${module.naming.storage_account}firefly${var.suffix != "" ? regex("\\w+", var.suffix) : ""}"
+  name                             = "${module.naming.storage_account.name}${var.prefix != "" ? regex("\\w+", var.prefix) : ""}firefly${var.suffix != "" ? regex("\\w+", var.suffix) : ""}"
   resource_group_name              = local.resource_group_name
   tags                             = local.tags
 }
 
 resource "azurerm_eventgrid_system_topic" "current" {
   count                  = var.eventdriven_enabled && var.existing_eventgrid_topic_name == "" ? 1 : 0
-  name                   = "${var.prefix}${module.naming.eventgrid_topic}firefly${var.suffix}"
+  name                   = "${module.naming.eventgrid_topic.name}-${var.prefix}firefly${var.suffix}"
   location               = var.location
   resource_group_name    = local.resource_group_name
   source_arm_resource_id = local.storage_account_id
@@ -28,7 +28,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
-  name                 = "${var.prefix}${module.naming.eventgrid_event_subscription}firefly${var.suffix}"
+  name                 = "${module.naming.eventgrid_event_subscription.name}-${var.prefix}firefly${var.suffix}"
   resource_group_name  = local.resource_group_name
   system_topic         = local.eventgrid_system_topic_name
   included_event_types = ["Microsoft.Storage.BlobCreated"]
@@ -46,7 +46,7 @@ resource "azurerm_eventgrid_system_topic_event_subscription" "current" {
 
 resource "azurerm_role_definition" "FireflyStorageAccountBlobReader" {
   count       = var.eventdriven_enabled ? 1 : 0
-  name        = "${var.prefix}${module.naming.role_definition}FireflyStorageAccountBlobReader-${var.subscription_id}${var.suffix}"
+  name        = "${module.naming.role_definition.name}-${var.prefix}FireflyStorageAccountBlobReader-${var.subscription_id}${var.suffix}"
   scope       = "/subscriptions/${var.subscription_id}"
   description = "Firefly's requested permissions"
 
@@ -86,7 +86,7 @@ EOT
 
 resource "azurerm_monitor_diagnostic_setting" "current" {
   for_each           = var.eventdriven_enabled ? local.kv_filtered_subscriptions : {}
-  name               = "${var.prefix}${module.naming.monitor_diagnostic_setting}firefly${each.key}${var.suffix}"
+  name               = "${module.naming.monitor_diagnostic_setting.name}-${var.prefix}firefly${each.key}${var.suffix}"
   target_resource_id = "/subscriptions/${each.key}"
   storage_account_id = local.storage_account_id
   enabled_log {

permission.tf

@@ -4,7 +4,7 @@ locals {
 }
 
 resource "azuread_application_registration" "current" {
-  display_name = "${var.prefix}firefly${var.suffix}"
+  display_name = "spn-${var.prefix}firefly${var.suffix}"
 }
 
 resource "azuread_service_principal" "current" {
@@ -41,7 +41,7 @@ resource "azurerm_role_assignment" "SecurityReader" {
 }
 
 resource "azurerm_role_definition" "Firefly" {
-  name        = "${var.prefix}${module.naming.role_definition}Firefly${var.suffix}"
+  name        = "${module.naming.role_definition.name}-${var.prefix}Firefly${var.suffix}"
   scope       = local.scope
   description = "Firefly's requested permissions"