increase timeouts, remove email validation (#263)

Author: markusbalsam

released/discovery_center/mission_3061/step1/variables.tf

@@ -48,73 +48,34 @@ variable "cf_space_name" {
 variable "cf_org_managers" {
   type        = list(string)
   description = "List of Cloud Foundry org managers."
-  default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_managers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_managers)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "cf_org_billing_managers" {
   type        = list(string)
   description = "List of Cloud Foundry org billing managers."
   default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_billing_managers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_billing_managers)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "cf_org_auditors" {
   type        = list(string)
   description = "List of Cloud Foundry org auditors."
   default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_auditors : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_auditors)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "cf_space_managers" {
   type        = list(string)
   description = "List of managers for the Cloud Foundry space."
-  default     = []
-
-  # add validation to check if admins 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 subaccount admins."
-  }
 }
 
 variable "cf_space_developers" {
   type        = list(string)
   description = "List of developers for the Cloud Foundry space."
-  default     = []
-
-  # add validation to check if admins 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 subaccount admins."
-  }
 }
 
 variable "cf_space_auditors" {
   type        = list(string)
   description = "The list of Cloud Foundry space auditors."
   default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_space_auditors : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_space_auditors)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "abap_sid" {

released/discovery_center/mission_3061/step2/main.tf

@@ -92,9 +92,9 @@ resource "cloudfoundry_service_instance" "abap_si" {
     login_attribute          = "email"
   })
   timeouts = {
-    create = "2h"
-    delete = "2h"
-    update = "2h"
+    create = "4h"
+    delete = "4h"
+    update = "4h"
   }
 }
 

released/discovery_center/mission_3061/step2/variables.tf

@@ -18,73 +18,34 @@ variable "origin" {
 variable "cf_org_managers" {
   type        = list(string)
   description = "List of Cloud Foundry org managers."
-  default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_managers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_managers)
-    error_message = "Please enter a valid email address for the Cloud Foundry org managers."
-  }
 }
 
 variable "cf_org_billing_managers" {
   type        = list(string)
   description = "List of Cloud Foundry org billing managers."
   default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_billing_managers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_billing_managers)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "cf_org_auditors" {
   type        = list(string)
   description = "List of Cloud Foundry org auditors."
   default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_org_auditors : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_org_auditors)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "cf_space_managers" {
   type        = list(string)
   description = "List of managers for the Cloud Foundry space."
-  default     = []
-
-  # add validation to check if admins 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 subaccount admins."
-  }
 }
 
 variable "cf_space_developers" {
   type        = list(string)
   description = "List of developers for the Cloud Foundry space."
-  default     = []
-
-  # add validation to check if admins 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 subaccount admins."
-  }
 }
 
 variable "cf_space_auditors" {
   type        = list(string)
   description = "The list of Cloud Foundry space auditors."
   default     = []
-
-  # add validation to check if admins contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.cf_space_auditors : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.cf_space_auditors)
-    error_message = "Please enter a valid email address for the subaccount admins."
-  }
 }
 
 variable "cf_space_name" {