Migrate vpc resources to AWS SDK V2 (Part 1)

.changelog/37534.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_vpc_endpoint_service: Fix destroy error when endpoint service is deleted out-of-band
+```

internal/generate/listpages/README.md

@@ -17,6 +17,8 @@ Optional Flags:
 
 * `-Paginator`: Name of the pagination token field (default `NextToken`)
 * `-Export`: Whether to export the generated functions
+* `-AWSSDKVersion`: Version of the AWS Go SDK to use i.e. 1 or 2 (default `1`)
+* `-V2Suffix`: Whether to append a V2 suffix to the list functions
 
 To use with `go generate`, add the following directive to a Go file
 

internal/generate/listpages/main.go

@@ -36,6 +36,7 @@ var (
 	paginator       = flag.String("Paginator", "NextToken", "name of the pagination token field")
 	export          = flag.Bool("Export", false, "whether to export the list functions")
 	sdkVersion      = flag.Int("AWSSDKVersion", sdkV1, "Version of the AWS Go SDK to use i.e. 1 or 2")
+	v2Suffix        = flag.Bool("V2Suffix", false, "whether to append a V2 suffix to the list functions")
 )
 
 func usage() {
@@ -113,7 +114,7 @@ func main() {
 	}
 
 	for _, functionName := range functions {
-		g.generateFunction(functionName, awsService, awsUpper, *export, *sdkVersion)
+		g.generateFunction(functionName, awsService, awsUpper, *export, *sdkVersion, *v2Suffix)
 	}
 
 	src := g.format()
@@ -200,9 +201,10 @@ type FuncSpec struct {
 	ResultType      string
 	InputPaginator  string
 	OutputPaginator string
+	V2Suffix        bool
 }
 
-func (g *Generator) generateFunction(functionName, awsService, awsServiceUpper string, export bool, sdkVersion int) {
+func (g *Generator) generateFunction(functionName, awsService, awsServiceUpper string, export bool, sdkVersion int, v2Suffix bool) {
 	var function *ast.FuncDecl
 
 	for _, file := range g.pkg.files {
@@ -245,6 +247,7 @@ func (g *Generator) generateFunction(functionName, awsService, awsServiceUpper s
 		ResultType:      g.expandTypeField(function.Type.Results, sdkVersion, true), // Assumes we can take the first return parameter
 		InputPaginator:  g.inputPaginator,
 		OutputPaginator: g.outputPaginator,
+		V2Suffix:        v2Suffix,
 	}
 
 	err := g.tmpl.Execute(&g.buf, funcSpec)

internal/generate/listpages/v2/function.tmpl

@@ -1,5 +1,4 @@
-
-func {{ .Name }}Pages(ctx context.Context, conn {{ .RecvType }}, input {{ .ParamType }}, fn func({{ .ResultType }}, bool) bool) error {
+func {{ .Name }}Pages{{ if .V2Suffix }}V2{{ end }}(ctx context.Context, conn {{ .RecvType }}, input {{ .ParamType }}, fn func({{ .ResultType }}, bool) bool) error {
 	for {
 		output, err := conn.{{ .AWSName }}(ctx, input)
 		if err != nil {
@@ -14,4 +13,4 @@ func {{ .Name }}Pages(ctx context.Context, conn {{ .RecvType }}, input {{ .Param
 		input.{{ .InputPaginator }} = output.{{ .OutputPaginator }}
 	}
 	return nil
-}
+}

internal/service/ec2/errors.go

@@ -112,6 +112,7 @@ const (
 	errCodeInvalidVPCCIDRBlockAssociationIDNotFound          = "InvalidVpcCidrBlockAssociationID.NotFound"
 	errCodeInvalidVPCEndpointIdNotFound                      = "InvalidVpcEndpointId.NotFound"
 	errCodeInvalidVPCEndpointNotFound                        = "InvalidVpcEndpoint.NotFound"
+	errCodeInvalidVPCEndpointServiceNotFound                 = "InvalidVpcEndpointService.NotFound"
 	errCodeInvalidVPCEndpointServiceIdNotFound               = "InvalidVpcEndpointServiceId.NotFound"
 	errCodeInvalidVPCIDNotFound                              = "InvalidVpcID.NotFound"
 	errCodeInvalidVPCPeeringConnectionIDNotFound             = "InvalidVpcPeeringConnectionID.NotFound"

internal/service/ec2/errorsv2.go

@@ -0,0 +1,36 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package ec2
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	smithy "github.com/aws/smithy-go"
+)
+
+func unsuccessfulItemErrorV2(apiObject *awstypes.UnsuccessfulItemError) error {
+	if apiObject == nil {
+		return nil
+	}
+
+	return &smithy.GenericAPIError{
+		Code:    aws.ToString(apiObject.Code),
+		Message: aws.ToString(apiObject.Message),
+	}
+}
+
+func unsuccessfulItemsErrorV2(apiObjects []awstypes.UnsuccessfulItem) error {
+	var errs []error
+
+	for _, apiObject := range apiObjects {
+		if err := unsuccessfulItemErrorV2(apiObject.Error); err != nil {
+			errs = append(errs, fmt.Errorf("%s: %w", aws.ToString(apiObject.ResourceId), err))
+		}
+	}
+
+	return errors.Join(errs...)
+}

internal/service/ec2/exports_test.go

@@ -31,28 +31,42 @@ var (
 	ResourceVPNGatewayAttachment            = resourceVPNGatewayAttachment
 	ResourceVPNGatewayRoutePropagation      = resourceVPNGatewayRoutePropagation
 
-	CustomFiltersSchema                       = customFiltersSchema
-	FindEBSVolumeAttachment                   = findVolumeAttachment
-	FindEIPByAllocationID                     = findEIPByAllocationID
-	FindEIPByAssociationID                    = findEIPByAssociationID
-	FindEIPDomainNameAttributeByAllocationID  = findEIPDomainNameAttributeByAllocationID
-	FindFastSnapshotRestoreByTwoPartKey       = findFastSnapshotRestoreByTwoPartKey
-	FindInstanceMetadataDefaults              = findInstanceMetadataDefaults
-	FindKeyPairByName                         = findKeyPairByName
-	FindNetworkACLByIDV2                      = findNetworkACLByIDV2
-	FindNetworkInterfaceByIDV2                = findNetworkInterfaceByIDV2
-	FindVolumeAttachmentInstanceByID          = findVolumeAttachmentInstanceByID
-	FlattenNetworkInterfacePrivateIPAddresses = flattenNetworkInterfacePrivateIPAddresses
-	IPAMServicePrincipal                      = ipamServicePrincipal
-	NewAttributeFilterList                    = newAttributeFilterList
-	NewAttributeFilterListV2                  = newAttributeFilterListV2
-	NewCustomFilterList                       = newCustomFilterList
-	NewTagFilterList                          = newTagFilterList
-	ProtocolForValue                          = protocolForValue
-	StopInstance                              = stopInstance
-	StopEBSVolumeAttachmentInstance           = stopVolumeAttachmentInstance
-	UpdateTags                                = updateTags
-	UpdateTagsV2                              = updateTagsV2
+	CustomFiltersSchema                                    = customFiltersSchema
+	FindEBSVolumeAttachment                                = findVolumeAttachment
+	FindEIPByAllocationID                                  = findEIPByAllocationID
+	FindEIPByAssociationID                                 = findEIPByAssociationID
+	FindEIPDomainNameAttributeByAllocationID               = findEIPDomainNameAttributeByAllocationID
+	FindFastSnapshotRestoreByTwoPartKey                    = findFastSnapshotRestoreByTwoPartKey
+	FindInstanceMetadataDefaults                           = findInstanceMetadataDefaults
+	FindKeyPairByName                                      = findKeyPairByName
+	FindNetworkACLByIDV2                                   = findNetworkACLByIDV2
+	FindNetworkInterfaceByIDV2                             = findNetworkInterfaceByIDV2
+	FindRouteByIPv4DestinationV2                           = findRouteByIPv4DestinationV2
+	FindRouteByIPv6DestinationV2                           = findRouteByIPv6DestinationV2
+	FindRouteByPrefixListIDDestinationV2                   = findRouteByPrefixListIDDestinationV2
+	FindRouteTableAssociationByIDV2                        = findRouteTableAssociationByIDV2
+	FindRouteTableByIDV2                                   = findRouteTableByIDV2
+	FindVolumeAttachmentInstanceByID                       = findVolumeAttachmentInstanceByID
+	FindVPCEndpointByIDV2                                  = findVPCEndpointByIDV2
+	FindVPCEndpointConnectionByServiceIDAndVPCEndpointIDV2 = findVPCEndpointConnectionByServiceIDAndVPCEndpointIDV2
+	FindVPCEndpointConnectionNotificationByIDV2            = findVPCEndpointConnectionNotificationByIDV2
+	FindVPCEndpointRouteTableAssociationExistsV2           = findVPCEndpointRouteTableAssociationExistsV2
+	FindVPCEndpointSecurityGroupAssociationExistsV2        = findVPCEndpointSecurityGroupAssociationExistsV2
+	FindVPCEndpointServiceConfigurationByIDV2              = findVPCEndpointServiceConfigurationByIDV2
+	FindVPCEndpointServicePermissionV2                     = findVPCEndpointServicePermissionV2
+	FindVPCEndpointSubnetAssociationExistsV2               = findVPCEndpointSubnetAssociationExistsV2
+	FindVPNGatewayRoutePropagationExistsV2                 = findVPNGatewayRoutePropagationExistsV2
+	FlattenNetworkInterfacePrivateIPAddresses              = flattenNetworkInterfacePrivateIPAddresses
+	IPAMServicePrincipal                                   = ipamServicePrincipal
+	NewAttributeFilterList                                 = newAttributeFilterList
+	NewAttributeFilterListV2                               = newAttributeFilterListV2
+	NewCustomFilterList                                    = newCustomFilterList
+	NewTagFilterList                                       = newTagFilterList
+	ProtocolForValue                                       = protocolForValue
+	StopInstance                                           = stopInstance
+	StopEBSVolumeAttachmentInstance                        = stopVolumeAttachmentInstance
+	UpdateTags                                             = updateTags
+	UpdateTagsV2                                           = updateTagsV2
 )
 
 type (