feat: rename replicator and metering in output

Author: ishabakeh

.gitignore

@@ -1,2 +1,3 @@
 .terraform
-.terraform.lock.hcl
+.terraform.lock.hcl
+terraform.tfstate*

examples/basic-azure-integration/main.tf

@@ -4,16 +4,16 @@
 #
 # Remove/comment the backend block below if you are only testing the module.
 # Please be aware that you cannot destroy the created resources via terraform if you lose the state file.
-terraform {
-  backend "azurerm" {
-    tenant_id            = "aadTenantId"
-    subscription_id      = "subscriptionId"
-    resource_group_name  = "rg-cloud-foundation"
-    storage_account_name = "tfstatesiqw0x"
-    container_name       = "tfstates"
-    key                  = "meshplatform-setup"
-  }
-}
+# terraform {
+#   backend "azurerm" {
+#     tenant_id            = "aadTenantId"
+#     subscription_id      = "subscriptionId"
+#     resource_group_name  = "rg-cloud-foundation"
+#     storage_account_name = "tfstatesiqw0x"
+#     container_name       = "tfstates"
+#     key                  = "meshplatform-setup"
+#   }
+# }
 
 provider "azurerm" {
   # Configuration options
@@ -29,4 +29,4 @@ module "meshplatform" {
 
   service_principal_name_suffix = "<UNIQUE_NAME>"
   mgmt_group_name               = "<MANAGEMENT_GROUP_NAME>|<MANAGEMENT_GROUP_ID>" # Either the Management group Name or ID
-}
+}

examples/basic-azure-integration/outputs.tf

@@ -1,20 +1,20 @@
-output "replicator_service_principal" {
+output "replicator_credentials" {
   description = "Replicator Service Principal."
   value       = module.meshplatform.replicator_service_principal
 }
 
-output "replicator_service_principal_password" {
+output "replicator_client_secret" {
   description = "Password for Replicator Service Principal."
   value       = module.meshplatform.replicator_service_principal_password
   sensitive   = true
 }
 
-output "metering_service_principal" {
+output "metering_credentials" {
   description = "Metering Service Principal."
   value       = module.meshplatform.metering_service_principal
 }
 
-output "metering_service_principal_password" {
+output "metering_client_secret" {
   description = "Password for Metering Service Principal."
   value       = module.meshplatform.metering_service_principal_password
   sensitive   = true

main.tf

@@ -66,4 +66,4 @@ moved {
 moved {
   from = module.idp_lookup_spp
   to   = module.idp_lookup_service_principal
-}
+}

modules/meshcloud-idp-lookup-service-principal/module.tf

@@ -65,8 +65,8 @@ resource "azuread_service_principal_password" "service_principal_pw" {
 }
 
 
-# facilitate migration from v0.1.0 of the module
-moved {
-  from = azuread_service_principal_password.spp_pw
-  to   = azuread_service_principal_password.service_principal_pw
-}
+# # facilitate migration from v0.1.0 of the module
+# moved {
+#   from = azuread_service_principal_password.spp_pw
+#   to   = azuread_service_principal_password.service_principal_pw
+# }

modules/meshcloud-metering-service-principal/module.tf

@@ -118,7 +118,7 @@ resource "time_rotating" "replicator_secret_rotation" {
   rotation_days = 365
 }
 
-resource "azuread_application_password" "service_principal_pw" {
+resource "azuread_application_password" "application_pw" {
   application_object_id = azuread_application.meshcloud_metering.object_id
   rotate_when_changed = {
     rotation = time_rotating.replicator_secret_rotation.id

modules/meshcloud-metering-service-principal/outputs.tf

@@ -1,4 +1,4 @@
-output "service_principal" {
+output "credentials" {
   description = "Service Principal application id and object id"
   value = {
     Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_metering.id
@@ -7,8 +7,8 @@ output "service_principal" {
   }
 }
 
-output "service_principal_password" {
-  description = "Password for the Service Principal."
-  value       = azuread_application_password.service_principal_pw.value
+output "application_client_secret" {
+  description = "Client Secret Of the Application."
+  value       = azuread_application_password.application_pw.value
   sensitive   = true
 }

modules/meshcloud-replicator-service-principal/module.tf

@@ -43,7 +43,6 @@ resource "azurerm_role_definition" "meshcloud_replicator" {
       # Assigning Subscriptions to Management Groups
       "Microsoft.Management/managementGroups/subscriptions/write",
       "Microsoft.Management/managementGroups/write",
-
       # Permissions for reading and writing tags
       "Microsoft.Resources/tags/*",
 
@@ -141,7 +140,7 @@ resource "azuread_application" "meshcloud_replicator" {
 resource "time_rotating" "replicator_secret_rotation" {
   rotation_days = 365
 }
-resource "azuread_application_password" "service_principal_pw" {
+resource "azuread_application_password" "application_pw" {
   application_object_id = azuread_application.meshcloud_replicator.object_id
   rotate_when_changed = {
     rotation = time_rotating.replicator_secret_rotation.id

modules/meshcloud-replicator-service-principal/outputs.tf

@@ -1,4 +1,4 @@
-output "service_principal" {
+output "credentials" {
   description = "Service Principal application id and object id"
   value = {
     Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_replicator.id
@@ -7,9 +7,9 @@ output "service_principal" {
   }
 }
 
-output "service_principal_password" {
-  description = "Password for the Service Principal."
-  value       = azuread_application_password.service_principal_pw.value
+output "application_client_secret" {
+  description = "Client Secret Of the Application."
+  value       = azuread_application_password.application_pw.value
   sensitive   = true
 }
 

outputs.tf

@@ -1,12 +1,12 @@
 
 output "replicator_service_principal" {
   description = "Replicator Service Principal."
-  value       = length(module.replicator_service_principal) > 0 ? module.replicator_service_principal[0].service_principal : null
+  value       = length(module.replicator_service_principal) > 0 ? module.replicator_service_principal[0].credentials : null
 }
 
 output "replicator_service_principal_password" {
   description = "Password for Replicator Service Principal."
-  value       = length(module.replicator_service_principal) > 0 ? module.replicator_service_principal[0].service_principal_password : null
+  value       = length(module.replicator_service_principal) > 0 ? module.replicator_service_principal[0].application_client_secret : null
   sensitive   = true
 }
 
@@ -17,12 +17,12 @@ output "replicator_service_principal_password" {
 
 output "metering_service_principal" {
   description = "Metering Service Principal."
-  value       = length(module.metering_service_principal) > 0 ? module.metering_service_principal[0].service_principal : null
+  value       = length(module.metering_service_principal) > 0 ? module.metering_service_principal[0].credentials : null
 }
 
 output "metering_service_principal_password" {
   description = "Password for Metering Service Principal."
-  value       = length(module.metering_service_principal) > 0 ? module.metering_service_principal[0].service_principal_password : null
+  value       = length(module.metering_service_principal) > 0 ? module.metering_service_principal[0].application_client_secret : null
   sensitive   = true
 }