DC Mission 3945 - Polished for QAS

Author: mahesh0431

released/discovery_center/mission_3945/README.md

@@ -20,7 +20,7 @@ To deploy the resources you must:
         $env:BTP_PASSWORD=<your_password>
     ```
 
-2. Change the variables in the `samples.tfvars` file to meet your requirements
+2. Change the variables in the `sample.tfvars` file to meet your requirements
 
    > ⚠ NOTE: You should pay attention **specifically** to the users defined in the samples.tfvars whether they already exist in your SAP BTP accounts. Otherwise you might get error messages like e.g. `Error: The user could not be found: [email protected]`.
 
@@ -34,13 +34,13 @@ To deploy the resources you must:
 4. You can check what Terraform plans to apply based on your configuration:
 
    ```bash
-   terraform plan -var-file="samples.tfvars"
+   terraform plan -var-file="sample.tfvars"
    ```
 
 5. Apply your configuration to provision the resources:
 
    ```bash
-   terraform apply -var-file="samples.tfvars"
+   terraform apply -var-file="sample.tfvars"
    ```
 
 ## In the end

released/discovery_center/mission_3945/locals.tf

@@ -8,6 +8,10 @@ locals {
   subaccount_domain = lower(replace("mission-3945-${local.random_uuid}", "_", "-"))
 }
 
+locals {
+  service_name__sap_analytics_cloud = "analytics-planning-osb"
+}
+
 # ------------------------------------------------------------------------------------------------------
 # Creation of subaccount
 # ------------------------------------------------------------------------------------------------------
@@ -33,6 +37,11 @@ resource "btp_subaccount_trust_configuration" "fully_customized" {
   identity_provider = var.custom_idp
 }
 
+locals {
+  custom_idp_tenant    = var.custom_idp != "" ? element(split(".", var.custom_idp), 0) : ""
+  origin_key           = local.custom_idp_tenant != "" ? "${local.custom_idp_tenant}-platform" : "sap.default"
+  origin_key_app_users = var.custom_idp != "" ? var.custom_idp_apps_origin_key : "sap.default"
+}
 
 # ------------------------------------------------------------------------------------------------------
 # Assignment of users as sub account administrators
@@ -41,6 +50,7 @@ resource "btp_subaccount_role_collection_assignment" "subaccount-admins" {
   for_each             = toset(var.subaccount_admins)
   subaccount_id        = data.btp_subaccount.dc_mission.id
   role_collection_name = "Subaccount Administrator"
+  origin               = local.origin_key
   user_name            = each.value
 }
 
@@ -51,6 +61,7 @@ resource "btp_subaccount_role_collection_assignment" "subaccount-service-admins"
   for_each             = toset(var.subaccount_service_admins)
   subaccount_id        = data.btp_subaccount.dc_mission.id
   role_collection_name = "Subaccount Service Administrator"
+  origin               = local.origin_key
   user_name            = each.value
 }
 
@@ -71,26 +82,26 @@ data "btp_subaccount_service_plan" "sac" {
   depends_on    = [btp_subaccount_entitlement.sac]
 }
 
-# Create service instance
-resource "btp_subaccount_service_instance" "sac" {
-  subaccount_id  = data.btp_subaccount.dc_mission.id
-  serviceplan_id = data.btp_subaccount_service_plan.sac.id
-  name           = "sac_instance"
-  parameters = jsonencode(
-    {
-      "first_name" : "${var.sac_admin_first_name}",
-      "last_name" : "${var.sac_admin_last_name}",
-      "email" : "${var.sac_admin_email}",
-      "confirm_email" : "${var.sac_admin_email}",
-      "host_name" : "${var.sac_admin_host_name}",
-      "number_of_business_intelligence_licenses" : var.sac_number_of_business_intelligence_licenses,
-      "number_of_planning_professional_licenses" : var.sac_number_of_professional_licenses,
-      "number_of_planning_standard_licenses" : var.sac_number_of_business_standard_licenses
-    }
-  )
-  timeouts = {
-    create = "90m"
-    update = "90m"
-    delete = "90m"
-  }
-}
+# # Create service instance
+# resource "btp_subaccount_service_instance" "sac" {
+#   subaccount_id  = data.btp_subaccount.dc_mission.id
+#   serviceplan_id = data.btp_subaccount_service_plan.sac.id
+#   name           = "sac_instance"
+#   parameters = jsonencode(
+#     {
+#       "first_name" : "${var.sac_admin_first_name}",
+#       "last_name" : "${var.sac_admin_last_name}",
+#       "email" : "${var.sac_admin_email}",
+#       "confirm_email" : "${var.sac_admin_email}",
+#       "host_name" : "${var.sac_admin_host_name}",
+#       "number_of_business_intelligence_licenses" : var.sac_number_of_business_intelligence_licenses,
+#       "number_of_planning_professional_licenses" : var.sac_number_of_professional_licenses,
+#       "number_of_planning_standard_licenses" : var.sac_number_of_business_standard_licenses
+#     }
+#   )
+#   timeouts = {
+#     create = "90m"
+#     update = "90m"
+#     delete = "90m"
+#   }
+# }

released/discovery_center/mission_3945/main.tf

@@ -2,11 +2,10 @@
 # Provider configuration
 # ------------------------------------------------------------------------------------------------------
 # Your global account subdomain
-globalaccount        = "youraccount"
-region               = "us10"
-subaccount_name      = "SAP Discovery Center Mission 3945"
-cf_environment_label = "cf-us10"
-cf_space_name        = "dev"
+globalaccount   = "youraccount"
+region          = "us10"
+subaccount_name = "SAP Discovery Center Mission 3945"
+custom_idp      = "<your-idp>.accounts.ondemand.com"
 
 # ------------------------------------------------------------------------------------------------------
 # Project specific configuration (please adapt!)

released/discovery_center/mission_3945/sample.tfvars

@@ -41,6 +41,12 @@ variable "custom_idp" {
   default     = ""
 }
 
+variable "custom_idp_apps_origin_key" {
+  type        = string
+  description = "The custom identity provider for the subaccount."
+  default     = "sap.custom"
+}
+
 variable "subaccount_admins" {
   type        = list(string)
   description = "Defines the colleagues who are added to each subaccount as subaccount administrators."