Migrate Route 53 Resolver resources to AWS SDK V2

go.mod

@@ -191,6 +191,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/route53profiles v1.2.3
 	github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.23.3
 	github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.19.3
+	github.com/aws/aws-sdk-go-v2/service/route53resolver v1.30.3
 	github.com/aws/aws-sdk-go-v2/service/rum v1.19.3
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3
 	github.com/aws/aws-sdk-go-v2/service/s3control v1.46.3

go.sum

@@ -412,6 +412,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.23.3 h1:apY
 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.23.3/go.mod h1:citOcziml/EM6I2ycb7XHuBw0whC8jVD2y+vU7wQD4k=
 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.19.3 h1:M6D+IRT6YdeL+qLIdy4u4zEoMOqq3lJnNUGt0cxEI04=
 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.19.3/go.mod h1:y4m7VlTWV77mBzMdAZWjudnobe0E77tKy5Z9+IQIku0=
+github.com/aws/aws-sdk-go-v2/service/route53resolver v1.30.3 h1:qbQ9OMsuBvjTfSiY8S7/mxezvSRtjyqcZcoBtPN4sqo=
+github.com/aws/aws-sdk-go-v2/service/route53resolver v1.30.3/go.mod h1:BQBJkxokRLgXiBgHDYichq3aNynMRSqXu26Z2Fd8bao=
 github.com/aws/aws-sdk-go-v2/service/rum v1.19.3 h1:DR+GYJRPL7eEZknnGdwm+lH686LmUBB/X2YVQDHLNY4=
 github.com/aws/aws-sdk-go-v2/service/rum v1.19.3/go.mod h1:5jFxbuc05P/+BbJvVbBspMbzDR2IFU0LegQG3iUvj8g=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 h1:hT8ZAZRIfqBqHbzKTII+CIiY8G2oC9OpLedkZ51DWl8=

internal/generate/namevaluesfilters/v1/main.go

