Allow to set event_bus_name as ARN on EventBridge aws_cloudwatch_event_rule resource.

CHANGELOG.md

@@ -36,6 +36,8 @@ ENHANCEMENTS:
 * resource/aws_kms_key: Add `bypass_policy_lockout_safety_check` argument ([#18117](https://github.com/hashicorp/terraform-provider-aws/issues/18117))
 * resource/aws_launch_template: Allow all supported resource types `tag_specifications.resource_type` ([#20409](https://github.com/hashicorp/terraform-provider-aws/issues/20409))
 * resource/aws_redshift_parameter_group: Make Redshift parameters case sensitive. ([#19772](https://github.com/hashicorp/terraform-provider-aws/issues/19772))
+* resource/resource_aws_cloudwatch_event_target: Allow to set event_bus_name as ARN.
+* resource/resource_aws_cloudwatch_event_rule: Allow to set event_bus_name as ARN.
 
 BUG FIXES:
 

aws/internal/service/cloudwatchevents/finder/finder.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"
+	awsarn "github.com/aws/aws-sdk-go/aws/arn"
 	events "github.com/aws/aws-sdk-go/service/cloudwatchevents"
 	"github.com/hashicorp/aws-sdk-go-base/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -47,7 +48,16 @@ func Rule(conn *events.CloudWatchEvents, eventBusName, ruleName string) (*events
 		input.EventBusName = aws.String(eventBusName)
 	}
 
-	return conn.DescribeRule(&input)
+	out, err := conn.DescribeRule(&input)
+
+	if err == nil && awsarn.IsARN(eventBusName) {
+		eventBusArn, _ := awsarn.Parse(eventBusName)
+		eventBusArn.Resource = "event-bus/" + *out.EventBusName
+		updatedEventBusArn := eventBusArn.String()
+		out.EventBusName = &updatedEventBusArn
+	}
+
+	return out, err
 
 }
 

aws/internal/service/cloudwatchevents/id.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
+
+	awsarn "github.com/aws/aws-sdk-go/aws/arn"
 )
 
 var (
@@ -54,7 +56,7 @@ func RuleParseID(id string) (string, string, error) {
 		i := strings.LastIndex(id, ruleIDSeparator)
 		busName := id[:i]
 		statementID := id[i+1:]
-		if partnerEventBusPattern.MatchString(busName) && statementID != "" {
+		if (partnerEventBusPattern.MatchString(busName) || awsarn.IsARN(busName)) && statementID != "" {
 			return busName, statementID, nil
 		}
 	}
@@ -90,7 +92,7 @@ func TargetParseImportID(id string) (string, string, string, error) {
 		iRule := strings.LastIndex(id[:iTarget], targetImportIDSeparator)
 		busName := id[:iRule]
 		ruleName := id[iRule+1 : iTarget]
-		if partnerEventBusPattern.MatchString(busName) && ruleName != "" && targetID != "" {
+		if (partnerEventBusPattern.MatchString(busName) || awsarn.IsARN(busName)) && ruleName != "" && targetID != "" {
 			return busName, ruleName, targetID, nil
 		}
 	}

aws/resource_aws_cloudwatch_event_rule_test.go

@@ -531,6 +531,42 @@ func TestAccAWSCloudWatchEventRule_PartnerEventBus(t *testing.T) {
 	})
 }
 
+func TestAccAWSCloudWatchEventRule_EventBusArn(t *testing.T) {
+	var v events.DescribeRuleOutput
+	rName := acctest.RandomWithPrefix("tf-acc-test-rule")
+	resourceName := "aws_cloudwatch_event_rule.test"
+	eventBusName := acctest.RandomWithPrefix("tf-acc-test")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		ErrorCheck:   testAccErrorCheck(t, cloudwatchevents.EndpointsID),
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSCloudWatchEventRuleDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSCloudWatchEventRuleEventBusArn(rName, eventBusName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudWatchEventRuleExists(resourceName, &v),
+					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "events", regexp.MustCompile(fmt.Sprintf(`rule/%s/%s$`, eventBusName, rName))),
+					resource.TestCheckResourceAttr(resourceName, "description", ""),
+					resource.TestCheckResourceAttrPair(resourceName, "event_bus_name", "aws_cloudwatch_event_bus.test", "arn"),
+					testAccCheckResourceAttrEquivalentJSON(resourceName, "event_pattern", "{\"source\":[\"aws.ec2\"]}"),
+					resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					resource.TestCheckResourceAttr(resourceName, "role_arn", ""),
+					resource.TestCheckResourceAttr(resourceName, "schedule_expression", ""),
+					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testAccCheckCloudWatchEventRuleExists(n string, rule *events.DescribeRuleOutput) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -799,3 +835,22 @@ PATTERN
 }
 `, rName, eventBusName)
 }
+
+func testAccAWSCloudWatchEventRuleEventBusArn(rName, eventBusName string) string {
+	return fmt.Sprintf(`
+resource "aws_cloudwatch_event_bus" "test" {
+	name = %[2]q
+}
+
+resource "aws_cloudwatch_event_rule" "test" {
+  name           = %[1]q
+  event_bus_name = aws_cloudwatch_event_bus.test.arn
+
+  event_pattern = <<PATTERN
+{
+  "source": ["aws.ec2"]
+}
+PATTERN
+}
+`, rName, eventBusName)
+}

aws/resource_aws_cloudwatch_event_target_test.go

@@ -219,6 +219,41 @@ func TestAccAWSCloudWatchEventTarget_EventBusName(t *testing.T) {
 	})
 }
 
+func TestAccAWSCloudWatchEventTarget_EventBusArn(t *testing.T) {
+	resourceName := "aws_cloudwatch_event_target.test"
+
+	var target events.Target
+	ruleName := acctest.RandomWithPrefix("tf-acc-test-rule")
+	targetID := acctest.RandomWithPrefix("tf-acc-test-target")
+	originEventBusName := acctest.RandomWithPrefix("tf-acc-test")
+	destinationEventBusName := acctest.RandomWithPrefix("tf-acc-test")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		ErrorCheck:   testAccErrorCheck(t, events.EndpointsID),
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSCloudWatchEventTargetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSCloudWatchEventTargetConfigEventBusArn(ruleName, originEventBusName, targetID, destinationEventBusName, acctest.RandomWithPrefix("tf-acc-test-target"), acctest.RandomWithPrefix("tf-acc-test-target")),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudWatchEventTargetExists(resourceName, &target),
+					resource.TestCheckResourceAttr(resourceName, "rule", ruleName),
+					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "events", regexp.MustCompile(fmt.Sprintf("event-bus/%s", destinationEventBusName))),
+					testAccMatchResourceAttrRegionalARN(resourceName, "event_bus_name", "events", regexp.MustCompile(fmt.Sprintf("event-bus/%s", originEventBusName))),
+					resource.TestCheckResourceAttr(resourceName, "target_id", targetID),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateIdFunc: testAccAWSCloudWatchEventTargetImportStateIdFunc(resourceName),
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccAWSCloudWatchEventTarget_GeneratedTargetId(t *testing.T) {
 	resourceName := "aws_cloudwatch_event_target.test"
 	snsTopicResourceName := "aws_sns_topic.test"
@@ -945,6 +980,59 @@ resource "aws_cloudwatch_event_bus" "test" {
 `, targetID, snsTopicName, ruleName, eventBusName)
 }
 
+func testAccAWSCloudWatchEventTargetConfigEventBusArn(ruleName, originEventBusName, targetID, destinationEventBusName, roleName, policyName string) string {
+	return fmt.Sprintf(`
+data "aws_partition" "current" {}
+
+resource "aws_cloudwatch_event_bus" "test_origin_bus" {
+	name = %[1]q
+}
+
+resource "aws_cloudwatch_event_bus" "test_destination_bus" {
+	name = %[4]q
+}
+
+resource "aws_cloudwatch_event_target" "test" {
+	rule           = aws_cloudwatch_event_rule.test.name
+	event_bus_name = aws_cloudwatch_event_bus.test_origin_bus.arn
+	target_id      = %[3]q
+	arn            = aws_cloudwatch_event_bus.test_destination_bus.arn
+	role_arn		= aws_iam_role.test.arn
+}
+
+resource "aws_cloudwatch_event_rule" "test" {
+	name           = %[2]q
+	event_bus_name = aws_cloudwatch_event_bus.test_origin_bus.name
+	event_pattern  = <<PATTERN
+{
+	"source": [
+		"aws.ec2"
+	]
+}
+PATTERN
+}
+
+resource "aws_iam_role" "test" {
+	name = %[5]q
+
+	assume_role_policy = <<EOF
+{
+	"Version": "2012-10-17",
+	"Statement": [
+		{
+			"Action": "sts:AssumeRole",
+			"Principal": {
+				"Service": "events.${data.aws_partition.current.dns_suffix}"
+			},
+			"Effect": "Allow"
+		}
+	]
+}
+EOF
+}
+`, originEventBusName, ruleName, targetID, destinationEventBusName, roleName, policyName)
+}
+
 func testAccAWSCloudWatchEventTargetConfigMissingTargetId(ruleName, snsTopicName string) string {
 	return fmt.Sprintf(`
 resource "aws_cloudwatch_event_rule" "test" {