Merge pull request #37548 from DanielRieske/f/migrate-transfer-sdkv2

Migrate `transfer` resources to AWS Go SDKv2

.changelog/37548.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_transfer_ssh_key: Add `ssh_key_id` attribute
+```

internal/flex/flex.go

@@ -249,6 +249,11 @@ func ExpandInt64Set(configured *schema.Set) []*int64 {
 	return ExpandInt64List(configured.List())
 }
 
+// Takes the result of schema.Set of strings and returns a []int64
+func ExpandInt64ValueSet(configured *schema.Set) []int64 {
+	return ExpandInt64ValueList(configured.List())
+}
+
 func FlattenInt64Set(list []*int64) *schema.Set {
 	return schema.NewSet(schema.HashInt, FlattenInt64List(list))
 }
@@ -274,6 +279,14 @@ func FlattenInt32ValueSet(set []int32) *schema.Set {
 	return schema.NewSet(schema.HashInt, FlattenInt32ValueList(set))
 }
 
+// Takes the result of flatmap.Expand for an array of int64
+// and returns a []int64
+func ExpandInt64ValueList(configured []interface{}) []int64 {
+	return tfslices.ApplyToAll(configured, func(v any) int64 {
+		return int64(v.(int))
+	})
+}
+
 // Takes the result of flatmap.Expand for an array of int64
 // and returns a []*int64
 func ExpandInt64List(configured []interface{}) []*int64 {

internal/service/ec2/exports.go

@@ -10,8 +10,10 @@ var (
 	FindNetworkInterfacesByAttachmentInstanceOwnerIDAndDescriptionV2 = findNetworkInterfacesByAttachmentInstanceOwnerIDAndDescriptionV2
 	FindNetworkInterfacesV2                                          = findNetworkInterfacesV2
 	FindVPCByIDV2                                                    = findVPCByIDV2
+	FindVPCEndpointByIDV2                                            = findVPCEndpointByIDV2
 	NewCustomFilterListFrameworkV2                                   = newCustomFilterListFrameworkV2
 	NewFilter                                                        = newFilter
 	NewFilterV2                                                      = newFilterV2
 	VPCEndpointCreationTimeout                                       = vpcEndpointCreationTimeout
+	WaitVPCEndpointAvailableV2                                       = waitVPCEndpointAvailableV2
 )

internal/service/ec2/exports_test.go

@@ -77,7 +77,6 @@ var (
 	FindRouteTableAssociationByIDV2                        = findRouteTableAssociationByID
 	FindRouteTableByIDV2                                   = findRouteTableByID
 	FindVolumeAttachmentInstanceByID                       = findVolumeAttachmentInstanceByID
-	FindVPCEndpointByIDV2                                  = findVPCEndpointByIDV2
 	FindVPCEndpointConnectionByServiceIDAndVPCEndpointIDV2 = findVPCEndpointConnectionByServiceIDAndVPCEndpointIDV2
 	FindVPCEndpointConnectionNotificationByIDV2            = findVPCEndpointConnectionNotificationByIDV2
 	FindVPCEndpointRouteTableAssociationExistsV2           = findVPCEndpointRouteTableAssociationExistsV2

internal/service/ec2/vpc_endpoint.go

@@ -267,7 +267,7 @@ func resourceVPCEndpointCreate(ctx context.Context, d *schema.ResourceData, meta
 		}
 	}
 
-	if _, err = waitVPCEndpointAvailableV2(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
+	if _, err := waitVPCEndpointAvailableV2(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for EC2 VPC Endpoint (%s) create: %s", serviceName, err)
 	}
 

internal/service/ec2/waitv2.go

@@ -197,7 +197,7 @@ func waitVPCEndpointAcceptedV2(ctx context.Context, conn *ec2.Client, vpcEndpoin
 	return nil, err
 }
 
-func waitVPCEndpointAvailableV2(ctx context.Context, conn *ec2.Client, vpcEndpointID string, timeout time.Duration) (*types.VpcEndpoint, error) { //nolint:unparam
+func waitVPCEndpointAvailableV2(ctx context.Context, conn *ec2.Client, vpcEndpointID string, timeout time.Duration) (*types.VpcEndpoint, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending:    enum.Slice(vpcEndpointStatePending),
 		Target:     enum.Slice(vpcEndpointStateAvailable, vpcEndpointStatePendingAcceptance),

internal/service/transfer/acc_test.go

@@ -7,17 +7,17 @@ import (
 	"context"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/service/transfer"
+	"github.com/aws/aws-sdk-go-v2/service/transfer"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 )
 
 func testAccPreCheck(ctx context.Context, t *testing.T) {
-	conn := acctest.Provider.Meta().(*conns.AWSClient).TransferConn(ctx)
+	conn := acctest.Provider.Meta().(*conns.AWSClient).TransferClient(ctx)
 
 	input := &transfer.ListServersInput{}
 
-	_, err := conn.ListServersWithContext(ctx, input)
+	_, err := conn.ListServers(ctx, input)
 
 	if acctest.PreCheckSkipError(err) {
 		t.Skipf("skipping acceptance testing: %s", err)