From 0411dd8010364f8300fa8c1e2206a33262c084c4 Mon Sep 17 00:00:00 2001 From: Markus Balsam Date: Tue, 20 Aug 2024 18:14:10 +0200 Subject: [PATCH 1/3] small fixes for QAS for mission 4441 --- .../minimal_setup_enterprise/step1/main.tf | 3 ++- .../minimal_setup_enterprise/step2/main.tf | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf index cb056113..de3dd85d 100644 --- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf +++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf @@ -48,6 +48,7 @@ resource "btp_subaccount_entitlement" "cloudfoundry" { } resource "btp_subaccount_environment_instance" "cloudfoundry" { + depends_on = [ btp_subaccount_entitlement.build_code ] subaccount_id = btp_subaccount.dc_mission.id name = "cf-${random_uuid.uuid.result}" environment_type = "cloudfoundry" @@ -204,7 +205,7 @@ resource "local_file" "output_vars_step1" { cf_org_id = "${jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org ID"]}" cf_org_name = "${jsondecode(btp_subaccount_environment_instance.cloudfoundry.labels)["Org Name"]}" - origin = "${var.origin}" + origin_key = "${var.origin}" cf_space_name = "${var.cf_space_name}" diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf index 938ea1d6..c812c70b 100644 --- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf +++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf @@ -16,17 +16,25 @@ resource "cloudfoundry_space" "dev" { # ------------------------------------------------------------------------------------------------------ # Assign CF Org roles to the admin users # ------------------------------------------------------------------------------------------------------ +# Remove current user from org roles +data "btp_whoami" "me" {} + +locals { + cf_org_admins = setsubtract(toset(var.cf_org_admins), [data.btp_whoami.me.email]) +} + # Define Org User role resource "cloudfoundry_org_role" "organization_user" { - for_each = toset("${var.cf_org_admins}") + for_each = toset("${local.cf_org_admins}") username = each.value type = "organization_user" org = var.cf_org_id origin = var.origin_key } + # Define Org Manager role resource "cloudfoundry_org_role" "organization_manager" { - for_each = toset("${var.cf_org_admins}") + for_each = toset("${local.cf_org_admins}") username = each.value type = "organization_manager" org = var.cf_org_id From c0715e4fafa4d3bbf39dcce32767b8cfd5846ed6 Mon Sep 17 00:00:00 2001 From: Markus Balsam Date: Tue, 20 Aug 2024 18:16:53 +0200 Subject: [PATCH 2/3] Update main.tf --- .../mission_4441/minimal_setup_enterprise/step1/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf index de3dd85d..7e80215e 100644 --- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf +++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step1/main.tf @@ -48,7 +48,7 @@ resource "btp_subaccount_entitlement" "cloudfoundry" { } resource "btp_subaccount_environment_instance" "cloudfoundry" { - depends_on = [ btp_subaccount_entitlement.build_code ] + depends_on = [btp_subaccount_entitlement.build_code] subaccount_id = btp_subaccount.dc_mission.id name = "cf-${random_uuid.uuid.result}" environment_type = "cloudfoundry" From 9ace4030277e16c0cae016be6e522a74c5e49288 Mon Sep 17 00:00:00 2001 From: Rui Nogueira Date: Wed, 21 Aug 2024 15:57:30 +0200 Subject: [PATCH 3/3] Update main.tf Removing not needed ${} for the users --- .../mission_4441/minimal_setup_enterprise/step2/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf index c812c70b..7ea8a9e0 100644 --- a/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf +++ b/released/discovery_center/mission_4441/minimal_setup_enterprise/step2/main.tf @@ -25,7 +25,7 @@ locals { # Define Org User role resource "cloudfoundry_org_role" "organization_user" { - for_each = toset("${local.cf_org_admins}") + for_each = toset(local.cf_org_admins) username = each.value type = "organization_user" org = var.cf_org_id @@ -34,7 +34,7 @@ resource "cloudfoundry_org_role" "organization_user" { # Define Org Manager role resource "cloudfoundry_org_role" "organization_manager" { - for_each = toset("${local.cf_org_admins}") + for_each = toset(local.cf_org_admins) username = each.value type = "organization_manager" org = var.cf_org_id