chore: update cf steps

Author: prajin-op

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE3/SOLUTION_EX3/main.tf

@@ -22,25 +22,35 @@ resource "btp_subaccount" "project" {
 }
 
 ###
-# Assignment of emergency admins to subaccount
+# Entitlement Subscription and Role Assignment for BAS
 ###
-resource "btp_subaccount_role_collection_assignment" "subaccount_users" {
-  for_each             = toset(var.emergency_admins)
-  subaccount_id        = btp_subaccount.project.id
-  role_collection_name = "Subaccount Administrator"
-  user_name            = each.value
-}
 
-###
-# Assignment of entitlements
-###
-resource "btp_subaccount_entitlement" "entitlements" {
-  for_each = {
-    for index, entitlement in var.entitlements :
-    index => entitlement
-  }
+resource "btp_subaccount_entitlement" "bas" {
+  subaccount_id = btp_subaccount.project.id
+  service_name  = "sapappstudio"
+  plan_name     = var.bas_plan
+  amount        = 1
+}
 
+resource "btp_subaccount_subscription" "bas" {
   subaccount_id = btp_subaccount.project.id
-  service_name  = each.value.name
-  plan_name     = each.value.plan
+  app_name      = "sapappstudio"
+  plan_name     = var.bas_plan
+  depends_on    = [btp_subaccount_entitlement.bas]
 }
+
+resource "btp_subaccount_role_collection_assignment" "bas_admin" {
+  for_each             = toset(var.bas_admins)
+  subaccount_id        = btp_subaccount.project.id
+  role_collection_name = "Business_Application_Studio_Administrator"
+  user_name            = each.value
+  depends_on           = [btp_subaccount_subscription.bas]
+}
+
+resource "btp_subaccount_role_collection_assignment" "bas_developer" {
+  for_each             = toset(var.bas_developers)
+  subaccount_id        = btp_subaccount.project.id
+  role_collection_name = "Business_Application_Studio_Developer"
+  user_name            = each.value
+  depends_on           = [btp_subaccount_subscription.bas]
+}

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE3/SOLUTION_EX3/variables.tf

@@ -66,16 +66,6 @@ variable "org_name" {
   }
 }
 
-###
-# Emergency admin setup
-###
-variable "emergency_admins" {
-  type        = list(string)
-  description = "Defines the colleagues who are added to each subaccount as emergency administrators."
-  default     = ["[email protected]", "[email protected]"]
-}
-
-
 ###
 # Entitlement for BAS
 ###

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE4/README.md

@@ -8,7 +8,7 @@ In this section, we will create a Cloud Foundry environment in the subaccount us
 
 The Cloud Foundry Application Runtime service needs to be entitled to the subaccount. To achieve this, add the following resource to your Terraform configuration:
 
-### Step 1: Add the module to the Terraform configuration
+### Step 1: Add the resources to the Terraform configuration for cloudfoundry setup
 
 First we need to add one more local variable in the `main.tf` file. Open the `main.tf` file and add the following code to the `locals` block:
 
