fix custom idp cases

Author: jglander

released/discovery_center/mission_4356/step1/main.tf

@@ -171,6 +171,7 @@ resource "btp_subaccount_subscription" "sapappstudio" {
 # ------------------------------------------------------------------------------------------------------
 #  USERS AND ROLES
 # ------------------------------------------------------------------------------------------------------
+data "btp_whoami" "me" {}
 #
 locals {
   subaccount_admins         = var.subaccount_admins
@@ -187,7 +188,6 @@ locals {
   origin_key        = local.custom_idp_tenant != "" ? "${local.custom_idp_tenant}-platform" : ""
 }
 
-data "btp_whoami" "me" {}
 # ------------------------------------------------------------------------------------------------------
 # Assign role collection "Subaccount Administrator"
 # ------------------------------------------------------------------------------------------------------
@@ -220,7 +220,7 @@ resource "btp_subaccount_role_collection_assignment" "integration_provisioner" {
   subaccount_id        = data.btp_subaccount.dc_mission.id
   role_collection_name = "Integration_Provisioner"
   user_name            = each.value
-  origin               = local.origin_key
+  origin               = var.custom_idp_apps_origin_key
   depends_on           = [btp_subaccount_subscription.integrationsuite]
 }
 
@@ -302,4 +302,4 @@ resource "local_file" "output_vars_step1" {
 
       EOT
   filename = "../step2/terraform.tfvars"
-}
+}

released/discovery_center/mission_4356/step2/main.tf

@@ -1,3 +1,23 @@
+data "btp_whoami" "me" {}
+# ------------------------------------------------------------------------------------------------------
+# Import custom trust config and disable for user login
+# ------------------------------------------------------------------------------------------------------
+locals {
+  available_for_user_logon = data.btp_whoami.me.issuer != var.custom_idp ? true : false
+}
+
+import {
+  to = btp_subaccount_trust_configuration.default
+  id = "${var.subaccount_id},sap.default"
+}
+
+resource "btp_subaccount_trust_configuration" "default" {
+  subaccount_id            = var.subaccount_id
+  identity_provider        = ""
+  auto_create_shadow_users = false
+  available_for_user_logon = local.available_for_user_logon
+}
+
 # ------------------------------------------------------------------------------------------------------
 # Create the Cloud Foundry space
 # ------------------------------------------------------------------------------------------------------
@@ -12,19 +32,18 @@ resource "cloudfoundry_space" "dev" {
 # ------------------------------------------------------------------------------------------------------
 #  USERS AND ROLES
 # ------------------------------------------------------------------------------------------------------
-data "btp_whoami" "me" {}
 
 locals {
   # Remove current user if issuer (idp) of logged in user is not same as used custom idp 
-  cf_org_admins = data.btp_whoami.me.issuer != var.custom_idp ? var.cf_org_admins : setsubtract(toset(var.cf_org_admins), [data.btp_whoami.me.email])
-  cf_org_users  = data.btp_whoami.me.issuer != var.custom_idp ? var.cf_org_admins : setsubtract(toset(var.cf_org_users), [data.btp_whoami.me.email])
+  cf_org_admins = setsubtract(toset(var.cf_org_admins), [data.btp_whoami.me.email])
+  cf_org_users  = setsubtract(toset(var.cf_org_users), [data.btp_whoami.me.email])
 
   cf_space_managers   = var.cf_space_managers
   cf_space_developers = var.cf_space_developers
 
-  # get origin_key from custom.idp 
+  # origin_key is default (sap.ids) if issuer (idp) of logged in user is not same as used custom idp, otherwise calculated from custom.idp
   custom_idp_tenant = var.custom_idp != "" ? element(split(".", var.custom_idp), 0) : ""
-  origin_key        = local.custom_idp_tenant != "" ? "${local.custom_idp_tenant}-platform" : "sap.ids"
+  origin_key        = data.btp_whoami.me.issuer != var.custom_idp ? "sap.ids" : "${local.custom_idp_tenant}-platform"
 }
 
 # ------------------------------------------------------------------------------------------------------