From b9feb0ded21ae1d1835eaca7ecd99b65cf077524 Mon Sep 17 00:00:00 2001 From: Rui Nogueira Date: Fri, 12 Jul 2024 10:44:04 +0000 Subject: [PATCH 1/3] add cf vars to output --- .../mission_3680/step1/output.tf | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/released/discovery_center/mission_3680/step1/output.tf b/released/discovery_center/mission_3680/step1/output.tf index 5653e518..5665a322 100644 --- a/released/discovery_center/mission_3680/step1/output.tf +++ b/released/discovery_center/mission_3680/step1/output.tf @@ -23,7 +23,37 @@ 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" -# } \ No newline at end of file +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." +} From 46100f9293ab663739716a70c66aa83a68c942cb Mon Sep 17 00:00:00 2001 From: Rui Nogueira Date: Fri, 12 Jul 2024 11:05:33 +0000 Subject: [PATCH 2/3] minor modifications to comply with best practice naming conventions --- released/discovery_center/mission_3680/step1/main.tf | 7 ++++--- released/discovery_center/mission_3680/step1/output.tf | 10 +++++----- .../discovery_center/mission_3680/step1/samples.tfvars | 4 ++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/released/discovery_center/mission_3680/step1/main.tf b/released/discovery_center/mission_3680/step1/main.tf index 960803fd..8764c364 100644 --- a/released/discovery_center/mission_3680/step1/main.tf +++ b/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" } \ No newline at end of file diff --git a/released/discovery_center/mission_3680/step1/output.tf b/released/discovery_center/mission_3680/step1/output.tf index 5665a322..9fcedb28 100644 --- a/released/discovery_center/mission_3680/step1/output.tf +++ b/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,6 +18,11 @@ 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 "cf_org_name" { value = jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org Name"] description = "The Cloudfoundry org name." diff --git a/released/discovery_center/mission_3680/step1/samples.tfvars b/released/discovery_center/mission_3680/step1/samples.tfvars index 7749d147..dcad24ba 100644 --- a/released/discovery_center/mission_3680/step1/samples.tfvars +++ b/released/discovery_center/mission_3680/step1/samples.tfvars @@ -22,3 +22,7 @@ cf_org_admins = ["another.user@test.com"] cf_org_users = ["another.user@test.com"] cf_space_managers = ["another.user@test.com", "you@test.com"] cf_space_developers = ["another.user@test.com", "you@test.com"] + +# Event Mesh users +event_mesh_admins = ["another.user@test.com", "you@test.com"] +event_mesh_developers = ["another.user@test.com", "you@test.com"] From 901c112f7734084032afb069256103b437ebb971 Mon Sep 17 00:00:00 2001 From: Rui Nogueira Date: Fri, 12 Jul 2024 11:08:02 +0000 Subject: [PATCH 3/3] update format --- released/discovery_center/mission_3680/step1/samples.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/released/discovery_center/mission_3680/step1/samples.tfvars b/released/discovery_center/mission_3680/step1/samples.tfvars index dcad24ba..6ff37127 100644 --- a/released/discovery_center/mission_3680/step1/samples.tfvars +++ b/released/discovery_center/mission_3680/step1/samples.tfvars @@ -24,5 +24,5 @@ cf_space_managers = ["another.user@test.com", "you@test.com"] cf_space_developers = ["another.user@test.com", "you@test.com"] # Event Mesh users -event_mesh_admins = ["another.user@test.com", "you@test.com"] +event_mesh_admins = ["another.user@test.com", "you@test.com"] event_mesh_developers = ["another.user@test.com", "you@test.com"]