route53 zone datesource - arn

.changelog/20652.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/aws_route53_zone: Add `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_route53_zone: Add plan time validation for `comment`
+```
+
+```release-note:enhancement
+data-source/aws_route53_zone: Add `arn` attribute
+```

aws/data_source_aws_route53_zone.go

@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
@@ -15,6 +16,10 @@ func dataSourceAwsRoute53Zone() *schema.Resource {
 		Read: dataSourceAwsRoute53ZoneRead,
 
 		Schema: map[string]*schema.Schema{
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"zone_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -190,6 +195,13 @@ func dataSourceAwsRoute53ZoneRead(d *schema.ResourceData, meta interface{}) erro
 		return fmt.Errorf("error setting tags: %w", err)
 	}
 
+	arn := arn.ARN{
+		Partition: meta.(*AWSClient).partition,
+		Service:   "route53",
+		Resource:  fmt.Sprintf("hostedzone/%s", d.Id()),
+	}.String()
+	d.Set("arn", arn)
+
 	return nil
 }
 

aws/data_source_aws_route53_zone_test.go

@@ -24,6 +24,7 @@ func TestAccAWSRoute53ZoneDataSource_id(t *testing.T) {
 			{
 				Config: testAccDataSourceAwsRoute53ZoneConfigId(fqdn),
 				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrPair(resourceName, "arn", dataSourceName, "arn"),
 					resource.TestCheckResourceAttrPair(resourceName, "id", dataSourceName, "id"),
 					resource.TestCheckResourceAttrPair(resourceName, "name", dataSourceName, "name"),
 					resource.TestCheckResourceAttrPair(resourceName, "name_servers.#", dataSourceName, "name_servers.#"),

website/docs/d/route53_zone.html.markdown

@@ -54,6 +54,7 @@ the selected Hosted Zone.
 
 The following attribute is additionally exported:
 
+* `arn` - The Amazon Resource Name (ARN) of the Hosted Zone.
 * `caller_reference` - Caller Reference of the Hosted Zone.
 * `comment` - The comment field of the Hosted Zone.
 * `name_servers` - The list of DNS name servers for the Hosted Zone.

website/docs/r/route53_zone.html.markdown

@@ -84,7 +84,7 @@ The following arguments are supported:
 
 In addition to all arguments above, the following attributes are exported:
 
-* `arn` - The Amazon Resource Name (ARN) of the zone.
+* `arn` - The Amazon Resource Name (ARN) of the Hosted Zone.
 * `zone_id` - The Hosted Zone ID. This can be referenced by zone records.
 * `name_servers` - A list of name servers in associated (or default) delegation set.
   Find more about delegation sets in [AWS docs](https://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html).