Updates aws_sqs_queue

Author: gdavison

internal/service/sqs/queue.go

@@ -31,7 +31,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
 	tfmaps "github.com/hashicorp/terraform-provider-aws/internal/maps"
-	"github.com/hashicorp/terraform-provider-aws/internal/provider/sdkv2/importer"
 	"github.com/hashicorp/terraform-provider-aws/internal/sdkv2"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -196,7 +195,7 @@ var (
 // @SDKResource("aws_sqs_queue", name="Queue")
 // @Tags(identifierAttribute="id")
 // @IdentityVersion(1)
-// @CustomInherentRegionIdentity("url")
+// @CustomInherentRegionIdentity("url", "parseQueueURL")
 // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/sqs/types;awstypes;map[awstypes.QueueAttributeName]string")
 // @Testing(preIdentityVersion="v6.9.0")
 // @Testing(idAttrDuplicates="url")
@@ -218,18 +217,6 @@ func resourceQueue() *schema.Resource {
 			Update: schema.DefaultTimeout(3 * time.Minute),
 			Delete: schema.DefaultTimeout(3 * time.Minute),
 		},
-
-		Importer: &schema.ResourceImporter{
-			StateContext: func(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
-				identitySpec := importer.IdentitySpec(ctx)
-
-				if err := importQueueURL(ctx, d, identitySpec); err != nil {
-					return nil, err
-				}
-
-				return []*schema.ResourceData{d}, nil
-			},
-		},
 	}
 }
 
@@ -648,68 +635,14 @@ func waitQueueDeleted(ctx context.Context, conn *sqs.Client, url string, timeout
 	return err
 }
 
-func importQueueURL(_ context.Context, rd *schema.ResourceData, identitySpec inttypes.Identity) error {
-	attr := identitySpec.Attributes[0]
+func parseQueueURL(u string) (result inttypes.BaseIdentity, err error) {
 	re := regexache.MustCompile(`^https://sqs\.([a-z0-9-]+)\.[^/]+/([0-9]{12})/.+`)
-
-	if rd.Id() != "" {
-		match := re.FindStringSubmatch(rd.Id())
-		if match == nil {
-			return fmt.Errorf("could not parse import ID %q as SQS URL", rd.Id())
-		}
-
-		urlRegion := match[1]
-
-		rd.Set(attr.ResourceAttributeName(), rd.Id())
-		for _, attr := range identitySpec.IdentityDuplicateAttrs {
-			setAttribute(rd, attr, rd.Id())
-		}
-
-		if region, ok := rd.GetOk(names.AttrRegion); ok {
-			if region != urlRegion {
-				return fmt.Errorf("the region passed for import %q does not match the region %q in the URL %q", region, urlRegion, rd.Id())
-			}
-		} else {
-			rd.Set(names.AttrRegion, urlRegion)
-		}
-
-		return nil
-	}
-
-	identity, err := rd.Identity()
-	if err != nil {
-		return err
-	}
-
-	urlRaw, ok := identity.GetOk(attr.Name())
-	if !ok {
-		return fmt.Errorf("identity attribute %q is required", attr.Name())
-	}
-
-	urlVal, ok := urlRaw.(string)
-	if !ok {
-		return fmt.Errorf("identity attribute %q: expected string, got %T", attr.Name(), urlRaw)
-	}
-
-	match := re.FindStringSubmatch(urlVal)
+	match := re.FindStringSubmatch(u)
 	if match == nil {
-		return fmt.Errorf("identity attribute %q: could not parse %q as SQS URL", attr.Name(), urlVal)
-	}
-
-	rd.Set(names.AttrRegion, match[1])
-
-	rd.Set(attr.ResourceAttributeName(), urlVal)
-	for _, attr := range identitySpec.IdentityDuplicateAttrs {
-		setAttribute(rd, attr, urlVal)
-	}
-
-	return nil
-}
-
-func setAttribute(rd *schema.ResourceData, name string, value string) {
-	if name == "id" {
-		rd.SetId(value)
-		return
+		return inttypes.BaseIdentity{}, fmt.Errorf("could not parse %q as SQS URL", u)
 	}
-	rd.Set(name, value)
+	return inttypes.BaseIdentity{
+		AccountID: match[2],
+		Region:    match[1],
+	}, nil
 }