New Resources: r/aws_networkmanager_vpc_attachment & r/aws_networkmanager_attachment_acceptor

.changelog/26227.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_networkmanager_vpc_attachment
+```
+
+```release-note:new-resource
+aws_networkmanager_attachment_accepter
+```

internal/provider/provider.go

@@ -1734,6 +1734,7 @@ func New(_ context.Context) (*schema.Provider, error) {
 			"aws_networkfirewall_resource_policy":       networkfirewall.ResourceResourcePolicy(),
 			"aws_networkfirewall_rule_group":            networkfirewall.ResourceRuleGroup(),
 
+			"aws_networkmanager_attachment_accepter":                      networkmanager.ResourceAttachmentAccepter(),
 			"aws_networkmanager_connection":                               networkmanager.ResourceConnection(),
 			"aws_networkmanager_customer_gateway_association":             networkmanager.ResourceCustomerGatewayAssociation(),
 			"aws_networkmanager_device":                                   networkmanager.ResourceDevice(),
@@ -1743,6 +1744,7 @@ func New(_ context.Context) (*schema.Provider, error) {
 			"aws_networkmanager_site":                                     networkmanager.ResourceSite(),
 			"aws_networkmanager_transit_gateway_connect_peer_association": networkmanager.ResourceTransitGatewayConnectPeerAssociation(),
 			"aws_networkmanager_transit_gateway_registration":             networkmanager.ResourceTransitGatewayRegistration(),
+			"aws_networkmanager_vpc_attachment":                           networkmanager.ResourceVPCAttachment(),
 
 			"aws_opensearch_domain":              opensearch.ResourceDomain(),
 			"aws_opensearch_domain_policy":       opensearch.ResourceDomainPolicy(),

internal/service/networkmanager/attachment_accepter.go

@@ -0,0 +1,157 @@
+package networkmanager
+
+import (
+	"context"
+	"log"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/networkmanager"
+	"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"
+)
+
+// AttachmentAccepter does not require AttachmentType. However, querying attachments for status updates requires knowing tyupe
+// To facilitate querying and waiters on specific attachment types, attachment_type set to required
+
+func ResourceAttachmentAccepter() *schema.Resource {
+	return &schema.Resource{
+		CreateWithoutTimeout: ResourceAttachmentAccepterCreate,
+		ReadWithoutTimeout:   schema.NoopContext,
+		DeleteWithoutTimeout: ResourceAttachmentAccepterDelete,
+
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(10 * time.Minute),
+		},
+
+		Schema: map[string]*schema.Schema{
+			"attachment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"attachment_policy_rule_number": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+
+			// 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([]string{
+					networkmanager.AttachmentTypeVpc,
+				}, false),
+				// Implement Values() function for validation as more types are onboarded to provider
+				// networkmanager.AttachmentType_Values(), false),
+			},
+
+			"core_network_arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"core_network_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"edge_location": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"owner_account_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"resource_arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"segment_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func ResourceAttachmentAccepterCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*conns.AWSClient).NetworkManagerConn
+
+	attachmentId := d.Get("attachment_id").(string)
+	attachmentType := d.Get("attachment_type").(string)
+	attachment := &networkmanager.Attachment{}
+	accepted := false
+	var state string
+
+	if attachmentType == networkmanager.AttachmentTypeVpc {
+		output, err := FindVPCAttachmentByID(ctx, conn, attachmentId)
+
+		if err != nil {
+			return diag.Errorf("Finding Network Manager VPC Attachment: %s", err)
+		}
+
+		state = aws.StringValue(output.Attachment.State)
+		attachment = output.Attachment
+	}
+
+	if state == networkmanager.AttachmentStateAvailable {
+		accepted = true
+		log.Printf("[WARN] Attachment (%s) already accepted, importing attributes into state without accepting.", attachmentId)
+	}
+
+	if !accepted {
+		input := &networkmanager.AcceptAttachmentInput{
+			AttachmentId: aws.String(attachmentId),
+		}
+
+		log.Printf("[DEBUG] Accepting Network Manager Attachment: %s", input)
+		a, err := conn.AcceptAttachmentWithContext(ctx, input)
+
+		if err != nil {
+			return diag.Errorf("Accepting Network Manager Attachment: %s", err)
+		}
+
+		attachment = a.Attachment
+	}
+
+	d.SetId(attachmentId)
+
+	if attachmentType == networkmanager.AttachmentTypeVpc {
+		if _, err := WaitVPCAttachmentCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
+			d.SetId("")
+			return diag.Errorf("Waiting for Network Manager VPC Attachment (%s) create: %s", d.Id(), err)
+		}
+	}
+
+	d.Set("core_network_id", attachment.CoreNetworkId)
+	d.Set("state", attachment.State)
+	d.Set("core_network_arn", attachment.CoreNetworkArn)
+	d.Set("attachment_policy_rule_number", attachment.AttachmentPolicyRuleNumber)
+	d.Set("edge_location", attachment.EdgeLocation)
+	d.Set("owner_account_id", attachment.OwnerAccountId)
+	d.Set("resource_arn", attachment.ResourceArn)
+	d.Set("segment_name", attachment.SegmentName)
+
+	return nil
+}
+
+func ResourceAttachmentAccepterDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	log.Printf("[WARN] Attachment (%s) not deleted, removing from state.", d.Id())
+
+	return nil
+}

internal/service/networkmanager/attachment_acceptor_test.go

@@ -0,0 +1,40 @@
+package networkmanager_test
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go/service/networkmanager"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
+)
+
+func TestAccNetworkManagerAttachmentAccepter_vpcAttachmentBasic(t *testing.T) {
+	resourceName := "aws_networkmanager_attachment_accepter.test"
+	testExternalProviders := map[string]resource.ExternalProvider{
+		"awscc": {
+			Source:            "hashicorp/awscc",
+			VersionConstraint: "0.29.0",
+		},
+	}
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ErrorCheck:               acctest.ErrorCheck(t, networkmanager.EndpointsID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		ExternalProviders:        testExternalProviders,
+		CheckDestroy:             testAccCheckVPCAttachmentDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCoreNetworkConfig_basic(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "attachment_type", "VPC"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}