@@ -17,6 +17,7 @@ resource "btp_subaccount" "project" {
17
17
subdomain = local. subaccount_domain
18
18
region = lower (var. region )
19
19
}
20
+
20
21
data "btp_whoami" "me" {}
21
22
22
23
data "btp_subaccount_environments" "all" {
@@ -56,7 +57,7 @@ resource "btp_subaccount_environment_instance" "cloudfoundry" {
56
57
# Assignment of users as sub account administrators
57
58
# ##############################################################################################
58
59
resource "btp_subaccount_role_collection_assignment" "subaccount-admins" {
59
- for_each = toset (" ${ var . subaccount_admins } " )
60
+ for_each = toset (var. subaccount_admins )
60
61
subaccount_id = btp_subaccount. project . id
61
62
role_collection_name = " Subaccount Administrator"
62
63
user_name = each. value
@@ -136,14 +137,19 @@ resource "btp_subaccount_entitlement" "hana-hdi-shared" {
136
137
plan_name = " hdi-shared"
137
138
}
138
139
140
+ locals {
141
+ cf_org_users = setsubtract (toset (var. cf_org_users ), [data . btp_whoami . me . email ])
142
+ cf_org_admins = setsubtract (toset (var. cf_org_admins ), [data . btp_whoami . me . email ])
143
+ }
144
+
139
145
resource "local_file" "output_vars_step1" {
140
146
count = var. create_tfvars_file_for_next_stage ? 1 : 0
141
147
content = <<- EOT
142
148
cf_api_url = "${ jsondecode (btp_subaccount_environment_instance. cloudfoundry . labels )[" API Endpoint" ]} "
143
149
cf_org_id = "${ btp_subaccount_environment_instance . cloudfoundry . platform_id } "
144
150
145
- cf_org_users = ${ jsonencode (var . cf_org_users )}
146
- cf_org_admins = ${ jsonencode (var . cf_org_admins )}
151
+ cf_org_users = ${ jsonencode (local . cf_org_users )}
152
+ cf_org_admins = ${ jsonencode (local . cf_org_admins )}
147
153
cf_space_developers = ${ jsonencode (var. cf_space_developers )}
148
154
cf_space_managers = ${ jsonencode (var. cf_space_managers )}
149
155
0 commit comments