@@ -47,7 +47,7 @@ resource "btp_subaccount_environment_instance" "cloudfoundry" {
 
 ### Step 2: Adjust the output variables
 
-As we are using the output variables of the module, we need to adjust the output variables in the `outputs.tf` file. Open the `outputs.tf` file and add the following code:
+As we are using the output variables, we need to adjust the output variables in the `outputs.tf` file. Open the `outputs.tf` file and add the following code:
 
 ```terraform
 output "cloudfoundry_org_name" {
@@ -56,8 +56,6 @@ output "cloudfoundry_org_name" {
 }
 ```
 
-We reference the output variables of the module via the `module` keyword. Save the changes.
-
 ### Step 4: Adjust the provider configuration
 
 As we are using an additional provider we must make Terraform aware of this in the `provider.tf` file. Open the `provider.tf` file and add the following code to the `required_provider` block:
@@ -76,7 +74,6 @@ provider "cloudfoundry" {
   api_url = "https://api.cf.${var.region}-001.hana.ondemand.com"
 }
 ```
-
 Save your changes.
 
 > [!WARNING]
@@ -103,7 +100,7 @@ To fulfill all requirements for the authentication against the Cloud Foundry env
 
 ### Step 3: Apply the changes
 
-As we have a new provider and a new module in place, we need to re-initialize the setup to download the required provider and module. Run the following command:
+As we have a new provider in place, we need to re-initialize the setup to download the required provider and module. Run the following command:
 
 ```bash
 terraform init
@@ -146,9 +143,9 @@ You can also check that everything is in place via the SAP BTP cockpit. You shou
 
 ## Creation of a Cloud Foundry space
 
-As a last task we also want to add a Cloud Foundry space to the Cloud Foundry environment. We will use the same concept as before and leverage a module. Navigate to the `modules` folder in the root of this repo and you will find the fitting module at [environments/cloudfoundry/space_cf](../../modules/environment/cloudfoundry/space_cf/README.md).
+As a last task we also want to add a Cloud Foundry space to the Cloud Foundry environment. 
 
-### Step 1: Add the space name variable to the configuration
+### Step 1: Add the variable to the configuration for Space creation
 
 First we need to add more variable in the `variables.tf` file. Open the `variables.tf` file and add the following code:
 
@@ -198,9 +195,9 @@ variable "cf_space_auditors" {
 
 This allows us to specify the name of the Cloud Foundry space. We also define a default value (`dev`) for the variable. Save the changes.
 
-### Step 2: Add the module to the Terraform configuration
+### Step 2: Cloudfoundry Space Creation and Role Assignments
 
-To trigger the creation of a Cloud Foundry space and space roles, we add the module to the `main.tf` file. Open the `main.tf` file and add the following code:
+To trigger the creation of a Cloud Foundry space and space roles, Open the `main.tf` file and add the following code:
 
 ```terraform
 resource "cloudfoundry_org_role" "my_role" {
@@ -240,21 +237,19 @@ resource "cloudfoundry_space_role" "cf_space_auditors" {
 }
 ```
 
-Save the changes.
-
-### Step 3: Apply the changes
+### Step 3: Add the variables to tfvar file
 
-As we have all prerequisites already in place when it comes to provider configuration and authentication. However, we need to reinitialize the module that we use. To achieve that run the following command:
+Now we can add `space developers` and `space managers` to the space we created, Add following variables to your `tfvars` file.
 
-```bash
-terraform init
+```terraform
+cf_org_user   = ["[email protected]"]     
+cf_space_developers = ["[email protected]"]
 ```
+Save the changes.
 
-The output should look like this:
-
-<img width="600px" src="assets/ex7_5.png" alt="executing terraform init with cloud foundry provider">
+### Step 4: Apply the changes
 
-Once we have initialized the module we can proceed with the creation of the Cloud Foundry space. As before we execute the following commands:
+As we have all prerequisites already in place when it comes to provider configuration and authentication, we can proceed with applying the changes.
 
 1. Plan the Terraform configuration to see what will be created:
 

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE4/SOLUTION_EX4/main.tf

@@ -21,16 +21,6 @@ resource "btp_subaccount" "project" {
   usage = "NOT_USED_FOR_PRODUCTION"
 }
 
-###
-# Assignment of emergency admins to subaccount
-###
-resource "btp_subaccount_role_collection_assignment" "subaccount_users" {
-  for_each             = toset(var.emergency_admins)
-  subaccount_id        = btp_subaccount.project.id
-  role_collection_name = "Subaccount Administrator"
-  user_name            = each.value
-}
-
 
 ###
 # Creation of Cloud Foundry environment via module

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE4/SOLUTION_EX4/terraform.tfvars-sample

@@ -2,41 +2,8 @@ globalaccount = "<YOUR GLOBAL ACCOUT SUBDOMAIN>"
 
 region        = "us10"
 
-costcenter = "9876543210"
+costcenter = "<YOUR NEW VALUE>"
 
-entitlements = [
-  {
-    name   = "alert-notification"
-    plan   = "standard"
-    amount = null
-  },
-  {
-    name   = "SAPLaunchpad"
-    plan   = "standard"
-    amount = null
-  },
-  {
-    name   = "hana-cloud-trial"
-    plan   = "hana"
-    amount = null
-  },
-  {
-    name   = "hana"
-    plan   = "hdi-shared"
-    amount = null
-  },
-  {
-    name   = "sapappstudiotrial"
-    plan   = "trial"
-    amount = null
-  }
-]
-
-subscriptions = [
-  {
-    app_name = "sapappstudiotrial"
-    plan     = "trial"
-  }
-]
-
-costcenter = "<YOUR NEW VALUE>"
+bas_plan_name = "trial"
+bas_admins     = ["[email protected]"]
+bas_developers = ["[email protected]"]

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE4/SOLUTION_EX4/variables.tf

@@ -66,15 +66,6 @@ variable "org_name" {
   }
 }
 
-###
-# Emergency admin setup
-###
-variable "emergency_admins" {
-  type        = list(string)
-  description = "Defines the colleagues who are added to each subaccount as emergency administrators."
-  default     = ["[email protected]", "[email protected]"]
-}
-
 variable "bas_plan_name" {
   description = "BAS plan"
   type        = string