feat: updated the schema of the existing_event_notifications_instances input (now required CRN instead of id and region)<br>* enabled the DA with add-ons (#64)

Author: iamar7

README.md

@@ -153,7 +153,7 @@ You need the following permissions to run this module.
 | <a name="input_access_tags"></a> [access\_tags](#input\_access\_tags) | A list of access tags to apply to the IBM Cloud Logs instance created by the module. For more information, see https://cloud.ibm.com/docs/account?topic=account-access-tags-tutorial. | `list(string)` | `[]` | no |
 | <a name="input_cbr_rules"></a> [cbr\_rules](#input\_cbr\_rules) | (Optional, list) List of context-based restrictions rules to create | <pre>list(object({<br/>    description = string<br/>    account_id  = string<br/>    rule_contexts = list(object({<br/>      attributes = optional(list(object({<br/>        name  = string<br/>        value = string<br/>    }))) }))<br/>    enforcement_mode = string<br/>    operations = optional(list(object({<br/>      api_types = list(object({<br/>        api_type_id = string<br/>      }))<br/>    })))<br/>  }))</pre> | `[]` | no |
 | <a name="input_data_storage"></a> [data\_storage](#input\_data\_storage) | A logs data bucket and a metrics bucket in IBM Cloud Object Storage to store your IBM Cloud Logs data for long term storage, search, analysis and alerting. | <pre>object({<br/>    logs_data = optional(object({<br/>      enabled              = optional(bool, false)<br/>      bucket_crn           = optional(string)<br/>      bucket_endpoint      = optional(string)<br/>      skip_cos_auth_policy = optional(bool, false)<br/>    }), {})<br/>    metrics_data = optional(object({<br/>      enabled              = optional(bool, false)<br/>      bucket_crn           = optional(string)<br/>      bucket_endpoint      = optional(string)<br/>      skip_cos_auth_policy = optional(bool, false)<br/>    }), {})<br/>    }<br/>  )</pre> | <pre>{<br/>  "logs_data": null,<br/>  "metrics_data": null<br/>}</pre> | no |
-| <a name="input_existing_event_notifications_instances"></a> [existing\_event\_notifications\_instances](#input\_existing\_event\_notifications\_instances) | List of Event Notifications instance details for routing critical events that occur in your IBM Cloud Logs. | <pre>list(object({<br/>    en_instance_id      = string<br/>    en_region           = string<br/>    en_integration_name = optional(string)<br/>    skip_en_auth_policy = optional(bool, false)<br/>  }))</pre> | `[]` | no |
+| <a name="input_existing_event_notifications_instances"></a> [existing\_event\_notifications\_instances](#input\_existing\_event\_notifications\_instances) | List of Event Notifications instance details for routing critical events that occur in your IBM Cloud Logs. | <pre>list(object({<br/>    crn                  = string<br/>    integration_name     = optional(string)<br/>    skip_iam_auth_policy = optional(bool, false)<br/>  }))</pre> | `[]` | no |
 | <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | The name of the IBM Cloud Logs instance to create. Defaults to 'cloud-logs-<region>' | `string` | `null` | no |
 | <a name="input_logs_routing_tenant_regions"></a> [logs\_routing\_tenant\_regions](#input\_logs\_routing\_tenant\_regions) | Pass a list of regions to create a tenant for that is targetted to the IBM Cloud Logs instance created by this module. To manage platform logs that are generated by IBM Cloud® services in a region of IBM Cloud, you must create a tenant in each region that you operate. Leave the list empty if you don't want to create any tenants. NOTE: You can only have 1 tenant per region in an account. | `list(any)` | `[]` | no |
 | <a name="input_plan"></a> [plan](#input\_plan) | The IBM Cloud Logs plan to provision. Available: standard | `string` | `"standard"` | no |

common-dev-assets

@@ -177,14 +177,12 @@ module "cloud_logs" {
     }]
   }]
   existing_event_notifications_instances = [{
-    en_instance_id      = module.event_notification_1.guid
-    en_region           = var.region
-    en_integration_name = "${var.prefix}-en-1"
+    crn              = module.event_notification_1.crn
+    integration_name = "${var.prefix}-en-1"
     },
     {
-      en_instance_id      = module.event_notification_2.guid
-      en_region           = var.region
-      en_integration_name = "${var.prefix}-en-2"
+      crn              = module.event_notification_2.crn
+      integration_name = "${var.prefix}-en-2"
   }]
 
   cbr_rules = [{

examples/advanced/main.tf

@@ -49,7 +49,7 @@ No modules.
 | <a name="input_cloud_logs_instance_id"></a> [cloud\_logs\_instance\_id](#input\_cloud\_logs\_instance\_id) | The GUID of the existing IBM Cloud Logs instance. | `string` | n/a | yes |
 | <a name="input_cloud_logs_instance_name"></a> [cloud\_logs\_instance\_name](#input\_cloud\_logs\_instance\_name) | The name of the existing IBM Cloud Logs instance. It is used as a prefix for the outgoing webhook name if the existing\_event\_notification\_instances does not set en\_integration\_name. | `string` | n/a | yes |
 | <a name="input_cloud_logs_region"></a> [cloud\_logs\_region](#input\_cloud\_logs\_region) | The IBM Cloud region where the existing Cloud Logs instance is located. | `string` | n/a | yes |
-| <a name="input_existing_event_notifications_instances"></a> [existing\_event\_notifications\_instances](#input\_existing\_event\_notifications\_instances) | List of Event Notifications instance details for routing critical events that occur in your IBM Cloud Logs. | <pre>list(object({<br/>    en_instance_id      = string<br/>    en_region           = string<br/>    en_integration_name = optional(string)<br/>    skip_en_auth_policy = optional(bool, false)<br/>  }))</pre> | n/a | yes |
+| <a name="input_existing_event_notifications_instances"></a> [existing\_event\_notifications\_instances](#input\_existing\_event\_notifications\_instances) | List of Event Notifications instance details for routing critical events that occur in your IBM Cloud Logs. | <pre>list(object({<br/>    crn                  = string<br/>    integration_name     = optional(string)<br/>    skip_iam_auth_policy = optional(bool, false)<br/>  }))</pre> | n/a | yes |
 
 ### Outputs
 

ibm_catalog.json

@@ -4,13 +4,13 @@
 
 # Create IAM Authorization Policies to allow Cloud Logs to access event notification
 resource "ibm_iam_authorization_policy" "en_policy" {
-  for_each                    = { for idx, en in var.existing_event_notifications_instances : idx => en if !en.skip_en_auth_policy }
+  for_each                    = { for idx, en in var.existing_event_notifications_instances : idx => en if !en.skip_iam_auth_policy }
   source_service_name         = "logs"
   source_resource_instance_id = var.cloud_logs_instance_id
   target_service_name         = "event-notifications"
-  target_resource_instance_id = each.value.en_instance_id
+  target_resource_instance_id = split(":", each.value.crn)[7]
   roles                       = ["Event Source Manager", "Viewer"]
-  description                 = "Allow Cloud Logs with instance ID ${var.cloud_logs_instance_id} 'Event Source Manager' and 'Viewer' role access on the Event Notification instance GUID ${each.value.en_instance_id}"
+  description                 = "Allow Cloud Logs with instance ID ${var.cloud_logs_instance_id} 'Event Source Manager' and 'Viewer' role access on the Event Notification instance GUID ${split(":", each.value.crn)[7]}"
 }
 
 resource "time_sleep" "wait_for_en_authorization_policy" {
@@ -23,11 +23,11 @@ resource "ibm_logs_outgoing_webhook" "en_integration" {
   for_each    = { for idx, en in var.existing_event_notifications_instances : idx => en }
   instance_id = var.cloud_logs_instance_id
   region      = var.cloud_logs_region
-  name        = each.value.en_integration_name == null ? "${var.cloud_logs_instance_name}-en-integration-${each.key}" : each.value.en_integration_name
+  name        = each.value.integration_name == null ? "${var.cloud_logs_instance_name}-en-integration-${each.key}" : each.value.integration_name
   type        = "ibm_event_notifications"
 
   ibm_event_notifications {
-    event_notifications_instance_id = each.value.en_instance_id
-    region_id                       = each.value.en_region
+    event_notifications_instance_id = split(":", each.value.crn)[7]
+    region_id                       = split(":", each.value.crn)[5]
   }
 }

modules/webhook/README.md

@@ -19,10 +19,9 @@ variable "cloud_logs_instance_name" {
 
 variable "existing_event_notifications_instances" {
   type = list(object({
-    en_instance_id      = string
-    en_region           = string
-    en_integration_name = optional(string)
-    skip_en_auth_policy = optional(bool, false)
+    crn                  = string
+    integration_name     = optional(string)
+    skip_iam_auth_policy = optional(bool, false)
   }))
   description = "List of Event Notifications instance details for routing critical events that occur in your IBM Cloud Logs."
 }