d/aws_ecs_service: Use finder.

internal/service/ecs/find.go

@@ -55,14 +55,14 @@ func FindCapacityProviderByARN(ctx context.Context, conn *ecs.ECS, arn string) (
 	return capacityProvider, nil
 }
 
-func FindServiceByID(ctx context.Context, conn *ecs.ECS, id, cluster string) (*ecs.Service, error) {
+func findServiceByTwoPartKey(ctx context.Context, conn *ecs.ECS, serviceName, clusterNameOrARN string) (*ecs.Service, error) {
 	input := &ecs.DescribeServicesInput{
-		Cluster:  aws.String(cluster),
+		Cluster:  aws.String(clusterNameOrARN),
 		Include:  aws.StringSlice([]string{ecs.ServiceFieldTags}),
-		Services: aws.StringSlice([]string{id}),
+		Services: aws.StringSlice([]string{serviceName}),
 	}
 
-	return FindService(ctx, conn, input)
+	return findService(ctx, conn, input)
 }
 
 func FindServiceNoTagsByID(ctx context.Context, conn *ecs.ECS, id, cluster string) (*ecs.Service, error) {
@@ -73,7 +73,7 @@ func FindServiceNoTagsByID(ctx context.Context, conn *ecs.ECS, id, cluster strin
 		input.Cluster = aws.String(cluster)
 	}
 
-	return FindService(ctx, conn, input)
+	return findService(ctx, conn, input)
 }
 
 type expectActiveError struct {
@@ -95,7 +95,7 @@ func FindServiceByIDWaitForActive(ctx context.Context, conn *ecs.ECS, id, cluste
 	// Use the retry.RetryContext function instead of WaitForState() because we don't want the timeout error, if any
 	err := retry.RetryContext(ctx, serviceDescribeTimeout, func() *retry.RetryError {
 		var err error
-		service, err = FindServiceByID(ctx, conn, id, cluster)
+		service, err = findServiceByTwoPartKey(ctx, conn, id, cluster)
 		if tfresource.NotFound(err) {
 			return retry.RetryableError(err)
 		}
@@ -110,19 +110,26 @@ func FindServiceByIDWaitForActive(ctx context.Context, conn *ecs.ECS, id, cluste
 		return nil
 	})
 	if tfresource.TimedOut(err) {
-		service, err = FindServiceByID(ctx, conn, id, cluster)
+		service, err = findServiceByTwoPartKey(ctx, conn, id, cluster)
 	}
 
 	return service, err
 }
 
-func FindService(ctx context.Context, conn *ecs.ECS, input *ecs.DescribeServicesInput) (*ecs.Service, error) {
+func findService(ctx context.Context, conn *ecs.ECS, input *ecs.DescribeServicesInput) (*ecs.Service, error) {
+	output, err := findServices(ctx, conn, input)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return tfresource.AssertSinglePtrResult(output)
+}
+
+func findServices(ctx context.Context, conn *ecs.ECS, input *ecs.DescribeServicesInput) ([]*ecs.Service, error) {
 	output, err := conn.DescribeServicesWithContext(ctx, input)
 
 	if errs.IsUnsupportedOperationInPartitionError(conn.PartitionID, err) && input.Include != nil {
-		id := aws.StringValueSlice(input.Services)[0]
-		log.Printf("[WARN] failed describing ECS Service (%s) with tags: %s; retrying without tags", id, err)
-
 		input.Include = nil
 		output, err = conn.DescribeServicesWithContext(ctx, input)
 	}
@@ -135,10 +142,15 @@ func FindService(ctx context.Context, conn *ecs.ECS, input *ecs.DescribeServices
 			LastRequest: input,
 		}
 	}
+
 	if err != nil {
 		return nil, err
 	}
 
+	if output == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
 	// When an ECS Service is not found by DescribeServices(), it will return a Failure struct with Reason = "MISSING"
 	for _, v := range output.Failures {
 		if aws.StringValue(v.Reason) == "MISSING" {
@@ -148,12 +160,5 @@ func FindService(ctx context.Context, conn *ecs.ECS, input *ecs.DescribeServices
 		}
 	}
 
-	if len(output.Services) == 0 {
-		return nil, tfresource.NewEmptyResultError(input)
-	}
-	if n := len(output.Services); n > 1 {
-		return nil, tfresource.NewTooManyResultsError(n, input)
-	}
-
-	return output.Services[0], nil
+	return output.Services, nil
 }

internal/service/ecs/service_data_source.go

@@ -5,29 +5,24 @@ package ecs
 
 import (
 	"context"
-	"log"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ecs"
 	"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"
-	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
+	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// @SDKDataSource("aws_ecs_service")
-func DataSourceService() *schema.Resource {
+// @SDKDataSource("aws_ecs_service", name="Service")
+// @Tags
+func dataSourceService() *schema.Resource {
 	return &schema.Resource{
 		ReadWithoutTimeout: dataSourceServiceRead,
 
 		Schema: map[string]*schema.Schema{
-			names.AttrServiceName: {
-				Type:     schema.TypeString,
-				Required: true,
-			},
 			names.AttrARN: {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -48,6 +43,10 @@ func DataSourceService() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			names.AttrServiceName: {
+				Type:     schema.TypeString,
+				Required: true,
+			},
 			"task_definition": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -60,53 +59,23 @@ func DataSourceService() *schema.Resource {
 func dataSourceServiceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).ECSConn(ctx)
-	ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
-
-	clusterArn := d.Get("cluster_arn").(string)
-	serviceName := d.Get(names.AttrServiceName).(string)
-
-	input := &ecs.DescribeServicesInput{
-		Cluster:  aws.String(clusterArn),
-		Services: aws.StringSlice([]string{serviceName}),
-		Include:  aws.StringSlice([]string{ecs.ServiceFieldTags}),
-	}
 
-	log.Printf("[DEBUG] Reading ECS Service: %s", input)
-	desc, err := conn.DescribeServicesWithContext(ctx, input)
-
-	// Some partitions (e.g. ISO) may not support tagging.
-	if errs.IsUnsupportedOperationInPartitionError(conn.PartitionID, err) {
-		input.Include = nil
-
-		desc, err = conn.DescribeServicesWithContext(ctx, input)
-	}
+	service, err := findServiceByTwoPartKey(ctx, conn, d.Get(names.AttrServiceName).(string), d.Get("cluster_arn").(string))
 
 	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "reading ECS Service (%s): %s", serviceName, err)
+		return sdkdiag.AppendFromErr(diags, tfresource.SingularDataSourceFindError("ECS Service", err))
 	}
 
-	if desc == nil || len(desc.Services) == 0 {
-		return sdkdiag.AppendErrorf(diags, "service with name %q in cluster %q not found", serviceName, clusterArn)
-	}
-
-	if len(desc.Services) > 1 {
-		return sdkdiag.AppendErrorf(diags, "multiple services with name %q found in cluster %q", serviceName, clusterArn)
-	}
-
-	service := desc.Services[0]
 	d.SetId(aws.StringValue(service.ServiceArn))
-
-	d.Set(names.AttrServiceName, service.ServiceName)
 	d.Set(names.AttrARN, service.ServiceArn)
 	d.Set("cluster_arn", service.ClusterArn)
 	d.Set("desired_count", service.DesiredCount)
 	d.Set("launch_type", service.LaunchType)
 	d.Set("scheduling_strategy", service.SchedulingStrategy)
+	d.Set(names.AttrServiceName, service.ServiceName)
 	d.Set("task_definition", service.TaskDefinition)
 
-	if err := d.Set(names.AttrTags, KeyValueTags(ctx, service.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
-		return sdkdiag.AppendErrorf(diags, "setting tags: %s", err)
-	}
+	setTagsOut(ctx, service.Tags)
 
 	return diags
 }