fix

mahesh0431 · mahesh0431 · commit 4735d004f97b · 2024-09-20T17:03:37.000+05:30
diff --git a/released/discovery_center/mission_4172/step1/main.tf b/released/discovery_center/mission_4172/step1/main.tf
@@ -175,46 +175,46 @@ data "btp_subaccount_service_plan" "hana_cloud" {
   depends_on    = [btp_subaccount_entitlement.hana_cloud]
 }
 
-resource "btp_subaccount_service_instance" "hana_cloud" {
-  subaccount_id  = data.btp_subaccount.dc_mission.id
-  serviceplan_id = data.btp_subaccount_service_plan.hana_cloud.id
-  name           = "my-hana-cloud-instance"
-  depends_on     = [btp_subaccount_entitlement.hana_cloud]
-  parameters = jsonencode(
-    {
-      "data" : {
-        "memory" : 32,
-        "edition" : "cloud",
-        "systempassword" : "${var.hana_system_password}",
-        "additionalWorkers" : 0,
-        "disasterRecoveryMode" : "no_disaster_recovery",
-        "enabledservices" : {
-          "docstore" : false,
-          "dpserver" : true,
-          "scriptserver" : false
-        },
-        "requestedOperation" : {},
-        "serviceStopped" : false,
-        "slaLevel" : "standard",
-        "storage" : 120,
-        "vcpu" : 2,
-        "whitelistIPs" : ["0.0.0.0/0"]
-      }
-  })
-
-  timeouts = {
-    create = "45m"
-    update = "45m"
-    delete = "45m"
-  }
-}
-
-# Create service binding to SAP HANA Cloud service 
-resource "btp_subaccount_service_binding" "hana_cloud" {
-  subaccount_id       = data.btp_subaccount.dc_mission.id
-  service_instance_id = btp_subaccount_service_instance.hana_cloud.id
-  name                = "hana-cloud-key"
-}
+# resource "btp_subaccount_service_instance" "hana_cloud" {
+#   subaccount_id  = data.btp_subaccount.dc_mission.id
+#   serviceplan_id = data.btp_subaccount_service_plan.hana_cloud.id
+#   name           = "my-hana-cloud-instance"
+#   depends_on     = [btp_subaccount_entitlement.hana_cloud]
+#   parameters = jsonencode(
+#     {
+#       "data" : {
+#         "memory" : 32,
+#         "edition" : "cloud",
+#         "systempassword" : "${var.hana_system_password}",
+#         "additionalWorkers" : 0,
+#         "disasterRecoveryMode" : "no_disaster_recovery",
+#         "enabledservices" : {
+#           "docstore" : false,
+#           "dpserver" : true,
+#           "scriptserver" : false
+#         },
+#         "requestedOperation" : {},
+#         "serviceStopped" : false,
+#         "slaLevel" : "standard",
+#         "storage" : 120,
+#         "vcpu" : 2,
+#         "whitelistIPs" : ["0.0.0.0/0"]
+#       }
+#   })
+
+#   timeouts = {
+#     create = "45m"
+#     update = "45m"
+#     delete = "45m"
+#   }
+# }
+
+# # Create service binding to SAP HANA Cloud service 
+# resource "btp_subaccount_service_binding" "hana_cloud" {
+#   subaccount_id       = data.btp_subaccount.dc_mission.id
+#   service_instance_id = btp_subaccount_service_instance.hana_cloud.id
+#   name                = "hana-cloud-key"
+# }
 
 # # ------------------------------------------------------------------------------------------------------
 # # Create app subscription to SAP Build Process Automation 
@@ -284,7 +284,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"
@@ -293,7 +293,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"
@@ -321,6 +321,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)}
diff --git a/released/discovery_center/mission_4172/step1/variables.tf b/released/discovery_center/mission_4172/step1/variables.tf
@@ -80,23 +80,11 @@ variable "origin_key" {
 variable "subaccount_admins" {
   type        = list(string)
   description = "Defines the colleagues who are added to each subaccount as subaccount administrators."
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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 "service_plan__sap_business_app_studio" {
@@ -112,35 +100,16 @@ variable "service_plan__sap_business_app_studio" {
 variable "appstudio_developers" {
   type        = list(string)
   description = "Business Application Studio Developers"
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-
-  # 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."
-  }
 }
 
 
@@ -195,56 +164,26 @@ variable "service_plan__sap_process_automation" {
 variable "process_automation_admins" {
   type        = list(string)
   description = "SAP Build Process Automation Administrators"
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # add validation to check if SAP Build Process Automation Administrators contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.process_automation_admins : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.process_automation_admins)
-    error_message = "Please enter a valid email address for the SAP Build Process Automation Administrators."
-  }
 }
 
 variable "process_automation_developers" {
   type        = list(string)
   description = "SAP Build Process Automation Developers"
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # add validation to check if SAP Build Process Automation Developers contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.process_automation_developers : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.process_automation_developers)
-    error_message = "Please enter a valid email address for the SAP Build Process Automation Developers."
-  }
 }
 
 variable "process_automation_participants" {
   type        = list(string)
   description = "SAP Build Process Automation Participants"
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # add validation to check if SAP Build Process Automation Participants contains a list of valid email addresses
-  validation {
-    condition     = length([for email in var.process_automation_participants : can(regex("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", email))]) == length(var.process_automation_participants)
-    error_message = "Please enter a valid email address for the SAP Build Process Automation Participants."
-  }
 }
 
 variable "event_mesh_admins" {
   type        = list(string)
   description = "Enterprise Messaging Administrators"
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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."
-  }
 }
 
 # ------------------------------------------------------------------------------------------------------
diff --git a/released/discovery_center/mission_4172/step2/variables.tf b/released/discovery_center/mission_4172/step2/variables.tf
@@ -32,45 +32,21 @@ variable "subaccount_id" {
 variable "cf_space_developers" {
   type        = list(string)
   description = "CF Space developers"
-  default     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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     = ["jane.doe@test.com", "john.doe@test.com"]
-  # 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."
-  }
 }
 
 
