Migrate Network Manager resources to AWS SDK v2

go.mod

@@ -163,6 +163,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/mwaa v1.29.5
 	github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.11.1
 	github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.1
+	github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.4
 	github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.4
 	github.com/aws/aws-sdk-go-v2/service/oam v1.13.5
 	github.com/aws/aws-sdk-go-v2/service/opensearch v1.39.3

go.sum

@@ -356,6 +356,8 @@ github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.11.1 h1:Gk7iJhJQEwqldrKpMBh
 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.11.1/go.mod h1:hnsmCvIWzyUk2RdWVSWnoHLwoKOQZToC9NoYsMagT3U=
 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.1 h1:e1HnAPUIGkM1Eu4A5o83VQOp0MqWcW1BQXljHf8jCww=
 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.1/go.mod h1:58gRrHmzxlsKfI3sNNXR4rz9RHv0g1Lk3Xl72PusRJc=
+github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.4 h1:5LMCceliYKB9m3n2yHWBWBlg9cW/RmYGnYAty3Njotw=
+github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.4/go.mod h1:cgdt9gLLpMm3ft6/MNTDmZ0pKPJa/sOPFkuWkyRQ9VY=
 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.4 h1:u/vDkh3lVqFHavOO2ujv5tJ3pdAwa88eJL6zxu0uR8Q=
 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.4/go.mod h1:kLZ+wCSQ04+zCjbymFTlNmlB78Mxi7dORmfbeChB7CY=
 github.com/aws/aws-sdk-go-v2/service/oam v1.13.5 h1:51VYR5C0+/QEUrFURnwIGvT1eyiaKwnfQCoXVMRKtmg=

internal/service/networkmanager/attachment_accepter.go

@@ -8,13 +8,14 @@ import (
 	"log"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/networkmanager"
-	"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/networkmanager"
+	awstypes "github.com/aws/aws-sdk-go-v2/service/networkmanager/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/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"
@@ -23,8 +24,8 @@ import (
 // AttachmentAccepter does not require AttachmentType. However, querying attachments for status updates requires knowing type
 // To facilitate querying and waiters on specific attachment types, attachment_type set to required
 
-// @SDKResource("aws_networkmanager_attachment_accepter")
-func ResourceAttachmentAccepter() *schema.Resource {
+// @SDKResource("aws_networkmanager_attachment_accepter", name="Attachment Accepter")
+func resourceAttachmentAccepter() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceAttachmentAccepterCreate,
 		ReadWithoutTimeout:   resourceAttachmentAccepterRead,
@@ -47,10 +48,10 @@ func ResourceAttachmentAccepter() *schema.Resource {
 			// querying attachments requires knowing the type ahead of time
 			// therefore type is required in provider, though not on the API
 			"attachment_type": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validation.StringInSlice(networkmanager.AttachmentType_Values(), false),
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				ValidateDiagFunc: enum.Validate[awstypes.AttachmentType](),
 			},
 			"core_network_arn": {
 				Type:     schema.TypeString,
@@ -87,89 +88,89 @@ func ResourceAttachmentAccepter() *schema.Resource {
 func resourceAttachmentAccepterCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	conn := meta.(*conns.AWSClient).NetworkManagerConn(ctx)
+	conn := meta.(*conns.AWSClient).NetworkManagerClient(ctx)
 
-	var state string
+	var state awstypes.AttachmentState
 	attachmentID := d.Get("attachment_id").(string)
-	attachmentType := d.Get("attachment_type").(string)
+	attachmentType := awstypes.AttachmentType(d.Get("attachment_type").(string))
 
 	switch attachmentType {
-	case networkmanager.AttachmentTypeVpc:
-		vpcAttachment, err := FindVPCAttachmentByID(ctx, conn, attachmentID)
+	case awstypes.AttachmentTypeVpc:
+		vpcAttachment, err := findVPCAttachmentByID(ctx, conn, attachmentID)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "reading Network Manager VPC Attachment (%s): %s", attachmentID, err)
 		}
 
-		state = aws.StringValue(vpcAttachment.Attachment.State)
+		state = vpcAttachment.Attachment.State
 
 		d.SetId(attachmentID)
 
-	case networkmanager.AttachmentTypeSiteToSiteVpn:
-		vpnAttachment, err := FindSiteToSiteVPNAttachmentByID(ctx, conn, attachmentID)
+	case awstypes.AttachmentTypeSiteToSiteVpn:
+		vpnAttachment, err := findSiteToSiteVPNAttachmentByID(ctx, conn, attachmentID)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "reading Network Manager Site To Site VPN Attachment (%s): %s", attachmentID, err)
 		}
 
-		state = aws.StringValue(vpnAttachment.Attachment.State)
+		state = vpnAttachment.Attachment.State
 
 		d.SetId(attachmentID)
 
-	case networkmanager.AttachmentTypeConnect:
-		connectAttachment, err := FindConnectAttachmentByID(ctx, conn, attachmentID)
+	case awstypes.AttachmentTypeConnect:
+		connectAttachment, err := findConnectAttachmentByID(ctx, conn, attachmentID)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "reading Network Manager Connect Attachment (%s): %s", attachmentID, err)
 		}
 