@@ -32,7 +32,6 @@ func main() {
 	sliceServiceNames := []string{
 		"imagebuilder",
 		"rds",
-		"route53resolver",
 	}
 	// Always sort to reduce any potential generation churn
 	sort.Strings(sliceServiceNames)

internal/generate/namevaluesfilters/v2/main.go

@@ -32,6 +32,7 @@ func main() {
 	sliceServiceNames := []string{
 		"rds",
 		"secretsmanager",
+		"route53resolver",
 	}
 	// Always sort to reduce any potential generation churn
 	sort.Strings(sliceServiceNames)

internal/service/route53resolver/config.go

@@ -8,20 +8,22 @@ import (
 	"log"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/route53resolver"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/route53resolver"
+	awstypes "github.com/aws/aws-sdk-go-v2/service/route53resolver/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/enum"
+	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
-// @SDKResource("aws_route53_resolver_config")
-func ResourceConfig() *schema.Resource {
+// @SDKResource("aws_route53_resolver_config", name="Config")
+func resourceConfig() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceConfigCreate,
 		ReadWithoutTimeout:   resourceConfigRead,
@@ -34,9 +36,9 @@ func ResourceConfig() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"autodefined_reverse_flag": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringInSlice(autodefinedReverseFlag_Values(), false),
+				Type:             schema.TypeString,
+				Required:         true,
+				ValidateDiagFunc: enum.Validate[awstypes.AutodefinedReverseFlag](),
 			},
 			names.AttrOwnerID: {
 				Type:     schema.TypeString,
@@ -53,21 +55,21 @@ func ResourceConfig() *schema.Resource {
 
 func resourceConfigCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).Route53ResolverConn(ctx)
+	conn := meta.(*conns.AWSClient).Route53ResolverClient(ctx)
 
-	autodefinedReverseFlag := d.Get("autodefined_reverse_flag").(string)
+	autodefinedReverseFlag := awstypes.AutodefinedReverseFlag(d.Get("autodefined_reverse_flag").(string))
 	input := &route53resolver.UpdateResolverConfigInput{
-		AutodefinedReverseFlag: aws.String(autodefinedReverseFlag),
+		AutodefinedReverseFlag: autodefinedReverseFlag,
 		ResourceId:             aws.String(d.Get(names.AttrResourceID).(string)),
 	}
 
-	output, err := conn.UpdateResolverConfigWithContext(ctx, input)
+	output, err := conn.UpdateResolverConfig(ctx, input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "creating Route53 Resolver Config: %s", err)
 	}
 
-	d.SetId(aws.StringValue(output.ResolverConfig.Id))
+	d.SetId(aws.ToString(output.ResolverConfig.Id))
 
 	if _, err = waitAutodefinedReverseUpdated(ctx, conn, d.Id(), autodefinedReverseFlag); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for Route53 Resolver Config (%s) create: %s", d.Id(), err)
@@ -78,9 +80,9 @@ func resourceConfigCreate(ctx context.Context, d *schema.ResourceData, meta inte
 
 func resourceConfigRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).Route53ResolverConn(ctx)
+	conn := meta.(*conns.AWSClient).Route53ResolverClient(ctx)
 
-	resolverConfig, err := FindResolverConfigByID(ctx, conn, d.Id())
+	resolverConfig, err := findResolverConfigByID(ctx, conn, d.Id())
 
 	if !d.IsNewResource() && tfresource.NotFound(err) {
 		log.Printf("[WARN] Route53 Resolver Config (%s) not found, removing from state", d.Id())
@@ -92,11 +94,11 @@ func resourceConfigRead(ctx context.Context, d *schema.ResourceData, meta interf
 		return sdkdiag.AppendErrorf(diags, "reading Route53 Resolver Config (%s): %s", d.Id(), err)
 	}
 
-	var autodefinedReverseFlag string
-	if aws.StringValue(resolverConfig.AutodefinedReverse) == route53resolver.ResolverAutodefinedReverseStatusEnabled {
-		autodefinedReverseFlag = autodefinedReverseFlagEnable
+	var autodefinedReverseFlag awstypes.AutodefinedReverseFlag
+	if resolverConfig.AutodefinedReverse == awstypes.ResolverAutodefinedReverseStatusEnabled {
+		autodefinedReverseFlag = awstypes.AutodefinedReverseFlagEnable
 	} else {
-		autodefinedReverseFlag = autodefinedReverseFlagDisable
+		autodefinedReverseFlag = awstypes.AutodefinedReverseFlagDisable
 	}
 	d.Set("autodefined_reverse_flag", autodefinedReverseFlag)
 	d.Set(names.AttrOwnerID, resolverConfig.OwnerId)
@@ -107,15 +109,15 @@ func resourceConfigRead(ctx context.Context, d *schema.ResourceData, meta interf
 
 func resourceConfigUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).Route53ResolverConn(ctx)
+	conn := meta.(*conns.AWSClient).Route53ResolverClient(ctx)
 
-	autodefinedReverseFlag := d.Get("autodefined_reverse_flag").(string)
+	autodefinedReverseFlag := awstypes.AutodefinedReverseFlag(d.Get("autodefined_reverse_flag").(string))
 	input := &route53resolver.UpdateResolverConfigInput{
-		AutodefinedReverseFlag: aws.String(autodefinedReverseFlag),
+		AutodefinedReverseFlag: autodefinedReverseFlag,
 		ResourceId:             aws.String(d.Get(names.AttrResourceID).(string)),
 	}
 
-	_, err := conn.UpdateResolverConfigWithContext(ctx, input)
+	_, err := conn.UpdateResolverConfig(ctx, input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "updating Route53 Resolver Config: %s", err)
@@ -128,54 +130,38 @@ func resourceConfigUpdate(ctx context.Context, d *schema.ResourceData, meta inte
 	return append(diags, resourceConfigRead(ctx, d, meta)...)
 }
 
-func FindResolverConfigByID(ctx context.Context, conn *route53resolver.Route53Resolver, id string) (*route53resolver.ResolverConfig, error) {
+func findResolverConfigByID(ctx context.Context, conn *route53resolver.Client, id string) (*awstypes.ResolverConfig, error) {
 	input := &route53resolver.ListResolverConfigsInput{}
-	var output *route53resolver.ResolverConfig
 
 	// GetResolverConfig does not support query by ID.
-	err := conn.ListResolverConfigsPagesWithContext(ctx, input, func(page *route53resolver.ListResolverConfigsOutput, lastPage bool) bool {
-		if page == nil {
-			return !lastPage
+	pages := route53resolver.NewListResolverConfigsPaginator(conn, input)
+	for pages.HasMorePages() {
+		page, err := pages.NextPage(ctx)
+
+		if errs.IsA[*awstypes.ResourceNotFoundException](err) {
+			return nil, &retry.NotFoundError{
+				LastError:   err,
+				LastRequest: input,
+			}
 		}
 
-		for _, v := range page.ResolverConfigs {
-			if aws.StringValue(v.Id) == id {
-				output = v
+		if err != nil {
+			return nil, err
+		}
 
-				return false
+		for _, v := range page.ResolverConfigs {
+			if aws.ToString(v.Id) == id {
+				return &v, nil
 			}
 		}
-
-		return !lastPage
-	})
-
-	if err != nil {
-		return nil, err
 	}
 
-	if output == nil {
-		return nil, &retry.NotFoundError{LastRequest: input}
-	}
-
-	return output, nil
-}
-
-const (
-	// https://docs.aws.amazon.com/Route53/latest/APIReference/API_route53resolver_UpdateResolverConfig.html#API_route53resolver_UpdateResolverConfig_RequestSyntax
-	autodefinedReverseFlagDisable = "DISABLE"
-	autodefinedReverseFlagEnable  = "ENABLE"
-)
-
-func autodefinedReverseFlag_Values() []string {
-	return []string{
-		autodefinedReverseFlagDisable,
-		autodefinedReverseFlagEnable,
-	}
+	return nil, tfresource.NewEmptyResultError(input)
 }
 
-func statusAutodefinedReverse(ctx context.Context, conn *route53resolver.Route53Resolver, id string) retry.StateRefreshFunc {
+func statusAutodefinedReverse(ctx context.Context, conn *route53resolver.Client, id string) retry.StateRefreshFunc {
 	return func() (interface{}, string, error) {
-		output, err := FindResolverConfigByID(ctx, conn, id)
+		output, err := findResolverConfigByID(ctx, conn, id)
 
 		if tfresource.NotFound(err) {
 			return nil, "", nil
@@ -185,50 +171,50 @@ func statusAutodefinedReverse(ctx context.Context, conn *route53resolver.Route53
 			return nil, "", err
 		}
 
-		return output, aws.StringValue(output.AutodefinedReverse), nil
+		return output, string(output.AutodefinedReverse), nil
 	}
 }
 
 const (
 	autodefinedReverseUpdatedTimeout = 10 * time.Minute
 )
 
-func waitAutodefinedReverseUpdated(ctx context.Context, conn *route53resolver.Route53Resolver, id, autodefinedReverseFlag string) (*route53resolver.ResolverConfig, error) {
-	if autodefinedReverseFlag == autodefinedReverseFlagDisable {
+func waitAutodefinedReverseUpdated(ctx context.Context, conn *route53resolver.Client, id string, autodefinedReverseFlag awstypes.AutodefinedReverseFlag) (*awstypes.ResolverConfig, error) {
+	if autodefinedReverseFlag == awstypes.AutodefinedReverseFlagDisable {
 		return waitAutodefinedReverseDisabled(ctx, conn, id)
 	} else {
 		return waitAutodefinedReverseEnabled(ctx, conn, id)
 	}
 }
 
-func waitAutodefinedReverseEnabled(ctx context.Context, conn *route53resolver.Route53Resolver, id string) (*route53resolver.ResolverConfig, error) {
+func waitAutodefinedReverseEnabled(ctx context.Context, conn *route53resolver.Client, id string) (*awstypes.ResolverConfig, error) {
 	stateConf := &retry.StateChangeConf{
-		Pending: []string{route53resolver.ResolverAutodefinedReverseStatusEnabling},
-		Target:  []string{route53resolver.ResolverAutodefinedReverseStatusEnabled},
+		Pending: enum.Slice(awstypes.ResolverAutodefinedReverseStatusEnabling),
+		Target:  enum.Slice(awstypes.ResolverAutodefinedReverseStatusEnabled),
 		Refresh: statusAutodefinedReverse(ctx, conn, id),
 		Timeout: autodefinedReverseUpdatedTimeout,
 	}
 
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
-	if output, ok := outputRaw.(*route53resolver.ResolverConfig); ok {
+	if output, ok := outputRaw.(*awstypes.ResolverConfig); ok {
 		return output, err
 	}
 
 	return nil, err
 }
 
-func waitAutodefinedReverseDisabled(ctx context.Context, conn *route53resolver.Route53Resolver, id string) (*route53resolver.ResolverConfig, error) {
+func waitAutodefinedReverseDisabled(ctx context.Context, conn *route53resolver.Client, id string) (*awstypes.ResolverConfig, error) {
 	stateConf := &retry.StateChangeConf{
-		Pending: []string{route53resolver.ResolverAutodefinedReverseStatusDisabling},
-		Target:  []string{route53resolver.ResolverAutodefinedReverseStatusDisabled},
+		Pending: enum.Slice(awstypes.ResolverAutodefinedReverseStatusDisabling),
+		Target:  enum.Slice(awstypes.ResolverAutodefinedReverseStatusDisabled),
 		Refresh: statusAutodefinedReverse(ctx, conn, id),
 		Timeout: autodefinedReverseUpdatedTimeout,
 	}
 
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
-	if output, ok := outputRaw.(*route53resolver.ResolverConfig); ok {
+	if output, ok := outputRaw.(*awstypes.ResolverConfig); ok {
 		return output, err
 	}