Migrate Redshift resources to AWS SDK v2

internal/service/redshift/authentication_profile.go

@@ -7,14 +7,15 @@ import (
 	"context"
 	"log"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/redshift"
-	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/redshift"
+	awstypes "github.com/aws/aws-sdk-go-v2/service/redshift/types"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"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"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -54,7 +55,7 @@ func resourceAuthenticationProfile() *schema.Resource {
 
 func resourceAuthenticationProfileCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
+	conn := meta.(*conns.AWSClient).RedshiftClient(ctx)
 
 	authProfileName := d.Get("authentication_profile_name").(string)
 
@@ -63,20 +64,20 @@ func resourceAuthenticationProfileCreate(ctx context.Context, d *schema.Resource
 		AuthenticationProfileContent: aws.String(d.Get("authentication_profile_content").(string)),
 	}
 
-	out, err := conn.CreateAuthenticationProfileWithContext(ctx, &input)
+	out, err := conn.CreateAuthenticationProfile(ctx, &input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "creating Redshift Authentication Profile (%s): %s", authProfileName, err)
 	}
 
-	d.SetId(aws.StringValue(out.AuthenticationProfileName))
+	d.SetId(aws.ToString(out.AuthenticationProfileName))
 
 	return append(diags, resourceAuthenticationProfileRead(ctx, d, meta)...)
 }
 
 func resourceAuthenticationProfileRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
+	conn := meta.(*conns.AWSClient).RedshiftClient(ctx)
 
 	out, err := findAuthenticationProfileByID(ctx, conn, d.Id())
 
@@ -98,14 +99,14 @@ func resourceAuthenticationProfileRead(ctx context.Context, d *schema.ResourceDa
 
 func resourceAuthenticationProfileUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
+	conn := meta.(*conns.AWSClient).RedshiftClient(ctx)
 
 	input := &redshift.ModifyAuthenticationProfileInput{
 		AuthenticationProfileName:    aws.String(d.Id()),
 		AuthenticationProfileContent: aws.String(d.Get("authentication_profile_content").(string)),
 	}
 
-	_, err := conn.ModifyAuthenticationProfileWithContext(ctx, input)
+	_, err := conn.ModifyAuthenticationProfile(ctx, input)
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "modifying Redshift Authentication Profile (%s): %s", d.Id(), err)
@@ -116,17 +117,17 @@ func resourceAuthenticationProfileUpdate(ctx context.Context, d *schema.Resource
 
 func resourceAuthenticationProfileDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	conn := meta.(*conns.AWSClient).RedshiftConn(ctx)
+	conn := meta.(*conns.AWSClient).RedshiftClient(ctx)
 
 	deleteInput := redshift.DeleteAuthenticationProfileInput{
 		AuthenticationProfileName: aws.String(d.Id()),
 	}
 
 	log.Printf("[DEBUG] Deleting Redshift Authentication Profile: %s", d.Id())
-	_, err := conn.DeleteAuthenticationProfileWithContext(ctx, &deleteInput)
+	_, err := conn.DeleteAuthenticationProfile(ctx, &deleteInput)
 
 	if err != nil {
-		if tfawserr.ErrCodeEquals(err, redshift.ErrCodeAuthenticationProfileNotFoundFault) {
+		if errs.IsA[*awstypes.AuthenticationProfileNotFoundFault](err) {
 			return diags
 		}
 		return sdkdiag.AppendErrorf(diags, "deleting Redshift Authentication Profile (%s): %s", d.Id(), err)

internal/service/redshift/authentication_profile_test.go

@@ -78,7 +78,7 @@ func TestAccRedshiftAuthenticationProfile_disappears(t *testing.T) {
 
 func testAccCheckAuthenticationProfileDestroy(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		conn := acctest.Provider.Meta().(*conns.AWSClient).RedshiftConn(ctx)
+		conn := acctest.Provider.Meta().(*conns.AWSClient).RedshiftClient(ctx)
 
 		for _, rs := range s.RootModule().Resources {
 			if rs.Type != "aws_redshift_authentication_profile" {
@@ -113,7 +113,7 @@ func testAccCheckAuthenticationProfileExists(ctx context.Context, name string) r
 			return fmt.Errorf("Authentication Profile ID is not set")
 		}
 
-		conn := acctest.Provider.Meta().(*conns.AWSClient).RedshiftConn(ctx)
+		conn := acctest.Provider.Meta().(*conns.AWSClient).RedshiftClient(ctx)
 
 		_, err := tfredshift.FindAuthenticationProfileByID(ctx, conn, rs.Primary.ID)