fixes

Author: mahesh0431

released/discovery_center/mission_3501/step1/main.tf

@@ -242,7 +242,7 @@ resource "btp_subaccount_subscription" "event_mesh_application" {
 }
 
 resource "btp_subaccount_role_collection_assignment" "event_mesh_admin" {
-  depends_on           = [btp_subaccount_entitlement.event_mesh_application]
+  depends_on           = [btp_subaccount_subscription.event_mesh_application]
   for_each             = toset(var.event_mesh_admins)
   subaccount_id        = data.btp_subaccount.dc_mission.id
   role_collection_name = "Enterprise Messaging Administrator"
@@ -251,7 +251,7 @@ resource "btp_subaccount_role_collection_assignment" "event_mesh_admin" {
 }
 
 resource "btp_subaccount_role_collection_assignment" "event_mesh_developer" {
-  depends_on           = [btp_subaccount_entitlement.event_mesh_application]
+  depends_on           = [btp_subaccount_subscription.event_mesh_application]
   for_each             = toset(var.event_mesh_developers)
   subaccount_id        = data.btp_subaccount.dc_mission.id
   role_collection_name = "Enterprise Messaging Developer"
@@ -429,6 +429,7 @@ resource "local_file" "output_vars_step1" {
 
       cf_space_name        = "${var.cf_space_name}"
 
+      cf_org_users         = ${jsonencode(var.cf_org_users)}
       cf_org_admins        = ${jsonencode(var.cf_org_admins)}
       cf_space_developers  = ${jsonencode(var.cf_space_developers)}
       cf_space_managers    = ${jsonencode(var.cf_space_managers)}

released/discovery_center/mission_3501/step1/variables.tf

@@ -79,23 +79,11 @@ variable "origin_key" {
 variable "subaccount_admins" {
   type        = list(string)
   description = "Defines the colleagues who are added to each subaccount as subaccount administrators."
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.subaccount_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.subaccount_admins)
-    error_message = "Please enter a valid email address for the Subaccount Admins."
-  }
 }
 
 variable "subaccount_service_admins" {
   type        = list(string)
   description = "Defines the colleagues who are added to each subaccount as subaccount service administrators."
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.subaccount_service_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.subaccount_service_admins)
-    error_message = "Please enter a valid email address for the Subaccount service Admins."
-  }
 }
 
 variable "cf_space_name" {
@@ -134,45 +122,21 @@ variable "cf_space_developers" {
 variable "service_plan__sap_business_app_studio" {
   type        = string
   description = "The plan for SAP Business Application Studio"
-  default     = "standard-edition"
-  validation {
-    condition     = contains(["standard-edition"], var.service_plan__sap_business_app_studio)
-    error_message = "Invalid value for service_plan__sap_business_app_studio. Only 'standard-edition' is allowed."
-  }
 }
 
 variable "appstudio_developers" {
   type        = list(string)
   description = "Business Application Studio Developers"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if Business Application Studio Developers contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.appstudio_developers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.appstudio_developers)
-    error_message = "Please enter a valid email address for the Business Application Studio Developers"
-  }
 }
 
 variable "appstudio_admins" {
   type        = list(string)
   description = "Business Application Studio Administrators"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if Business Application Studio Administrators contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.appstudio_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.appstudio_admins)
-    error_message = "Please enter a valid email address for the Business Application Studio Administrators."
-  }
 }
 
 variable "hana_cloud_admins" {
   type        = list(string)
   description = "Defines the colleagues who are added as admins to access the instance of SAP HANA Cloud."
-  default     = ["[email protected]", "[email protected]"]
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.hana_cloud_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.hana_cloud_admins)
-    error_message = "Please enter a valid email address for the admins of SAP HANA Cloud instance."
-  }
 }
 
 
@@ -210,23 +174,11 @@ variable "hana_system_password" {
 variable "event_mesh_admins" {
   type        = list(string)
   description = "Enterprise Messaging Administrators"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.event_mesh_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.event_mesh_admins)
-    error_message = "Please enter a valid email address for the Enterprise Messaging Administrators."
-  }
 }
 
 variable "event_mesh_developers" {
   type        = list(string)
   description = "Enterprise Messaging Developers"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if Enterprise Messaging Developers contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.event_mesh_developers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.event_mesh_developers)
-    error_message = "Please enter a valid email address for the Enterprise Messaging Developers."
-  }
 }
 
 variable "service_plan__build_workzone" {
@@ -242,45 +194,21 @@ variable "service_plan__build_workzone" {
 variable "workzone_se_administrators" {
   type        = list(string)
   description = "Workzone Standard Edition Administrators"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if Workzone Standard Edition Administrators contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.workzone_se_administrators : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.workzone_se_administrators)
-    error_message = "Please enter a valid email address for the Workzone Standard Edition Administratorss."
-  }
 }
 
 variable "tms_admins" {
   type        = list(string)
   description = "TMS Administrators"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if TMS Administrators contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.tms_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.tms_admins)
-    error_message = "Please enter a valid email address for the TMS Administrators."
-  }
 }
 
 variable "tms_import_operators" {
   type        = list(string)
   description = "TMS Import Operators"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if TMS Import Operators contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.tms_import_operators : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.tms_import_operators)
-    error_message = "Please enter a valid email address for the TMS Import Operators."
-  }
 }
 
 variable "cicd_service_admins" {
   type        = list(string)
   description = "CICD Service Administrators"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if CICD Service Administrators contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cicd_service_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cicd_service_admins)
-    error_message = "Please enter a valid email address for the CICD Service Administrators."
-  }
 }
 
 # ------------------------------------------------------------------------------------------------------

released/discovery_center/mission_3501/step2/variables.tf

@@ -32,45 +32,21 @@ variable "subaccount_id" {
 variable "cf_space_developers" {
   type        = list(string)
   description = "CF Space developers"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if CF Space developers contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_space_developers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_space_developers)
-    error_message = "Please enter a valid email address for the CF Space developers."
-  }
 }
 
 variable "cf_space_managers" {
   type        = list(string)
   description = "CF Space managers"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if CF Space managers contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_space_managers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_space_managers)
-    error_message = "Please enter a valid email address for the Cloud Connector Administrators."
-  }
 }
 
 variable "cf_org_admins" {
   type        = list(string)
   description = "CF Org Admins"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if CF Org Admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_admins)
-    error_message = "Please enter a valid email address for the CF Org Admins."
-  }
 }
 
 variable "cf_org_users" {
   type        = list(string)
   description = "CF Org Users"
-  default     = ["[email protected]", "[email protected]"]
-  # add validation to check if CF Org Users contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_users : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_users)
-    error_message = "Please enter a valid email address for the CF Org Users."
-  }
 }
 
 variable "custom_idp" {