fix: update SIT workshop scripts and docs

Author: prajin-op

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

@@ -29,14 +29,7 @@ variable "cf_landscape_label" {
 Then add the following code to the `main.tf`
 
 ```terraform
-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

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

@@ -20,18 +20,10 @@ resource "btp_subaccount" "project" {
   }
 }
 
-
 ###
-# Creation of Cloud Foundry environment via module
+# Creation of Cloud Foundry environment
 ###
-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
@@ -47,40 +39,4 @@ resource "btp_subaccount_environment_instance" "cloudfoundry" {
     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.cf_space_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/EXERCISE4/SOLUTION_EX4/provider.tf

@@ -5,20 +5,11 @@ terraform {
       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/EXERCISE4/SOLUTION_EX4/variables.tf

@@ -52,18 +52,6 @@ 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 "bas_plan_name" {
@@ -84,47 +72,8 @@ variable "bas_admins" {
   default     = ["[email protected]", "[email protected]"]
 }
 
-###
-# Cloud Foundry space setup
-###
-variable "cf_space_name" {
-  type        = string
-  description = "The name of the Cloud Foundry space."
-  default     = "dev"
-}
-
 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 "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     = []
-}

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

@@ -110,12 +110,6 @@ variable "cf_landscape_label" {
   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."
@@ -156,7 +150,7 @@ resource "cloudfoundry_org_role" "my_role" {
 }
 
 resource "cloudfoundry_space" "space" {
-  name = var.name
+  name = var.cf_space_name
   org  = btp_subaccount_environment_instance.cloudfoundry.platform_id
 }
 

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

@@ -41,14 +41,7 @@ resource "btp_subaccount_role_collection_assignment" "Business_Application_Studi
   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
@@ -73,7 +66,7 @@ resource "cloudfoundry_org_role" "my_role" {
 }
 
 resource "cloudfoundry_space" "space" {
-  name = var.name
+  name = var.cf_space_name
   org  = btp_subaccount_environment_instance.cloudfoundry.platform_id
 }
 

released/SAP-Inside-Tracks/SITBLR_DEC_2024/exercises/EXERCISE5/SOLUTION_EX5/terraform.tfvars-sample

@@ -1 +1,12 @@
 globalaccount = "<YOUR GLOBAL ACCOUT SUBDOMAIN>"
+
+region        = "us10"
+
+
+bas_plan_name = "trial"
+bas_admins     = ["[email protected]"]
+bas_developers = ["[email protected]"]
+
+
+cf_org_user   = ["[email protected]"]  
+cf_space_developers = ["[email protected]"]

released/SAP-Inside-Tracks/SITBLR_DEC_2024/solution/main.tf

@@ -48,14 +48,7 @@ resource "btp_subaccount_role_collection_assignment" "Business_Application_Studi
   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
@@ -64,7 +57,6 @@ resource "btp_subaccount_environment_instance" "cloudfoundry" {
   plan_name        = "trial"
   parameters = jsonencode({
     instance_name = local.project_subaccount_cf_org
-    memory        = 1024
   })
   timeouts = {
     create = "1h"
@@ -81,7 +73,7 @@ resource "cloudfoundry_org_role" "my_role" {
 }
 
 resource "cloudfoundry_space" "space" {
-  name = var.name
+  name = var.cf_space_name
   org  = btp_subaccount_environment_instance.cloudfoundry.platform_id
 }
 

released/SAP-Inside-Tracks/SITBLR_DEC_2024/solution/terraform.tfvars-sample

@@ -4,5 +4,5 @@ bas_plan_name = "trial"
 bas_admins     = ["[email protected]"]
 bas_developers = ["[email protected]"]
 
-cf_org_user   = ["[email protected]"]     
+cf_org_user   = ["[email protected]"]  
 cf_space_developers = ["[email protected]"]

released/SAP-Inside-Tracks/SITBLR_DEC_2024/solution/variables.tf

@@ -84,24 +84,12 @@ variable "cf_landscape_label" {
   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."