Merge pull request #11 from johnricords/bug_fix

patch to fix faulty import statements

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.2.1
 commit = True
 message = Bumps version to {new_version}
 tag = False

CHANGELOG.md

@@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-### [2.2.0](https://github.com/plus3it/terraform-aws-tardigrade-cloudwatch-events/releases/tag/2.0.0)
+### [2.2.1](https://github.com/plus3it/terraform-aws-tardigrade-cloudwatch-events/releases/tag/2.2.1)
+
+**Released**: 2024.07.26
+
+**Summary**:
+
+*   minor patch to address constraint with event rule targets import is broken (for custom bus) and prefixes the bus name
+
+### [2.2.0](https://github.com/plus3it/terraform-aws-tardigrade-cloudwatch-events/releases/tag/2.2.0)
 
 **Released**: 2024.07.23
 
@@ -16,7 +24,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 *   adds `retry_policy` attr to `event_targets` object
 *   handles validation for `schedule_expressions` to not be set on custom buses
 
-### [2.1.0](https://github.com/plus3it/terraform-aws-tardigrade-cloudwatch-events/releases/tag/2.0.0)
+### [2.1.0](https://github.com/plus3it/terraform-aws-tardigrade-cloudwatch-events/releases/tag/2.1.0)
 
 **Released**: 2024.07.03
 

README.md

@@ -22,7 +22,7 @@ No requirements.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_event_rule"></a> [event\_rule](#input\_event\_rule) | Object of input configs for the CloudWatch Event Rule | <pre>object({<br>    name                = string<br>    description         = optional(string)<br>    event_pattern       = optional(string)<br>    event_bus_name      = optional(string, "default")<br>    schedule_expression = optional(string)<br>    state               = optional(string)<br><br>    event_targets = optional(list(object({<br>      name = string<br>      arn  = string<br><br>      event_bus_name = optional(string)<br>      role_arn       = optional(string)<br>      target_id      = optional(string)<br><br>      dead_letter_config = optional(object({<br>        arn = string<br>      }))<br><br>      input_transformer = optional(object({<br>        input_paths    = optional(map(string))<br>        input_template = string<br>      }))<br><br>      sqs_target = optional(object({<br>        message_group_id = string<br>      }))<br><br>      retry_policy = optional(object({<br>        maximum_event_age_in_seconds = optional(string)<br>        maximum_retry_attempts       = optional(string)<br>      }))<br><br>    })), [])<br>  })</pre> | n/a | yes |
+| <a name="input_event_rule"></a> [event\_rule](#input\_event\_rule) | Object of input configs for the CloudWatch Event Rule | <pre>object({<br>    name                = string<br>    description         = optional(string)<br>    event_pattern       = optional(string)<br>    event_bus_name      = optional(string, "default")<br>    schedule_expression = optional(string)<br>    state               = optional(string)<br><br>    event_targets = optional(list(object({<br>      name = string<br>      arn  = string<br><br>      event_bus_name = optional(string, "default")<br>      role_arn       = optional(string)<br>      target_id      = optional(string)<br><br>      dead_letter_config = optional(object({<br>        arn = string<br>      }))<br><br>      input_transformer = optional(object({<br>        input_paths    = optional(map(string))<br>        input_template = string<br>      }))<br><br>      sqs_target = optional(object({<br>        message_group_id = string<br>      }))<br><br>      retry_policy = optional(object({<br>        maximum_event_age_in_seconds = optional(string)<br>        maximum_retry_attempts       = optional(string)<br>      }))<br><br>    })), [])<br>  })</pre> | n/a | yes |
 
 ## Outputs
 

main.tf

@@ -13,7 +13,7 @@ resource "aws_cloudwatch_event_target" "this" {
   for_each = { for target in var.event_rule.event_targets : target.name => target }
 
   arn            = each.value.arn
-  rule           = aws_cloudwatch_event_rule.this.id
+  rule           = trimprefix(aws_cloudwatch_event_rule.this.id, "${each.value.event_bus_name}/")
   target_id      = each.value.target_id
   role_arn       = each.value.role_arn
   event_bus_name = each.value.event_bus_name

variables.tf

@@ -12,7 +12,7 @@ variable "event_rule" {
       name = string
       arn  = string
 
-      event_bus_name = optional(string)
+      event_bus_name = optional(string, "default")
       role_arn       = optional(string)
       target_id      = optional(string)