misc changes

equinor · Apr 25, 2024 · 890e0aa · 890e0aa
1 parent b3b7880
commit 890e0aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/terraform/subscriptions/modules/config/main.tf b/terraform/subscriptions/modules/config/main.tf
@@ -79,6 +79,6 @@ output "private_dns_zones_names" {
   ]
 }
 
-output "radix_log_api_mi" {
+output "radix_log_api_mi_name" {
   value = "radix-id-log-api-${local.config.environment}"
 }
diff --git a/terraform/subscriptions/modules/userassignedidentity/main.tf b/terraform/subscriptions/modules/userassignedidentity/main.tf
@@ -2,7 +2,9 @@ resource "azurerm_user_assigned_identity" "userassignedidentity" {
   name                = var.name
   location            = var.location
   resource_group_name = var.resource_group_name
-  tags                = var.tags
+  tags = {
+    IaC = "terraform"
+  }
 }
 
 resource "azurerm_role_assignment" "this" {

diff --git a/terraform/subscriptions/s941/dev/log-api/main.tf b/terraform/subscriptions/s941/dev/log-api/main.tf
@@ -7,15 +7,11 @@ data "azurerm_log_analytics_workspace" "this" {
   resource_group_name = "Logs-Dev"
 }
 
-data "azurerm_resource_group" "resourcegroup" {
-  name     = module.config.common_resource_group
-}
-
 module "log-api-mi" {
   source              = "../../../modules/userassignedidentity"
-  name                = module.config.radix_log_api_mi
-  resource_group_name = data.azurerm_resource_group.resourcegroup.name
-  location            = data.azurerm_resource_group.resourcegroup.location
+  name                = module.config.radix_log_api_mi_name
+  resource_group_name = module.config.common_resource_group
+  location            = module.config.location
   roleassignments = {
     role = {
       role     = "Log Analytics Reader"

diff --git a/terraform/subscriptions/s941/dev/post-clusters/log-api.tf b/terraform/subscriptions/s941/dev/post-clusters/log-api.tf
@@ -1,6 +1,6 @@
 data "azurerm_user_assigned_identity" "log-api-mi" {
-  resource_group_name = module.config.radix_log_api_mi.resourcegroup
-  name                = module.config.radix_log_api_mi.name
+  resource_group_name = module.config.common_resource_group
+  name                = module.config.radix_log_api_mi_name
 }
 
 resource "azurerm_federated_identity_credential" "log-api-mi-prod" {