Merge pull request #35187 from hashicorp/td-migrate-mq-to-aws-sdk-v2

Tech debt: Migrate `mq` resources to AWS SDK for Go v2

.ci/.golangci2.yml

@@ -173,6 +173,7 @@ linters-settings:
           - argument
         ignored-functions:
           # AWS Go SDK
+          - aws.Int32
           - aws.Int64
           - request.ConstantWaiterDelay
           - request.WithWaiterMaxAttempts

internal/enum/validate.go

@@ -11,7 +11,15 @@ import (
 )
 
 func Validate[T Valueser[T]]() schema.SchemaValidateDiagFunc {
-	return validation.ToDiagFunc(validation.StringInSlice(Values[T](), false))
+	return validate[T](false)
+}
+
+func ValidateIgnoreCase[T Valueser[T]]() schema.SchemaValidateDiagFunc {
+	return validate[T](true)
+}
+
+func validate[T Valueser[T]](ignoreCase bool) schema.SchemaValidateDiagFunc {
+	return validation.ToDiagFunc(validation.StringInSlice(Values[T](), ignoreCase))
 }
 
 // TODO Move to internal/framework/validators or replace with custom types.

internal/service/lambda/event_source_mapping_test.go

@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/service/kafka"
+	"github.com/aws/aws-sdk-go-v2/service/mq"
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/kafka"
 	"github.com/aws/aws-sdk-go/service/lambda"
-	"github.com/aws/aws-sdk-go/service/mq"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
@@ -1210,11 +1210,11 @@ func TestAccLambdaEventSourceMapping_documentDB(t *testing.T) {
 }
 
 func testAccPreCheckMQ(ctx context.Context, t *testing.T) {
-	conn := acctest.Provider.Meta().(*conns.AWSClient).MQConn(ctx)
+	conn := acctest.Provider.Meta().(*conns.AWSClient).MQClient(ctx)
 
 	input := &mq.ListBrokersInput{}
 
-	_, err := conn.ListBrokersWithContext(ctx, input)
+	_, err := conn.ListBrokers(ctx, input)
 
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)
@@ -1226,11 +1226,11 @@ func testAccPreCheckMQ(ctx context.Context, t *testing.T) {
 }
 
 func testAccPreCheckMSK(ctx context.Context, t *testing.T) {
-	conn := acctest.Provider.Meta().(*conns.AWSClient).KafkaConn(ctx)
+	conn := acctest.Provider.Meta().(*conns.AWSClient).KafkaClient(ctx)
 
 	input := &kafka.ListClustersInput{}
 
-	_, err := conn.ListClustersWithContext(ctx, input)
+	_, err := conn.ListClusters(ctx, input)
 
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)