chore: update exercises for SIT

Author: prajin-op

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

@@ -72,6 +72,7 @@ variable "stage" {
 
 You can see a different type of validation here. We use the [`contains` function](https://developer.hashicorp.com/terraform/language/functions/contains) to check if the input is part of the list of valid stages.
 
+
 #### Input variable *costcenter*
 
 Let us move on to the *cost center* variable. Add the following code to the `variables.tf` file:
@@ -91,6 +92,9 @@ variable "costcenter" {
 
 Nothing new here that we have not seen before. We use the `can` expression to check if the input is valid when compared to a specific regular expression leveraging the `regex` function.
 
+> [!NOTE]
+> You can also use functions inside of functions to express more complex conditions such as [concat function](https://developer.hashicorp.com/terraform/language/functions/concat) to combine multiple lists into one list and then use the `contains` function to check if the input is part of that list.
+
 #### Input variable *org_name*
 
 And last but not least we want to add and validate the *organization name* variable. Add the following code to the `variables.tf` file:
@@ -100,23 +104,9 @@ variable "org_name" {
   type        = string
   description = "Defines to which organization the project account shall belong to."
   default     = "B2C"
-
-  validation {
-    condition = contains(concat(
-      // Cross Development
-      ["B2B", "B2C", "ECOMMERCE"],
-      // Internal IT
-      ["PLATFORMDEV", "INTIT"],
-      // Financial Services
-      ["FSIT"],
-    ), var.org_name)
-    error_message = "Please select a valid org name for the project account."
-  }
 }
 ```
 
-As you can see you can also use functions inside of functions to express more complex conditions. In this case we use the [`concat` function](https://developer.hashicorp.com/terraform/language/functions/concat) to combine multiple lists into one list and then use the `contains` function to check if the input is part of the list of valid organization names.
-
 As we have all variables in place, you should save the changes now.
 
 > [!NOTE]
@@ -157,11 +147,10 @@ resource "btp_subaccount" "project" {
     "stage"      = ["${var.stage}"],
     "costcenter" = ["${var.costcenter}"]
   }
-  usage = "NOT_USED_FOR_PRODUCTION"
 }
 ```
 
-We used the resource [`btp_subaccount`](https://registry.terraform.io/providers/SAP/btp/latest/docs/resources/subaccount) to create the subaccount. We referenced the local values to set the name and domain. We added labels to the subaccount to display the stage and cost center. The usage of the subaccount is hardcoded to `NOT_USED_FOR_PRODUCTION`.
+We used the resource [`btp_subaccount`](https://registry.terraform.io/providers/SAP/btp/latest/docs/resources/subaccount) to create the subaccount. We referenced the local values to set the name and domain. We added labels to the subaccount to display the stage and cost center.
 
 As we have the configuration in place, you should save the changes now.
 

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE2/SOLUTION_EX2/main.tf

@@ -17,5 +17,4 @@ resource "btp_subaccount" "project" {
     "stage"      = ["${var.stage}"],
     "costcenter" = ["${var.costcenter}"]
   }
-  usage = "NOT_USED_FOR_PRODUCTION"
 }

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE2/SOLUTION_EX2/variables.tf

@@ -52,16 +52,4 @@ variable "org_name" {
   type        = string
   description = "Defines to which organisation the project account shall belong to."
   default     = "B2C"
-
-  validation {
-    condition = contains(concat(
-      // Cross Development
-      ["B2B", "B2C", "ECOMMERCE"],
-      // Internal IT
-      ["PLATFORMDEV", "INTIT"],
-      // Financial Services
-      ["FSIT"],
-    ), var.org_name)
-    error_message = "Please select a valid org name for the project account."
-  }
 }

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

@@ -79,7 +79,7 @@ variable "bas_developers" {
   description = "List of users to assign the Developer role."
 }
 variable "bas_service_name" {
-  type        =  string
+  type        = string
   description = "Service name for Business Application Studio."
   default     = "sapappstudio"
 

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

@@ -33,7 +33,6 @@ resource "btp_subaccount_entitlement" "cf_application_runtime" {
   subaccount_id = btp_subaccount.project.id
   service_name  = "APPLICATION_RUNTIME"
   plan_name     = "MEMORY"
-  amount        = 1
 }
 
 resource "btp_subaccount_environment_instance" "cloudfoundry" {
@@ -46,7 +45,6 @@ resource "btp_subaccount_environment_instance" "cloudfoundry" {
   plan_name        = "trial"
   parameters = jsonencode({
     instance_name = local.project_subaccount_cf_org
-    memory        = 1024
   })
   timeouts = {
     create = "1h"

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

@@ -18,7 +18,6 @@ resource "btp_subaccount" "project" {
     "stage"      = ["${var.stage}"],
     "costcenter" = ["${var.costcenter}"]
   }
-  usage = "NOT_USED_FOR_PRODUCTION"
 }
 
 
@@ -29,7 +28,6 @@ resource "btp_subaccount_entitlement" "cf_application_runtime" {
   subaccount_id = btp_subaccount.project.id
   service_name  = "APPLICATION_RUNTIME"
   plan_name     = "MEMORY"
-  amount        = 1
 }
 
 resource "btp_subaccount_environment_instance" "cloudfoundry" {

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE5/SOLUTION_EX5/main.tf

@@ -1,15 +1,9 @@
-###
-# Setup of names in accordance to the company's naming conventions
-###
 locals {
   project_subaccount_name   = "${var.org_name} | ${var.project_name}: CF - ${var.stage}"
   project_subaccount_domain = lower(replace("${var.org_name}-${var.project_name}-${var.stage}", " ", "-"))
   project_subaccount_cf_org = replace("${var.org_name}_${lower(var.project_name)}-${lower(var.stage)}", " ", "_")
 }
 
-###
-# Creation of subaccount
-###
 resource "btp_subaccount" "project" {
   name      = local.project_subaccount_name
   subdomain = local.project_subaccount_domain
@@ -18,15 +12,91 @@ resource "btp_subaccount" "project" {
     "stage"      = ["${var.stage}"],
     "costcenter" = ["${var.costcenter}"]
   }
-  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)
+resource "btp_subaccount_entitlement" "bas" {
+  subaccount_id = btp_subaccount.project.id
+  service_name  = "sapappstudiotrial"
+  plan_name     = var.bas_plan_name
+}
+resource "btp_subaccount_subscription" "bas-subscribe" {
+  subaccount_id = btp_subaccount.project.id
+  app_name      = "sapappstudiotrial"
+  plan_name     = var.bas_plan_name
+  depends_on    = [btp_subaccount_entitlement.bas]
+}
+resource "btp_subaccount_role_collection_assignment" "Business_Application_Studio_Administrator" {
+  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-subscribe]
+}
+
+resource "btp_subaccount_role_collection_assignment" "Business_Application_Studio_Developer" {
   subaccount_id        = btp_subaccount.project.id
-  role_collection_name = "Subaccount Administrator"
+  role_collection_name = "Business_Application_Studio_Developer"
+  for_each             = toset(var.bas_developers)
   user_name            = each.value
+  depends_on           = [btp_subaccount_subscription.bas-subscribe]
+}
+
+resource "btp_subaccount_entitlement" "cf_application_runtime" {
+  subaccount_id = btp_subaccount.project.id
+  service_name  = "APPLICATION_RUNTIME"
+  plan_name     = "MEMORY"
+}
+
+resource "btp_subaccount_environment_instance" "cloudfoundry" {
+  depends_on       = [btp_subaccount_entitlement.cf_application_runtime]
+  subaccount_id    = btp_subaccount.project.id
+  name             = local.project_subaccount_cf_org
+  landscape_label  = var.cf_landscape_label
+  environment_type = "cloudfoundry"
+  service_name     = "cloudfoundry"
+  plan_name        = "trial"
+  parameters = jsonencode({
+    instance_name = local.project_subaccount_cf_org
+  })
+  timeouts = {
+    create = "1h"
+    update = "35m"
+    delete = "30m"
+  }
+}
+
+resource "cloudfoundry_org_role" "my_role" {
+  for_each = var.cf_org_user
+  username = each.value
+  type     = "organization_user"
+  org      = btp_subaccount_environment_instance.cloudfoundry.platform_id
+}
+
+resource "cloudfoundry_space" "space" {
+  name = var.name
+  org  = btp_subaccount_environment_instance.cloudfoundry.platform_id
+}
+
+resource "cloudfoundry_space_role" "cf_space_managers" {
+  for_each   = toset(var.cf_space_managers)
+  username   = each.value
+  type       = "space_manager"
+  space      = cloudfoundry_space.space.id
+  depends_on = [cloudfoundry_org_role.my_role]
+}
+
+resource "cloudfoundry_space_role" "cf_space_developers" {
+  for_each   = toset(var.cf_space_developers)
+  username   = each.value
+  type       = "space_developer"
+  space      = cloudfoundry_space.space.id
+  depends_on = [cloudfoundry_org_role.my_role]
+}
+
+resource "cloudfoundry_space_role" "cf_space_auditors" {
+  for_each   = toset(var.cf_space_auditors)
+  username   = each.value
+  type       = "space_auditor"
+  space      = cloudfoundry_space.space.id
+  depends_on = [cloudfoundry_org_role.my_role]
 }

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE5/SOLUTION_EX5/outputs.tf

@@ -7,3 +7,8 @@ output "subaccount_name" {
   value       = btp_subaccount.project.name
   description = "The name of the project subaccount."
 }
+
+output "cloudfoundry_org_name" {
+  value       = local.project_subaccount_cf_org
+  description = "The name of the cloudfoundry org connected to the project account."
+}

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE5/SOLUTION_EX5/provider.tf

@@ -1,16 +1,21 @@
-
 terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
       version = "~> 1.8.0"
     }
+    cloudfoundry = {
+      source  = "cloudfoundry/cloudfoundry"
+      version = "~> 1.1.0"
+    }
   }
 
 }
 
-# Please checkout documentation on how best to authenticate against SAP BTP
-# via the Terraform provider for SAP BTP
 provider "btp" {
   globalaccount = var.globalaccount
 }
+
+provider "cloudfoundry" {
+  api_url = "https://api.cf.${var.region}-001.hana.ondemand.com"
+}

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE5/SOLUTION_EX5/variables.tf

@@ -1,6 +1,3 @@
-###
-# Provider configuration
-###
 variable "globalaccount" {
   type        = string
   description = "The subdomain of the SAP BTP global account."
@@ -12,13 +9,10 @@ variable "region" {
   default     = "us10"
 }
 
-###
-# Subaccount setup
-###
 variable "project_name" {
   type        = string
   description = "The subaccount name."
-  default     = "proj-1234"
+  default     = "myproj-1234"
 
   validation {
     condition     = can(regex("^[a-zA-Z0-9_\\-]{1,200}", var.project_name))
@@ -48,29 +42,74 @@ variable "costcenter" {
   }
 }
 
+variable "bas_plan_name" {
+  description = "BAS plan"
+  type        = string
+  default     = "free"
+}
+
+variable "bas_developers" {
+  description = "BAS developers"
+  type        = list(string)
+  default     = ["[email protected]", "[email protected]"]
+}
+
+variable "bas_admins" {
+  description = "BAS Admininstrators"
+  type        = list(string)
+  default     = ["[email protected]", "[email protected]"]
+}
+
 variable "org_name" {
   type        = string
   description = "Defines to which organisation the project account shall belong to."
   default     = "B2C"
+}
 
-  validation {
-    condition = contains(concat(
-      // Cross Development
-      ["B2B", "B2C", "ECOMMERCE"],
-      // Internal IT
-      ["PLATFORMDEV", "INTIT"],
-      // Financial Services
-      ["FSIT"],
-    ), var.org_name)
-    error_message = "Please select a valid org name for the project account."
-  }
+variable "cf_space_name" {
+  type        = string
+  description = "The name of the Cloud Foundry space."
+  default     = "dev"
 }
 
-###
-# Emergency admin setup
-###
-variable "emergency_admins" {
-  type        = list(string)
-  description = "Defines the colleagues who are added to each subaccount as emergency administrators."
+variable "cf_landscape_label" {
+  type        = string
+  description = "The region where the project account shall be created in."
+  default     = "cf-us10-001"
+}
+
+variable "cf_org_name" {
+  type        = string
+  description = "The name for the Cloud Foundry Org."
+  default     = ""
+}
+
+variable "cf_org_user" {
+  type        = set(string)
+  description = "Defines the colleagues who are added to each subaccount as subaccount administrators."
   default     = ["[email protected]", "[email protected]"]
 }
+
+variable "name" {
+  type        = string
+  description = "The name of the Cloud Foundry space."
+  default     = "dev"
+}
+
+variable "cf_space_managers" {
+  type        = list(string)
+  description = "The list of Cloud Foundry space managers."
+  default     = []
+}
+
+variable "cf_space_developers" {
+  type        = list(string)
+  description = "The list of Cloud Foundry space developers."
+  default     = []
+}
+
+variable "cf_space_auditors" {
+  type        = list(string)
+  description = "The list of Cloud Foundry space auditors."
+  default     = []
+}