d/aws_route53_resolver_firewall_rule_group: 'id' -> 'firewall_rule_group_id' and switch to 'WithoutTimeout' CRUD handlers (#15090).

Acceptance test output:

% make testacc TESTARGS='-run=TestAccRoute53ResolverFirewallRuleGroupDataSource_' PKG=route53resolver ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/route53resolver/... -v -count 1 -parallel 2  -run=TestAccRoute53ResolverFirewallRuleGroupDataSource_ -timeout 180m
=== RUN   TestAccRoute53ResolverFirewallRuleGroupDataSource_basic
--- PASS: TestAccRoute53ResolverFirewallRuleGroupDataSource_basic (22.88s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/route53resolver	30.541s

Author: ewbankkit

internal/service/route53resolver/firewall_rule_group_data_source.go

@@ -1,95 +1,89 @@
 package route53resolver
 
 import (
-	"fmt"
+	"context"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/route53resolver"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 )
 
 func DataSourceFirewallRuleGroup() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceFirewallRuleGroupRead,
+		ReadWithoutTimeout: dataSourceFirewallRuleGroupRead,
 
 		Schema: map[string]*schema.Schema{
-			"id": {
-				Type:     schema.TypeString,
-				Required: true,
-			},
 			"arn": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"name": {
+			"creation_time": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"rule_count": {
-				Type:     schema.TypeInt,
+			"creator_request_id": {
+				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"status": {
+			"firewall_rule_group_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"modification_time": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"status_message": {
+			"name": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
 			"owner_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"creator_request_id": {
-				Type:     schema.TypeString,
+			"rule_count": {
+				Type:     schema.TypeInt,
 				Computed: true,
 			},
 			"share_status": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"creation_time": {
+			"status": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"modification_time": {
+			"status_message": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
 		},
 	}
 }
 
-func dataSourceFirewallRuleGroupRead(d *schema.ResourceData, meta interface{}) error {
+func dataSourceFirewallRuleGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	conn := meta.(*conns.AWSClient).Route53ResolverConn
 
-	input := &route53resolver.GetFirewallRuleGroupInput{
-		FirewallRuleGroupId: aws.String(d.Get("id").(string)),
-	}
-
-	output, err := conn.GetFirewallRuleGroup(input)
+	id := d.Get("firewall_rule_group_id").(string)
+	ruleGroup, err := FindFirewallRuleGroupByID(ctx, conn, id)
 
 	if err != nil {
-		return fmt.Errorf("error getting Route53 Firewall Rule Group: %w", err)
-	}
-
-	if output == nil {
-		return fmt.Errorf("no  Route53 Firewall Rule Group found matching criteria; try different search")
+		return diag.Errorf("reading Route53 Resolver Firewall Rule Group (%s): %s", id, err)
 	}
 
-	d.SetId(aws.StringValue(output.FirewallRuleGroup.Id))
-	d.Set("arn", output.FirewallRuleGroup.Arn)
-	d.Set("creation_time", output.FirewallRuleGroup.CreationTime)
-	d.Set("creator_request_id", output.FirewallRuleGroup.CreatorRequestId)
-	d.Set("modification_time", output.FirewallRuleGroup.ModificationTime)
-	d.Set("name", output.FirewallRuleGroup.Name)
-	d.Set("owner_id", output.FirewallRuleGroup.OwnerId)
-	d.Set("rule_count", output.FirewallRuleGroup.RuleCount)
-	d.Set("share_status", output.FirewallRuleGroup.ShareStatus)
-	d.Set("status", output.FirewallRuleGroup.Status)
-	d.Set("status_message", output.FirewallRuleGroup.StatusMessage)
+	d.SetId(aws.StringValue(ruleGroup.Id))
+	d.Set("arn", ruleGroup.Arn)
+	d.Set("creation_time", ruleGroup.CreationTime)
+	d.Set("creator_request_id", ruleGroup.CreatorRequestId)
+	d.Set("firewall_rule_group_id", ruleGroup.Id)
+	d.Set("modification_time", ruleGroup.ModificationTime)
+	d.Set("name", ruleGroup.Name)
+	d.Set("owner_id", ruleGroup.OwnerId)
+	d.Set("rule_count", ruleGroup.RuleCount)
+	d.Set("share_status", ruleGroup.ShareStatus)
+	d.Set("status", ruleGroup.Status)
+	d.Set("status_message", ruleGroup.StatusMessage)
 
 	return nil
 }

internal/service/route53resolver/firewall_rule_group_data_source_test.go

@@ -1,51 +1,53 @@
 package route53resolver_test
 
 import (
-	"regexp"
+	"fmt"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/service/route53resolver"
+	sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 )
 
 func TestAccRoute53ResolverFirewallRuleGroupDataSource_basic(t *testing.T) {
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 	dataSourceName := "data.aws_route53_resolver_firewall_rule_group.test"
+	resourceName := "aws_route53_resolver_firewall_rule_group.test"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t); testAccPreCheck(t) },
 		ErrorCheck:               acctest.ErrorCheck(t, route53resolver.EndpointsID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccFirewallRuleGroupDataSourceConfig_basic(),
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet(dataSourceName, "id"),
-					acctest.MatchResourceAttrRegionalARN(dataSourceName, "arn", "route53resolver", regexp.MustCompile(`firewall-rule-group/.+`)),
+				Config: testAccFirewallRuleGroupDataSourceConfig_basic(rName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrPair(dataSourceName, "arn", resourceName, "arn"),
+					resource.TestCheckResourceAttrPair(dataSourceName, "firewall_rule_group_id", resourceName, "id"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "creation_time"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "creator_request_id"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "modification_time"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "name"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "owner_id"),
-					resource.TestCheckResourceAttrSet(dataSourceName, "rule_count"),
-					resource.TestMatchResourceAttr(dataSourceName, "status", regexp.MustCompile(`COMPLETE|DELETING|UPDATING`)),
-					resource.TestMatchResourceAttr(dataSourceName, "share_status", regexp.MustCompile(`NOT_SHARED|SHARED_WITH_ME|SHARED_BY_ME`)),
+					resource.TestCheckResourceAttrPair(dataSourceName, "name", resourceName, "name"),
+					resource.TestCheckResourceAttrPair(dataSourceName, "owner_id", resourceName, "owner_id"),
+					resource.TestCheckResourceAttr(dataSourceName, "rule_count", "0"),
+					resource.TestCheckResourceAttrPair(dataSourceName, "share_status", resourceName, "share_status"),
+					resource.TestCheckResourceAttrSet(dataSourceName, "status"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "status_message"),
 				),
 			},
 		},
 	})
 }
 
-func testAccFirewallRuleGroupDataSourceConfig_basic() string {
-	return `
+func testAccFirewallRuleGroupDataSourceConfig_basic(rName string) string {
+	return fmt.Sprintf(`
 resource "aws_route53_resolver_firewall_rule_group" "test" {
-  name = "test"
+  name = %[1]q
 }
 
 data "aws_route53_resolver_firewall_rule_group" "test" {
-  id = aws_route53_resolver_firewall_rule_group.test.id
+  firewall_rule_group_id = aws_route53_resolver_firewall_rule_group.test.id
 }
-
-`
+`, rName)
 }

website/docs/d/route53_resolver_firewall_rule_group.html.markdown

@@ -14,17 +14,17 @@ This data source allows to retrieve details about a specific a Route 53 Resolver
 
 ## Example Usage
 
-The following example shows how to get a firewall rule group from its id.
+The following example shows how to get a firewall rule group from its ID.
 
 ```terraform
 data "aws_route53_resolver_firewall_rule_group" "example" {
-  id = "rslvr-frg-example"
+  firewall_rule_group_id = "rslvr-frg-example"
 }
 ```
 
 ## Argument Reference
 
-* `id` - (Required) The ID of the rule group.
+* `firewall_rule_group_id` - (Required) The ID of the rule group.
 
 The following attribute is additionally exported: