Allow to set event_bus_name as ARN on EventBridge aws_cloudwatch_event_rule resource.

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
 		}
 	}

aws/resource_aws_cloudwatch_event_rule_test.go

@@ -5,9 +5,11 @@ import (
 	"log"
 	"os"
 	"regexp"
+	"strings"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	awsarn "github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/cloudwatchevents"
 	events "github.com/aws/aws-sdk-go/service/cloudwatchevents"
 	"github.com/hashicorp/go-multierror"
@@ -530,6 +532,48 @@ func TestAccAWSCloudWatchEventRule_PartnerEventBus(t *testing.T) {
 	})
 }
 
+func TestAccAWSCloudWatchEventRule_EventBusArn(t *testing.T) {
+	key := "EVENT_BRIDGE_EVENT_BUS_ARN"
+	busArn, err := awsarn.Parse(os.Getenv(key))
+	if err != nil {
+		t.Skipf("Environment variable %s is missing or is not a valid ARN", key)
+	}
+	busName := strings.Replace(busArn.Resource, "event-bus/", "", 1)
+
+	var v events.DescribeRuleOutput
+	rName := acctest.RandomWithPrefix("tf-acc-test-rule")
+	resourceName := "aws_cloudwatch_event_rule.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		ErrorCheck:   testAccErrorCheck(t, cloudwatchevents.EndpointsID),
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSCloudWatchEventRuleDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSCloudWatchEventRulePartnerEventBusConfig(rName, busArn.String()),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckCloudWatchEventRuleExists(resourceName, &v),
+					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "events", regexp.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName, rName))),
+					resource.TestCheckResourceAttr(resourceName, "description", ""),
+					resource.TestCheckResourceAttr(resourceName, "event_bus_name", busArn.String()),
+					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]

docs/MAINTAINING.md

@@ -391,6 +391,7 @@ Environment variables (beyond standard AWS Go SDK ones) used by acceptance testi
 | `DX_VIRTUAL_INTERFACE_ID` | Identifier for Direct Connect Virtual Interface testing. |
 | `EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT` | EC2 Quota for Rules per Security Group. Defaults to 50. **DEPRECATED:** Can be augmented or replaced with Service Quotas lookup. |
 | `EVENT_BRIDGE_PARTNER_EVENT_BUS_NAME` | Amazon EventBridge partner event bus name. |
+| `EVENT_BRIDGE_EVENT_BUS_ARN` | Amazon EventBridge event bus ARN. |
 | `EVENT_BRIDGE_PARTNER_EVENT_SOURCE_NAME` | Amazon EventBridge partner event source name. |
 | `GCM_API_KEY` | API Key for Google Cloud Messaging in Pinpoint and SNS Platform Application testing. |
 | `GITHUB_TOKEN` | GitHub token for CodePipeline testing. |