Fixed JCS-13545 && JCS-13544

Author: abhijit-paranjpe

terraform/locals.tf

@@ -145,7 +145,10 @@ locals {
     var.wls_extern_ssl_admin_port,
   ) : ""
 
-  apm_domain_compartment_id = var.use_apm_service ? lookup(data.oci_apm_apm_domain.apm_domain[0], "compartment_id") : ""
+  use_apm_service = (var.use_apm_service || var.use_autoscaling)
+  apm_domain_compartment_id = local.use_apm_service ? lookup(data.oci_apm_apm_domain.apm_domain[0], "compartment_id") : ""
+
+
 
   ocir_namespace = data.oci_objectstorage_namespace.object_namespace.namespace
 

terraform/main.tf

@@ -403,7 +403,7 @@ module "validators" {
   use_oci_logging  = var.use_oci_logging
   dynamic_group_id = var.dynamic_group_id
 
-  use_apm_service           = var.use_apm_service
+  use_apm_service           = local.use_apm_service
   apm_domain_id             = var.apm_domain_id
   apm_private_data_key_name = var.apm_private_data_key_name
 
@@ -610,7 +610,7 @@ module "compute" {
   log_group_id    = element(concat(module.observability-common[*].log_group_id, [""]), 0)
   use_oci_logging = var.use_oci_logging
 
-  use_apm_service           = var.use_apm_service
+  use_apm_service           = local.use_apm_service
   apm_domain_compartment_id = local.apm_domain_compartment_id
   apm_domain_id             = var.apm_domain_id
   apm_private_data_key_name = var.apm_private_data_key_name

terraform/modules/observability/autoscaling/local.tf

@@ -21,7 +21,7 @@ locals {
   function_config_map = zipmap(
     ["min_wls_node_count", "wlsc_email_notification_topic_id", "debug", "offline_ms1_from_lb"],
     [var.wls_node_count,
-      (var.subscription_endpoint != "" ? element(concat(oci_ons_notification_topic.wlsc_email_notification_topic.*.id, list("")), 0) : ""),
+      (var.subscription_endpoint != "" ? element(concat(oci_ons_notification_topic.wlsc_email_notification_topic.*.id, tolist([""])), 0) : ""),
       "false",
       "false"
   ])