tests/d/aws_ecs_cluster: Fix 'Attribute "setting.#" not set, but "setting.#" is set in aws_ecs_cluster.test as "1"'

.changelog/22119.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_ecs_cluster: Ensure that `setting` attribute is set consistently
+```

internal/service/ecs/cluster.go

@@ -242,7 +242,7 @@ func resourceClusterRead(d *schema.ResourceData, meta interface{}) error {
 	var out *ecs.DescribeClustersOutput
 	err := resource.Retry(2*time.Minute, func() *resource.RetryError {
 		var err error
-		out, err = FindClusterByARN(conn, d.Id())
+		out, err = FindClusterByNameOrARN(conn, d.Id())
 
 		if err != nil {
 			return resource.NonRetryableError(err)
@@ -258,7 +258,7 @@ func resourceClusterRead(d *schema.ResourceData, meta interface{}) error {
 		return nil
 	})
 	if tfresource.TimedOut(err) {
-		out, err = FindClusterByARN(conn, d.Id())
+		out, err = FindClusterByNameOrARN(conn, d.Id())
 	}
 
 	if tfresource.NotFound(err) {

internal/service/ecs/cluster_data_source.go

@@ -2,10 +2,8 @@ package ecs
 
 import (
 	"fmt"
-	"log"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ecs"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 )
@@ -68,22 +66,19 @@ func DataSourceCluster() *schema.Resource {
 func dataSourceClusterRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*conns.AWSClient).ECSConn
 
-	params := &ecs.DescribeClustersInput{
-		Clusters: []*string{aws.String(d.Get("cluster_name").(string))},
-	}
-	log.Printf("[DEBUG] Reading ECS Cluster: %s", params)
-	desc, err := conn.DescribeClusters(params)
+	clusterName := d.Get("cluster_name").(string)
+	desc, err := FindClusterByNameOrARN(conn, d.Get("cluster_name").(string))
 
 	if err != nil {
-		return err
+		return fmt.Errorf("error reading ECS Cluster (%s): %w", clusterName, err)
 	}
 
 	if len(desc.Clusters) == 0 {
-		return fmt.Errorf("no matches found for name: %s", d.Get("cluster_name").(string))
+		return fmt.Errorf("no matches found for name: %s", clusterName)
 	}
 
 	if len(desc.Clusters) > 1 {
-		return fmt.Errorf("multiple matches found for name: %s", d.Get("cluster_name").(string))
+		return fmt.Errorf("multiple matches found for name: %s", clusterName)
 	}
 
 	cluster := desc.Clusters[0]

internal/service/ecs/cluster_test.go

@@ -345,7 +345,7 @@ func testAccCheckClusterDestroy(s *terraform.State) error {
 			continue
 		}
 
-		out, err := tfecs.FindClusterByARN(conn, rs.Primary.ID)
+		out, err := tfecs.FindClusterByNameOrARN(conn, rs.Primary.ID)
 
 		if err != nil {
 			return err
@@ -369,7 +369,7 @@ func testAccCheckClusterExists(resourceName string, cluster *ecs.Cluster) resour
 		}
 
 		conn := acctest.Provider.Meta().(*conns.AWSClient).ECSConn
-		output, err := tfecs.FindClusterByARN(conn, rs.Primary.ID)
+		output, err := tfecs.FindClusterByNameOrARN(conn, rs.Primary.ID)
 
 		if err != nil {
 			return fmt.Errorf("error reading ECS Cluster (%s): %w", rs.Primary.ID, err)

internal/service/ecs/find.go

@@ -4,6 +4,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ecs"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
 func FindCapacityProviderByARN(conn *ecs.ECS, arn string) (*ecs.CapacityProvider, error) {
@@ -37,14 +38,10 @@ func FindCapacityProviderByARN(conn *ecs.ECS, arn string) (*ecs.CapacityProvider
 	return capacityProvider, nil
 }
 
-func FindClusterByARN(conn *ecs.ECS, arn string) (*ecs.DescribeClustersOutput, error) {
+func FindClusterByNameOrARN(conn *ecs.ECS, nameOrARN string) (*ecs.DescribeClustersOutput, error) {
 	input := &ecs.DescribeClustersInput{
-		Clusters: []*string{aws.String(arn)},
-		Include: []*string{
-			aws.String(ecs.ClusterFieldTags),
-			aws.String(ecs.ClusterFieldConfigurations),
-			aws.String(ecs.ClusterFieldSettings),
-		},
+		Clusters: aws.StringSlice([]string{nameOrARN}),
+		Include:  aws.StringSlice([]string{ecs.ClusterFieldTags, ecs.ClusterFieldConfigurations, ecs.ClusterFieldSettings}),
 	}
 
 	output, err := conn.DescribeClusters(input)
@@ -57,10 +54,7 @@ func FindClusterByARN(conn *ecs.ECS, arn string) (*ecs.DescribeClustersOutput, e
 	}
 
 	if output == nil {
-		return nil, &resource.NotFoundError{
-			Message:     "Empty result",
-			LastRequest: input,
-		}
+		return nil, tfresource.NewEmptyResultError(input)
 	}
 
 	return output, nil

internal/service/ecs/status.go

@@ -87,7 +87,7 @@ func statusService(conn *ecs.ECS, id, cluster string) resource.StateRefreshFunc
 
 func statusCluster(conn *ecs.ECS, arn string) resource.StateRefreshFunc {
 	return func() (interface{}, string, error) {
-		output, err := FindClusterByARN(conn, arn)
+		output, err := FindClusterByNameOrARN(conn, arn)
 
 		if tfawserr.ErrCodeEquals(err, ecs.ErrCodeClusterNotFoundException) {
 			return nil, clusterStatusNone, nil