fix: renovate fixes (dependencies version change)<br>incorporate the changes in structure of metrics_router_settings variable that got changed in monitoring module <br>incorporate the changes in test for trusted_profile_links and trusted_profile_policies, these were updated in trusted_profile module (#432)

* fix(deps): update terraform dependencies

* fix: renovate fix

* updated event notifications module version

* trusted profile version change

* fix

---------

Co-authored-by: Terraform IBM Modules Operations <[email protected]>
Co-authored-by: Vipin Kumar <[email protected]>

Author: 3 people

solutions/instances/DA-types.md

@@ -155,9 +155,7 @@ The `metrics_router_settings` input variable allows you to set the account setti
 
 ```hcl
 metrics_router_settings = {
-    default_targets           = [{
-      id = "c3af557f-fb0e-2222-85c3-0889e7fe7bc4"
-    }]
+    default_targets           = ["c3af557f-fb0e-2222-85c3-0889e7fe7bc4"]
     primary_metadata_region   = "us-south"
     backup_metadata_region    = "us-east"
     permitted_target_regions  = ["us-south", "eu-de", "us-east", "eu-es", "eu-gb", "au-syd", "br-sao", "ca-tor"]

solutions/instances/main.tf

@@ -245,7 +245,7 @@ module "cloud_monitoring_crn_parser" {
 module "cloud_monitoring" {
   count                   = var.cloud_monitoring_provision ? 1 : 0
   source                  = "terraform-ibm-modules/cloud-monitoring/ibm"
-  version                 = "1.4.0"
+  version                 = "1.5.0"
   region                  = var.region
   resource_group_id       = module.resource_group.resource_group_id
   instance_name           = local.cloud_monitoring_instance_name
@@ -304,7 +304,7 @@ module "cloud_logs" {
 
 module "metrics_router" {
   source  = "terraform-ibm-modules/cloud-monitoring/ibm//modules/metrics_routing"
-  version = "1.4.0"
+  version = "1.5.0"
   metrics_router_targets = var.enable_metrics_routing_to_cloud_monitoring ? [
     {
       destination_crn                 = var.cloud_monitoring_provision ? module.cloud_monitoring[0].crn : var.existing_cloud_monitoring_crn
@@ -320,7 +320,7 @@ module "metrics_router" {
 module "activity_tracker" {
   depends_on = [time_sleep.wait_for_atracker_cos_authorization_policy]
   source     = "terraform-ibm-modules/activity-tracker/ibm"
-  version    = "1.1.6"
+  version    = "1.1.7"
   cos_targets = var.enable_at_event_routing_to_cos_bucket ? [
     {
       bucket_name                       = local.cos_target_bucket_name
@@ -466,7 +466,7 @@ module "cos_instance" {
   }
   count                    = var.existing_cos_instance_crn == null && length(coalesce(local.buckets_config, [])) != 0 ? 1 : 0 # no need to call COS module if consumer is using existing COS instance
   source                   = "terraform-ibm-modules/cos/ibm//modules/fscloud"
-  version                  = "8.21.25"
+  version                  = "10.1.1"
   resource_group_id        = local.cos_resource_group_id
   create_cos_instance      = true
   cos_instance_name        = try("${local.prefix}-${var.cos_instance_name}", var.cos_instance_name)
@@ -483,7 +483,7 @@ module "cos_bucket" {
   }
   count   = length(coalesce(local.buckets_config, [])) != 0 ? 1 : 0 # no need to call COS module if consumer is using existing COS bucket
   source  = "terraform-ibm-modules/cos/ibm//modules/buckets"
-  version = "8.21.25"
+  version = "10.1.1"
   bucket_configs = [
     for value in local.buckets_config :
     {

solutions/instances/variables.tf

@@ -231,13 +231,11 @@ variable "enable_metrics_routing_to_cloud_monitoring" {
 
 variable "metrics_router_settings" {
   type = object({
-    permitted_target_regions  = optional(list(string))
+    permitted_target_regions  = optional(list(string), [])
     primary_metadata_region   = optional(string)
     backup_metadata_region    = optional(string)
     private_api_endpoint_only = optional(bool, false)
-    default_targets = optional(list(object({
-      id = string
-    })))
+    default_targets           = optional(list(string), [])
   })
   description = "Global settings for Metrics Routing. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-observability-da/blob/main/solutions/instances/DA-types.md#metrics-router-settings-)."
   default     = null

tests/resources/existing-resources/main.tf

@@ -16,7 +16,7 @@ module "resource_group" {
 
 module "cos" {
   source                 = "terraform-ibm-modules/cos/ibm"
-  version                = "8.21.25"
+  version                = "10.1.1"
   resource_group_id      = module.resource_group.resource_group_id
   region                 = var.region
   cos_instance_name      = "${var.prefix}-cos"
@@ -28,7 +28,7 @@ module "cos" {
 
 module "additional_cos_bucket" {
   source                   = "terraform-ibm-modules/cos/ibm"
-  version                  = "8.21.25"
+  version                  = "10.1.1"
   region                   = var.region
   create_cos_instance      = false
   existing_cos_instance_id = module.cos.cos_instance_id
@@ -38,7 +38,7 @@ module "additional_cos_bucket" {
 
 module "cloud_log_buckets" {
   source  = "terraform-ibm-modules/cos/ibm//modules/buckets"
-  version = "8.21.25"
+  version = "10.1.1"
   bucket_configs = [
     {
       bucket_name            = "${var.prefix}-data-bucket"
@@ -62,7 +62,7 @@ module "cloud_log_buckets" {
 
 module "cloud_monitoring" {
   source                  = "terraform-ibm-modules/cloud-monitoring/ibm"
-  version                 = "1.4.0"
+  version                 = "1.5.0"
   region                  = var.region
   resource_group_id       = module.resource_group.resource_group_id
   instance_name           = var.prefix
@@ -76,7 +76,7 @@ module "cloud_monitoring" {
 
 module "event_notification_1" {
   source            = "terraform-ibm-modules/event-notifications/ibm"
-  version           = "2.4.22"
+  version           = "2.5.0"
   resource_group_id = module.resource_group.resource_group_id
   name              = "${var.prefix}-en-1"
   tags              = var.resource_tags
@@ -87,7 +87,7 @@ module "event_notification_1" {
 
 module "event_notification_2" {
   source            = "terraform-ibm-modules/event-notifications/ibm"
-  version           = "2.4.22"
+  version           = "2.5.0"
   resource_group_id = module.resource_group.resource_group_id
   name              = "${var.prefix}-en-2"
   tags              = var.resource_tags

tests/resources/main.tf

@@ -43,7 +43,7 @@ resource "ibm_is_subnet" "subnet_zone_1" {
 
 module "cos" {
   source            = "terraform-ibm-modules/cos/ibm"
-  version           = "8.21.25"
+  version           = "10.1.1"
   resource_group_id = module.resource_group.resource_group_id
   cos_instance_name = "${var.prefix}-cos"
   cos_tags          = var.resource_tags
@@ -61,7 +61,7 @@ locals {
 
 module "buckets" {
   source  = "terraform-ibm-modules/cos/ibm//modules/buckets"
-  version = "8.21.25"
+  version = "10.1.1"
   bucket_configs = [
     {
       bucket_name            = local.logs_bucket_name
@@ -86,7 +86,7 @@ module "buckets" {
 
 module "cloud_monitoring" {
   source                  = "terraform-ibm-modules/cloud-monitoring/ibm"
-  version                 = "1.4.0"
+  version                 = "1.5.0"
   region                  = var.region
   resource_group_id       = module.resource_group.resource_group_id
   instance_name           = var.prefix
@@ -127,20 +127,22 @@ locals {
 
 module "trusted_profile" {
   source                      = "terraform-ibm-modules/trusted-profile/ibm"
-  version                     = "2.3.1"
+  version                     = "3.1.1"
   trusted_profile_name        = "${var.prefix}-profile"
   trusted_profile_description = "Logs agent Trusted Profile"
   # As a `Sender`, you can send logs to your IBM Cloud Logs service instance - but not query or tail logs. This role is meant to be used by agents and routers sending logs.
   trusted_profile_policies = [{
-    roles = ["Sender"]
+    unique_identifier = "${var.prefix}-profile-0"
+    roles             = ["Sender"]
     resources = [{
       service = "logs"
     }]
   }]
 
   # Set up fine-grained authorization for `logs-agent` running in ROKS cluster in `ibm-observe` namespace.
   trusted_profile_links = [{
-    cr_type = "ROKS_SA"
+    unique_identifier = "${var.prefix}-profile-1"
+    cr_type           = "ROKS_SA"
     links = [{
       crn       = module.ocp_base.cluster_crn
       namespace = local.logs_agent_namespace
@@ -178,7 +180,7 @@ locals {
 
 module "ocp_base" {
   source               = "terraform-ibm-modules/base-ocp-vpc/ibm"
-  version              = "3.52.3"
+  version              = "3.52.4"
   resource_group_id    = module.resource_group.resource_group_id
   region               = var.region
   tags                 = var.resource_tags