Removes new error types

aws/data_source_aws_security_group.go

@@ -3,14 +3,15 @@ package aws
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/ec2/finder"
-	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
 )
 
 func dataSourceAwsSecurityGroup() *schema.Resource {
@@ -79,11 +80,14 @@ func dataSourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) er
 	}
 
 	sg, err := finder.SecurityGroup(conn, req)
-	if errors.Is(err, tfresource.ErrEmptyResult) {
-		return fmt.Errorf("no matching SecurityGroup found")
-	}
-	if errors.Is(err, tfresource.ErrTooManyResults) {
-		return fmt.Errorf("multiple Security Groups matched; use additional constraints to reduce matches to a single Security Group")
+	var nfe *resource.NotFoundError
+	if errors.As(err, &nfe) {
+		if nfe.Message == "empty result" {
+			return fmt.Errorf("no matching SecurityGroup found")
+		}
+		if strings.HasPrefix(nfe.Message, "too many results:") {
+			return fmt.Errorf("multiple Security Groups matched; use additional constraints to reduce matches to a single Security Group")
+		}
 	}
 	if err != nil {
 		return err

aws/internal/service/ec2/finder/finder.go

@@ -9,7 +9,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	tfnet "github.com/terraform-providers/terraform-provider-aws/aws/internal/net"
 	tfec2 "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/ec2"
-	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
 )
 
 // CarrierGatewayByID returns the carrier gateway corresponding to the specified identifier.
@@ -363,11 +362,17 @@ func SecurityGroup(conn *ec2.EC2, input *ec2.DescribeSecurityGroupsInput) (*ec2.
 	}
 
 	if result == nil || len(result.SecurityGroups) == 0 || result.SecurityGroups[0] == nil {
-		return nil, tfresource.NewEmptyResultError(input)
+		return nil, &resource.NotFoundError{
+			Message:     "empty result",
+			LastRequest: input,
+		}
 	}
 
 	if len(result.SecurityGroups) > 1 {
-		return nil, tfresource.NewTooManyResultsError(len(result.SecurityGroups), input)
+		return nil, &resource.NotFoundError{
+			Message:     fmt.Sprintf("too many results: wanted 1, got %d", len(result.SecurityGroups)),
+			LastRequest: input,
+		}
 	}
 
 	return result.SecurityGroups[0], nil