Naming conventions fix for mission 3680 (#259)

* add cf vars to output
* minor modifications to comply with best practice naming conventions

Author: rui1610

released/discovery_center/mission_3680/step1/main.tf

@@ -136,7 +136,7 @@ data "btp_subaccount_environments" "all" {
 # Take the landscape label from the first CF environment if no environment label is provided
 # (this replaces the previous null_resource)
 # ------------------------------------------------------------------------------------------------------
-resource "terraform_data" "replacement" {
+resource "terraform_data" "cf_landscape_label" {
   input = length(var.cf_landscape_label) > 0 ? var.cf_landscape_label : [for env in data.btp_subaccount_environments.all.values : env if env.service_name == "cloudfoundry" && env.environment_type == "cloudfoundry"][0].landscape_label
 }
 # ------------------------------------------------------------------------------------------------------
@@ -148,7 +148,7 @@ resource "btp_subaccount_environment_instance" "cloudfoundry" {
   environment_type = "cloudfoundry"
   service_name     = "cloudfoundry"
   plan_name        = "standard"
-  landscape_label  = terraform_data.replacement.output
+  landscape_label  = terraform_data.cf_landscape_label.output
   parameters = jsonencode({
     instance_name = local.subaccount_cf_org
   })
@@ -204,11 +204,12 @@ resource "local_file" "output_vars_step1" {
       cf_org_id            = "${jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org ID"]}"
       origin               = "${var.origin}"
       cf_space_name        = "${var.cf_space_name}"
-      cf_org_admins        = ${jsonencode(var.cf_org_admins)}
       cf_org_users         = ${jsonencode(var.cf_org_users)}
+      cf_org_admins        = ${jsonencode(var.cf_org_admins)}
       cf_space_developers  = ${jsonencode(var.cf_space_developers)}
       cf_space_managers    = ${jsonencode(var.cf_space_managers)}
       event_mesh_url       = "${btp_subaccount_subscription.event_mesh_application.subscription_url}"
+      hana_tools_url       = "${btp_subaccount_subscription.hana_cloud_tools.subscription_url}"
       EOT
   filename = "../step2/terraform.tfvars"
 }

released/discovery_center/mission_3680/step1/output.tf

@@ -8,11 +8,6 @@ output "cf_api_url" {
   description = "The Cloudfoundry API endpoint."
 }
 
-output "cf_landscape_label" {
-  value       = terraform_data.replacement.output
-  description = "The Cloudfoundry landscape label."
-}
-
 output "cf_org_id" {
   value       = jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org ID"]
   description = "The Cloudfoundry org id."
@@ -23,7 +18,42 @@ output "event_mesh_url" {
   description = "Event Mesh URL"
 }
 
-# output "hana_tools_url" {
-#   value       = btp_subaccount_subscription.hana_cloud_tools.subscription_url
-#   description = "HANA Tools URL"
-# }
+output "hana_tools_url" {
+  value       = btp_subaccount_subscription.hana_cloud_tools.subscription_url
+  description = "HANA Tools URL"
+}
+
+output "cf_org_name" {
+  value       = jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org Name"]
+  description = "The Cloudfoundry org name."
+}
+
+output "cf_org_admins" {
+  value       = var.cf_org_admins
+  description = "The Cloudfoundry org admins."
+}
+
+output "cf_org_users" {
+  value       = var.cf_org_users
+  description = "The Cloudfoundry org users."
+}
+
+output "cf_space_developers" {
+  value       = var.cf_space_developers
+  description = "The Cloudfoundry space developers."
+}
+
+output "cf_space_managers" {
+  value       = var.cf_space_managers
+  description = "The Cloudfoundry space managers."
+}
+
+output "cf_space_name" {
+  value       = var.cf_space_name
+  description = "The Cloudfoundry space name."
+}
+
+output "origin" {
+  value       = var.origin
+  description = "The origin of the identity provider."
+}

released/discovery_center/mission_3680/step1/samples.tfvars

@@ -22,3 +22,7 @@ cf_org_admins       = ["[email protected]"]
 cf_org_users        = ["[email protected]"]
 cf_space_managers   = ["[email protected]", "[email protected]"]
 cf_space_developers = ["[email protected]", "[email protected]"]
+
+# Event Mesh users
+event_mesh_admins     = ["[email protected]", "[email protected]"]
+event_mesh_developers = ["[email protected]", "[email protected]"]