QAS Polished 4033 and few other fixes

Author: mahesh0431

released/discovery_center/mission_4033/locals.tf

@@ -1,4 +1,4 @@
-# Discovery Center mission - Create simple, connected digital experiences with API-based integration
+# Discovery Center mission - Create simple, connected digital experiences with API-based integration - Step 1
 
 ## Overview
 
@@ -25,7 +25,7 @@ To deploy the resources you must:
    export 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]`.
 
@@ -53,5 +53,5 @@ To deploy the resources you must:
 You probably want to remove the assets after trying them out to avoid unnecessary costs. To do so execute the following command:
 
 ```bash
-terraform destroy
+terraform destroy -var-file="samples.tfvars"
 ```

released/discovery_center/mission_4033/outputs.tf

@@ -0,0 +1,18 @@
+output "subaccount_id" {
+  value       = data.btp_subaccount.dc_mission.id
+  description = "The ID of the project subaccount."
+}
+
+output "integration_suite_url" {
+  value = btp_subaccount_subscription.sap_integration_suite.subscription_url
+}
+
+output "process_automation_subscription_url" {
+  value       = btp_subaccount_subscription.build_process_automation.subscription_url
+  description = "Subscription URL for SAP Build Process Automation"
+}
+
+output "kyma_url" {
+  value       = btp_subaccount_environment_instance.kyma.dashboard_url
+  description = "Subscription URL for SAP Build Process Automation"
+}

released/discovery_center/mission_4033/README.md renamed to released/discovery_center/mission_4033/step1/README.md

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.6.0"
     }
   }
 }

released/discovery_center/mission_4033/main.tf renamed to released/discovery_center/mission_4033/step1/main.tf

@@ -5,7 +5,7 @@
 globalaccount   = "yourglobalaccount"
 region          = "us10"
 subaccount_name = "DC Mission 4033 - Create simple, connected digital experiences with API-based integration 1"
-custom_idp      = "xxxxxxxxxxxxx.accounts.ondemand.com"
+custom_idp      = "<your_idp>.accounts.ondemand.com"
 
 kyma_instance = {
   name            = "my-kyma-environment"
@@ -23,7 +23,6 @@ kyma_instance = {
 # ------------------------------------------------------------------------------------------------------
 subaccount_admins               = ["[email protected]"]
 subaccount_service_admins       = ["[email protected]"]
-conn_dest_admins                = ["[email protected]"]
 int_provisioners                = ["[email protected]"]
 users_buildApps_admins          = ["[email protected]"]
 users_registry_admins           = ["[email protected]"]

released/discovery_center/mission_4033/step1/outputs.tf

@@ -0,0 +1,186 @@
+######################################################################
+# Customer account setup
+######################################################################
+# subaccount
+variable "globalaccount" {
+  type        = string
+  description = "The globalaccount subdomain."
+  default     = "yourglobalaccount"
+}
+# subaccount
+variable "subaccount_name" {
+  type        = string
+  description = "The subaccount name."
+  default     = "DC Mission 4033 - Create simple, connected digital experiences with API-based integration"
+}
+
+variable "subaccount_id" {
+  type        = string
+  description = "The subaccount ID."
+  default     = ""
+}
+
+# Region
+variable "region" {
+  type        = string
+  description = "The region where the project account shall be created in."
+  default     = "us10"
+}
+
+# CLI server
+variable "cli_server_url" {
+  type        = string
+  description = "The BTP CLI server URL."
+  default     = "https://cli.btp.cloud.sap"
+}
+
+variable "subaccount_admins" {
+  type        = list(string)
+  description = "Defines the colleagues who are added to each subaccount as Subaccount administrators."
+}
+
+variable "subaccount_service_admins" {
+  type        = list(string)
+  description = "Defines the colleagues who are added to each subaccount as Subaccount service administrators."
+}
+
+variable "service_plan__sap_build_apps" {
+  type        = string
+  description = "The plan for SAP Build Apps subscription"
+  default     = "free"
+  validation {
+    condition     = contains(["free", "standard", "partner"], var.service_plan__sap_build_apps)
+    error_message = "Invalid value for service_plan__sap_build_apps. Only 'free', 'standard' and 'partner' are allowed."
+  }
+}
+
+variable "service_plan__sap_process_automation" {
+  type        = string
+  description = "The plan for SAP Build Process Automation"
+  default     = "standard"
+}
+
+variable "service_plan__sap_integration_suite" {
+  type        = string
+  description = "The plan for SAP Integration Suite"
+  default     = "enterprise_agreement"
+  validation {
+    condition     = contains(["enterprise_agreement", "free"], var.service_plan__sap_integration_suite)
+    error_message = "Invalid value for service_plan__sap_integration_suite. Only 'enterprise_agreement' and 'free' are allowed."
+  }
+}
+
+variable "service_plan__apimanagement_apiportal" {
+  type        = string
+  description = "The plan for SAP Build Process Automation"
+  default     = "apiportal-apiaccess"
+}
+
+variable "service_plan__apimanagement_devportal" {
+  type        = string
+  description = "The plan for SAP Build Process Automation"
+  default     = "devportal-apiaccess"
+}
+
+###
+# Entitlements
+###
+variable "entitlements" {
+  type = list(object({
+    service_name = string
+    plan_name    = string
+    type         = string
+  }))
+  description = "The list of entitlements that shall be added to the subaccount."
+  default = [
+    {
+      service_name = "apimanagement-apiportal"
+      plan_name    = "apiportal-apiaccess",
+      type         = "service"
+    },
+    {
+      service_name = "apimanagement-devportal"
+      plan_name    = "devportal-apiaccess",
+      type         = "service"
+    }
+  ]
+}
+
+variable "kyma_instance" { type = object({
+  name            = string
+  region          = string
+  machine_type    = string
+  auto_scaler_min = number
+  auto_scaler_max = number
+  createtimeout   = string
+  updatetimeout   = string
+  deletetimeout   = string
+}) }
+
+variable "int_provisioners" {
+  type        = list(string)
+  description = "Integration Provisioner"
+}
+
+variable "custom_idp" {
+  type        = string
+  description = "Defines the custom IDP to be used for the subaccount"
+  default     = ""
+}
+
+variable "users_buildApps_admins" {
+  type        = list(string)
+  description = "Defines the colleagues who have the role of 'BuildAppsAdmin' in SAP Build Apps."
+}
+
+variable "users_buildApps_developers" {
+  type        = list(string)
+  description = "Defines the colleagues who have the role of 'BuildAppsDeveloper' in SAP Build Apps."
+}
+
+variable "users_registry_admins" {
+  type        = list(string)
+  description = "Defines the colleagues who have the role of 'RegistryAdmin' in SAP Build Apps."
+}
+
+variable "users_registry_developers" {
+  type        = list(string)
+  description = "Defines the colleagues who have the role of RegistryDeveloper' in SAP Build Apps."
+}
+
+variable "process_automation_admins" {
+  type        = list(string)
+  description = "Defines the users who have the role of ProcessAutomationAdmin in SAP Build Process Automation"
+}
+
+variable "process_automation_developers" {
+  type        = list(string)
+  description = "Defines the users who have the role of ProcessAutomationDeveloper in SAP Build Process Automation"
+}
+
+variable "process_automation_participants" {
+  type        = list(string)
+  description = "Defines the users who have the role of ProcessAutomationParticipant in SAP Build Process Automation"
+}
+
+variable "service_plan__sap_identity_services_onboarding" {
+  type        = string
+  description = "The plan for service 'Cloud Identity Services' with technical name 'sap-identity-services-onboarding'"
+  default     = "default"
+  validation {
+    condition     = contains(["default"], var.service_plan__sap_identity_services_onboarding)
+    error_message = "Invalid value for service_plan__sap_identity_services_onboarding. Only 'default' is allowed."
+  }
+}
+
+variable "custom_idp_apps_origin_key" {
+  type        = string
+  description = "The custom identity provider for the subaccount."
+  default     = "sap.custom"
+}
+
+variable "create_tfvars_file_for_step2" {
+  type        = bool
+  description = "Switch to enable the creation of the tfvars file for step 2."
+  default     = true
+}

released/discovery_center/mission_4033/provider.tf renamed to released/discovery_center/mission_4033/step1/provider.tf

@@ -0,0 +1,39 @@
+# Discovery Center mission - Create simple, connected digital experiences with API-based integration - Step 2
+
+## Overview
+
+This script shows how to create a SAP BTP subaccount for Discovery Center Mission: Create simple, connected digital experiences with API-based integration. Step 2 comprises all activities that depend on the step 1 completion.
+
+
+## Deploying the resources
+
+To deploy the resources you must:
+
+
+1. If you did not create a `tfvars` file in step 1 (via the variable `create_tfvars_file_for_step2`) you must manually Take the output of step 1 and transfer it in a `tfvars` file e.g. `sample.tfvars` file to meet your requirements. Of course you can also further adjust the generated `tfvars` file from step 1.
+
+2. If not already done in step 1, initialize your workspace:
+
+   ```bash
+   terraform init
+   ```
+
+3. You can check what Terraform plans to apply based on your configuration. If you use the generated `tfvars` file from step 1 you do not need need to explicitly add the filename to the command:
+
+   ```bash
+   terraform plan -var-file="terraform.tfvars" 
+   ```
+
+4. According to the variants of step 3. apply your configuration to provision the resources either via:
+
+   ```bash
+   terraform apply -var-file="terraform.tfvars"
+   ```
+
+## In the end
+
+You probably want to remove the assets after trying them out to avoid unnecessary costs. To do so execute the command fitting your setup:
+
+```bash
+terraform destroy -var-file="terraform.tfvars" 
+```

released/discovery_center/mission_4033/sample.tfvars renamed to released/discovery_center/mission_4033/step1/sample.tfvars

@@ -0,0 +1,14 @@
+# ------------------------------------------------------------------------------------------------------
+# Import custom trust config and disable for user login
+# ------------------------------------------------------------------------------------------------------
+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 = false
+}