chore: cleanup outputs

Author: malhussan

examples/basic-azure-integration/main.tf

@@ -1,5 +1,6 @@
 # It is recommended to setup a backend to store the terraform state file
 # Removing the backend leads to terraform state output stored in the local filesystem.
+# See https://www.terraform.io/language/settings/backends for more details
 terraform {
   backend "gcs" {
     prefix = "meshplatforms/azure"

examples/basic-azure-integration/outputs.tf

@@ -1,45 +1,33 @@
 
 output "replicator_spp" {
   description = "Replicator Service Principal."
-  value = {
-    output = module.meshplatform.replicator_spp
-  }
+  value       = module.meshplatform.replicator_spp
 }
 
 output "replicator_spp_password" {
   description = "Password for Replicator Service Principal."
-  value = {
-    password = module.meshplatform.replicator_spp_password
-  }
-  sensitive = true
+  value       = module.meshplatform.replicator_spp_password
+  sensitive   = true
 }
 
 output "kraken_spp" {
   description = "Kraken Service Principal."
-  value = {
-    output = module.meshplatform.kraken_spp
-  }
+  value       = module.meshplatform.kraken_spp
 }
 
 output "kraken_spp_password" {
   description = "Password for Kraken Service Principal."
-  value = {
-    password = module.meshplatform.kraken_spp_password
-  }
-  sensitive = true
+  value       = module.meshplatform.kraken_spp_password
+  sensitive   = true
 }
 
 output "uami_blueprint_user_principal" {
   description = "UAMI Blueprint Assignment Service Principal."
-  value = {
-    output = module.meshplatform.uami_blueprint_user_principal
-  }
+  value       = module.meshplatform.uami_blueprint_user_principal
 }
 
 output "uami_blueprint_user_principal_password" {
   description = "Password for UAMI Blueprint Assignment Service Principal."
-  value = {
-    password = module.meshplatform.uami_blueprint_user_principal_password
-  }
-  sensitive = true
+  value       = module.meshplatform.uami_blueprint_user_principal_password
+  sensitive   = true
 }

modules/meshcloud-idp-lookup-spp/outputs.tf

@@ -9,8 +9,6 @@ output "service_principal" {
 
 output "service_principal_password" {
   description = "Password for the Service Principal."
-  value = {
-    password = azuread_service_principal_password.spp_pw.value
-  }
-  sensitive = true
+  value       = azuread_service_principal_password.spp_pw.value
+  sensitive   = true
 }

modules/meshcloud-kraken-spp/outputs.tf

@@ -1,6 +1,5 @@
 output "service_principal" {
   value = {
-    INFO      = "On the very first time running tf apply, you have to run 'az ad app permission admin-consent --id ${azuread_service_principal.meshcloud_kraken.application_id}' or click the 'Grant Admin consent button' in the portal"
     object_id = azuread_service_principal.meshcloud_kraken.id
     app_id    = azuread_service_principal.meshcloud_kraken.application_id
     password  = "Execute `terraform output kraken_spp_password` to see the password"
@@ -9,8 +8,6 @@ output "service_principal" {
 
 output "service_principal_password" {
   description = "Password for the Service Principal."
-  value = {
-    password = azuread_service_principal_password.spp_pw.value
-  }
-  sensitive = true
+  value       = azuread_service_principal_password.spp_pw.value
+  sensitive   = true
 }

modules/meshcloud-replicator-spp/outputs.tf

@@ -9,8 +9,6 @@ output "service_principal" {
 
 output "service_principal_password" {
   description = "Password for the Service Principal."
-  value = {
-    password = azuread_service_principal_password.spp_pw.value
-  }
-  sensitive = true
+  value       = azuread_service_principal_password.spp_pw.value
+  sensitive   = true
 }

modules/uami-blueprint-user-principal/outputs.tf

@@ -7,8 +7,6 @@ output "service_principal" {
 }
 
 output "service_principal_password" {
-  value = {
-    password = azuread_service_principal_password.spp_pw.value
-  }
+  value     = azuread_service_principal_password.spp_pw.value
   sensitive = true
 }

outputs.tf

@@ -1,60 +1,44 @@
 
 output "replicator_spp" {
   description = "Replicator Service Principal."
-  value = {
-    output = length(module.replicator_spp) > 0 ? module.replicator_spp[0].service_principal : null
-  }
+  value       = length(module.replicator_spp) > 0 ? module.replicator_spp[0].service_principal : null
 }
 
 output "replicator_spp_password" {
   description = "Password for Replicator Service Principal."
-  value = {
-    password = length(module.replicator_spp) > 0 ? module.replicator_spp[0].service_principal_password : null
-  }
-  sensitive = true
+  value       = length(module.replicator_spp) > 0 ? module.replicator_spp[0].service_principal_password : null
+  sensitive   = true
 }
 
 output "kraken_spp" {
   description = "Kraken Service Principal."
-  value = {
-    output = length(module.kraken_spp) > 0 ? module.kraken_spp[0].service_principal : null
-  }
+  value       = length(module.kraken_spp) > 0 ? module.kraken_spp[0].service_principal : null
 }
 
 output "kraken_spp_password" {
   description = "Password for Kraken Service Principal."
-  value = {
-    password = length(module.kraken_spp) > 0 ? module.kraken_spp[0].service_principal_password : null
-  }
-  sensitive = true
+  value       = length(module.kraken_spp) > 0 ? module.kraken_spp[0].service_principal_password : null
+  sensitive   = true
 }
 
 output "idp_lookup_spp" {
   description = "IDP Lookup Service Principal."
-  value = {
-    output = length(module.idp_lookup_spp) > 0 ? module.idp_lookup_spp[0].service_principal : null
-  }
+  value       = length(module.idp_lookup_spp) > 0 ? module.idp_lookup_spp[0].service_principal : null
 }
 
 output "idp_lookup_spp_password" {
   description = "Password for IDP Lookup Service Principal."
-  value = {
-    password = length(module.idp_lookup_spp) > 0 ? module.idp_lookup_spp[0].service_principal_password : null
-  }
-  sensitive = true
+  value       = length(module.idp_lookup_spp) > 0 ? module.idp_lookup_spp[0].service_principal_password : null
+  sensitive   = true
 }
 
 output "uami_blueprint_user_principal" {
   description = "UAMI Blueprint Assignment Service Principal."
-  value = {
-    output = length(module.uami_blueprint_user_principal) > 0 ? module.uami_blueprint_user_principal[0].service_principal : null
-  }
+  value       = length(module.uami_blueprint_user_principal) > 0 ? module.uami_blueprint_user_principal[0].service_principal : null
 }
 
 output "uami_blueprint_user_principal_password" {
   description = "Password for UAMI Blueprint Assignment Service Principal."
-  value = {
-    password = length(module.uami_blueprint_user_principal) > 0 ? module.uami_blueprint_user_principal[0].service_principal_password : null
-  }
-  sensitive = true
+  value       = length(module.uami_blueprint_user_principal) > 0 ? module.uami_blueprint_user_principal[0].service_principal_password : null
+  sensitive   = true
 }