-		state = aws.StringValue(connectAttachment.Attachment.State)
+		state = connectAttachment.Attachment.State
 
 		d.SetId(attachmentID)
 
-	case networkmanager.AttachmentTypeTransitGatewayRouteTable:
-		tgwAttachment, err := FindTransitGatewayRouteTableAttachmentByID(ctx, conn, attachmentID)
+	case awstypes.AttachmentTypeTransitGatewayRouteTable:
+		tgwAttachment, err := findTransitGatewayRouteTableAttachmentByID(ctx, conn, attachmentID)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "reading Network Manager Transit Gateway Route Table Attachment (%s): %s", attachmentID, err)
 		}
 
-		state = aws.StringValue(tgwAttachment.Attachment.State)
+		state = tgwAttachment.Attachment.State
 
 		d.SetId(attachmentID)
 
 	default:
 		return sdkdiag.AppendErrorf(diags, "unsupported Network Manager Attachment type: %s", attachmentType)
 	}
 
-	if state == networkmanager.AttachmentStatePendingAttachmentAcceptance || state == networkmanager.AttachmentStatePendingTagAcceptance {
+	if state == awstypes.AttachmentStatePendingAttachmentAcceptance || state == awstypes.AttachmentStatePendingTagAcceptance {
 		input := &networkmanager.AcceptAttachmentInput{
 			AttachmentId: aws.String(attachmentID),
 		}
 
-		_, err := conn.AcceptAttachmentWithContext(ctx, input)
+		_, err := conn.AcceptAttachment(ctx, input)
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "accepting Network Manager Attachment (%s): %s", attachmentID, err)
 		}
 
 		switch attachmentType {
-		case networkmanager.AttachmentTypeVpc:
+		case awstypes.AttachmentTypeVpc:
 			if _, err := waitVPCAttachmentAvailable(ctx, conn, attachmentID, d.Timeout(schema.TimeoutCreate)); err != nil {
 				return sdkdiag.AppendErrorf(diags, "waiting for Network Manager VPC Attachment (%s) to be attached: %s", attachmentID, err)
 			}
 
-		case networkmanager.AttachmentTypeSiteToSiteVpn:
+		case awstypes.AttachmentTypeSiteToSiteVpn:
 			if _, err := waitSiteToSiteVPNAttachmentAvailable(ctx, conn, attachmentID, d.Timeout(schema.TimeoutCreate)); err != nil {
 				return sdkdiag.AppendErrorf(diags, "waiting for Network Manager VPN Attachment (%s) create: %s", attachmentID, err)
 			}
 
-		case networkmanager.AttachmentTypeConnect:
+		case awstypes.AttachmentTypeConnect:
 			if _, err := waitConnectAttachmentAvailable(ctx, conn, attachmentID, d.Timeout(schema.TimeoutCreate)); err != nil {
 				return sdkdiag.AppendErrorf(diags, "waiting for Network Manager Connect Attachment (%s) create: %s", attachmentID, err)
 			}
 
-		case networkmanager.AttachmentTypeTransitGatewayRouteTable:
+		case awstypes.AttachmentTypeTransitGatewayRouteTable:
 			if _, err := waitTransitGatewayRouteTableAttachmentAvailable(ctx, conn, attachmentID, d.Timeout(schema.TimeoutCreate)); err != nil {
 				return sdkdiag.AppendErrorf(diags, "waiting for Network Manager Transit Gateway Route Table Attachment (%s) create: %s", attachmentID, err)
 			}
@@ -182,13 +183,14 @@ func resourceAttachmentAccepterCreate(ctx context.Context, d *schema.ResourceDat
 func resourceAttachmentAccepterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	conn := meta.(*conns.AWSClient).NetworkManagerConn(ctx)
+	conn := meta.(*conns.AWSClient).NetworkManagerClient(ctx)
 
-	var a *networkmanager.Attachment
+	var a *awstypes.Attachment
+	attachmentType := awstypes.AttachmentType(d.Get("attachment_type").(string))
 
-	switch aType := d.Get("attachment_type"); aType {
-	case networkmanager.AttachmentTypeVpc:
-		vpcAttachment, err := FindVPCAttachmentByID(ctx, conn, d.Id())
+	switch attachmentType {
+	case awstypes.AttachmentTypeVpc:
+		vpcAttachment, err := findVPCAttachmentByID(ctx, conn, d.Id())
 
 		if !d.IsNewResource() && tfresource.NotFound(err) {
 			log.Printf("[WARN] Network Manager VPC Attachment %s not found, removing from state", d.Id())
@@ -202,8 +204,8 @@ func resourceAttachmentAccepterRead(ctx context.Context, d *schema.ResourceData,
 
 		a = vpcAttachment.Attachment
 
-	case networkmanager.AttachmentTypeSiteToSiteVpn:
-		vpnAttachment, err := FindSiteToSiteVPNAttachmentByID(ctx, conn, d.Id())
+	case awstypes.AttachmentTypeSiteToSiteVpn:
+		vpnAttachment, err := findSiteToSiteVPNAttachmentByID(ctx, conn, d.Id())
 
 		if !d.IsNewResource() && tfresource.NotFound(err) {
 			log.Printf("[WARN] Network Manager Site To Site VPN Attachment %s not found, removing from state", d.Id())
@@ -217,8 +219,8 @@ func resourceAttachmentAccepterRead(ctx context.Context, d *schema.ResourceData,
 
 		a = vpnAttachment.Attachment
 
-	case networkmanager.AttachmentTypeConnect:
-		connectAttachment, err := FindConnectAttachmentByID(ctx, conn, d.Id())
+	case awstypes.AttachmentTypeConnect:
+		connectAttachment, err := findConnectAttachmentByID(ctx, conn, d.Id())
 
 		if !d.IsNewResource() && tfresource.NotFound(err) {
 			log.Printf("[WARN] Network Manager Connect Attachment %s not found, removing from state", d.Id())
@@ -232,8 +234,8 @@ func resourceAttachmentAccepterRead(ctx context.Context, d *schema.ResourceData,
 
 		a = connectAttachment.Attachment
 
-	case networkmanager.AttachmentTypeTransitGatewayRouteTable:
-		tgwAttachment, err := FindTransitGatewayRouteTableAttachmentByID(ctx, conn, d.Id())
+	case awstypes.AttachmentTypeTransitGatewayRouteTable:
+		tgwAttachment, err := findTransitGatewayRouteTableAttachmentByID(ctx, conn, d.Id())
 
 		if !d.IsNewResource() && tfresource.NotFound(err) {
 			log.Printf("[WARN] Network Manager Transit Gateway Route Table Attachment %s not found, removing from state", d.Id())
@@ -263,15 +265,17 @@ func resourceAttachmentAccepterRead(ctx context.Context, d *schema.ResourceData,
 func resourceAttachmentAccepterDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	conn := meta.(*conns.AWSClient).NetworkManagerConn(ctx)
+	conn := meta.(*conns.AWSClient).NetworkManagerClient(ctx)
+
+	attachmentType := awstypes.AttachmentType(d.Get("attachment_type").(string))
 
-	switch d.Get("attachment_type") {
-	case networkmanager.AttachmentTypeVpc:
-		_, err := conn.DeleteAttachmentWithContext(ctx, &networkmanager.DeleteAttachmentInput{
+	switch attachmentType {
+	case awstypes.AttachmentTypeVpc:
+		_, err := conn.DeleteAttachment(ctx, &networkmanager.DeleteAttachmentInput{
 			AttachmentId: aws.String(d.Id()),
 		})
 
-		if tfawserr.ErrCodeEquals(err, networkmanager.ErrCodeResourceNotFoundException) {
+		if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 			return diags
 		}