fix: validation failure when providing existing cloud_monitoring_crn (#241)

Author: iamar7

solutions/instances/main.tf

@@ -56,7 +56,7 @@ locals {
   metric_router_target_name  = var.prefix != null ? "${var.prefix}-cloud-monitoring-target" : "cloud-monitoring-target"
   metric_router_route_name   = var.prefix != null ? "${var.prefix}-metric-routing-route" : "metric-routing-route"
 
-  default_metrics_router_route = [{
+  default_metrics_router_route = var.enable_metrics_routing_to_cloud_monitoring ? [{
     name = local.metric_router_route_name
     rules = [{
       action = "send"
@@ -65,7 +65,7 @@ locals {
       }]
       inclusion_filters = []
     }]
-  }]
+  }] : []
 
   archive_bucket_config = var.manage_log_archive_cos_bucket ? {
     class = var.log_archive_cos_bucket_class
@@ -313,16 +313,16 @@ module "observability_instance" {
 
   # IBM Cloud Metrics Routing
 
-  metrics_router_targets = local.validate_metrics_routing ? [
+  metrics_router_targets = var.enable_metrics_routing_to_cloud_monitoring ? [
     {
       destination_crn                     = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_crn : var.existing_cloud_monitoring_crn
       target_name                         = local.metric_router_target_name
-      target_region                       = var.cloud_monitoring_provision ? var.region : module.cloud_monitoring_crn_parser.region
+      target_region                       = var.cloud_monitoring_provision ? var.region : module.cloud_monitoring_crn_parser[0].region
       skip_mrouter_sysdig_iam_auth_policy = false
     }
   ] : []
 
-  metrics_router_routes = local.validate_metrics_routing ? (var.metrics_router_routes != null ? var.metrics_router_routes : local.default_metrics_router_route) : []
+  metrics_router_routes = var.enable_metrics_routing_to_cloud_monitoring ? (length(var.metrics_router_routes) != 0 ? var.metrics_router_routes : local.default_metrics_router_route) : []
 }
 
 resource "time_sleep" "wait_for_atracker_cos_authorization_policy" {

solutions/instances/outputs.tf

@@ -37,7 +37,7 @@ output "logs_policies_details" {
 
 ## Cloud Monitoring
 output "cloud_monitoring_name" {
-  value       = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_name : null
+  value       = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_name : (var.existing_cloud_monitoring_crn != null ? module.cloud_monitoring_crn_parser[0].service_name : null)
   description = "The name of the provisioned IBM cloud monitoring instance."
 }
 
@@ -47,7 +47,7 @@ output "cloud_monitoring_crn" {
 }
 
 output "cloud_monitoring_guid" {
-  value       = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_guid : module.cloud_monitoring_crn_parser[0].service_instance
+  value       = var.cloud_monitoring_provision ? module.observability_instance.cloud_monitoring_guid : var.existing_cloud_monitoring_crn != null ? module.cloud_monitoring_crn_parser[0].service_instance : null
   description = "The guid of the provisioned IBM cloud monitoring instance."
 }